Mercurial > vim
diff src/globals.h @ 19922:1f42c49c3d29 v8.2.0517
patch 8.2.0517: Vim9: cannot separate "func" and "func(): void"
Commit: https://github.com/vim/vim/commit/4c68375057c25e99656bc996d3fa5c6b0b6a7e6a
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Apr 5 21:38:23 2020 +0200
patch 8.2.0517: Vim9: cannot separate "func" and "func(): void"
Problem: Vim9: cannot separate "func" and "func(): void".
Solution: Use VAR_ANY for "any" and VAR_UNKNOWN for "no type".
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 05 Apr 2020 21:45:25 +0200 |
parents | d4fa9db88d16 |
children | 3ff714d765ba |
line wrap: on
line diff
--- a/src/globals.h +++ b/src/globals.h @@ -379,7 +379,8 @@ EXTERN sctx_T current_sctx INIT4(0, 0, 0 // Commonly used types. -EXTERN type_T t_any INIT6(VAR_UNKNOWN, 0, 0, 0, NULL, NULL); +EXTERN type_T t_unknown INIT6(VAR_UNKNOWN, 0, 0, 0, NULL, NULL); +EXTERN type_T t_any INIT6(VAR_ANY, 0, 0, 0, NULL, NULL); EXTERN type_T t_void INIT6(VAR_VOID, 0, 0, 0, NULL, NULL); EXTERN type_T t_bool INIT6(VAR_BOOL, 0, 0, 0, NULL, NULL); EXTERN type_T t_special INIT6(VAR_SPECIAL, 0, 0, 0, NULL, NULL); @@ -390,6 +391,7 @@ EXTERN type_T t_blob INIT6(VAR_BLOB, 0, EXTERN type_T t_job INIT6(VAR_JOB, 0, 0, 0, NULL, NULL); EXTERN type_T t_channel INIT6(VAR_CHANNEL, 0, 0, 0, NULL, NULL); +EXTERN type_T t_func_unknown INIT6(VAR_FUNC, -1, 0, 0, &t_unknown, NULL); EXTERN type_T t_func_void INIT6(VAR_FUNC, -1, 0, 0, &t_void, NULL); EXTERN type_T t_func_any INIT6(VAR_FUNC, -1, 0, 0, &t_any, NULL); EXTERN type_T t_func_number INIT6(VAR_FUNC, -1, 0, 0, &t_number, NULL); @@ -401,8 +403,8 @@ EXTERN type_T t_func_0_string INIT6(VAR_ EXTERN type_T t_list_any INIT6(VAR_LIST, 0, 0, 0, &t_any, NULL); EXTERN type_T t_dict_any INIT6(VAR_DICT, 0, 0, 0, &t_any, NULL); -EXTERN type_T t_list_empty INIT6(VAR_LIST, 0, 0, 0, &t_void, NULL); -EXTERN type_T t_dict_empty INIT6(VAR_DICT, 0, 0, 0, &t_void, NULL); +EXTERN type_T t_list_empty INIT6(VAR_LIST, 0, 0, 0, &t_unknown, NULL); +EXTERN type_T t_dict_empty INIT6(VAR_DICT, 0, 0, 0, &t_unknown, NULL); EXTERN type_T t_list_bool INIT6(VAR_LIST, 0, 0, 0, &t_bool, NULL); EXTERN type_T t_list_number INIT6(VAR_LIST, 0, 0, 0, &t_number, NULL);