comparison 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
comparison
equal deleted inserted replaced
19921:05ac81e3e873 19922:1f42c49c3d29
377 // Script CTX being sourced or was sourced to define the current function. 377 // Script CTX being sourced or was sourced to define the current function.
378 EXTERN sctx_T current_sctx INIT4(0, 0, 0, 0); 378 EXTERN sctx_T current_sctx INIT4(0, 0, 0, 0);
379 379
380 380
381 // Commonly used types. 381 // Commonly used types.
382 EXTERN type_T t_any INIT6(VAR_UNKNOWN, 0, 0, 0, NULL, NULL); 382 EXTERN type_T t_unknown INIT6(VAR_UNKNOWN, 0, 0, 0, NULL, NULL);
383 EXTERN type_T t_any INIT6(VAR_ANY, 0, 0, 0, NULL, NULL);
383 EXTERN type_T t_void INIT6(VAR_VOID, 0, 0, 0, NULL, NULL); 384 EXTERN type_T t_void INIT6(VAR_VOID, 0, 0, 0, NULL, NULL);
384 EXTERN type_T t_bool INIT6(VAR_BOOL, 0, 0, 0, NULL, NULL); 385 EXTERN type_T t_bool INIT6(VAR_BOOL, 0, 0, 0, NULL, NULL);
385 EXTERN type_T t_special INIT6(VAR_SPECIAL, 0, 0, 0, NULL, NULL); 386 EXTERN type_T t_special INIT6(VAR_SPECIAL, 0, 0, 0, NULL, NULL);
386 EXTERN type_T t_number INIT6(VAR_NUMBER, 0, 0, 0, NULL, NULL); 387 EXTERN type_T t_number INIT6(VAR_NUMBER, 0, 0, 0, NULL, NULL);
387 EXTERN type_T t_float INIT6(VAR_FLOAT, 0, 0, 0, NULL, NULL); 388 EXTERN type_T t_float INIT6(VAR_FLOAT, 0, 0, 0, NULL, NULL);
388 EXTERN type_T t_string INIT6(VAR_STRING, 0, 0, 0, NULL, NULL); 389 EXTERN type_T t_string INIT6(VAR_STRING, 0, 0, 0, NULL, NULL);
389 EXTERN type_T t_blob INIT6(VAR_BLOB, 0, 0, 0, NULL, NULL); 390 EXTERN type_T t_blob INIT6(VAR_BLOB, 0, 0, 0, NULL, NULL);
390 EXTERN type_T t_job INIT6(VAR_JOB, 0, 0, 0, NULL, NULL); 391 EXTERN type_T t_job INIT6(VAR_JOB, 0, 0, 0, NULL, NULL);
391 EXTERN type_T t_channel INIT6(VAR_CHANNEL, 0, 0, 0, NULL, NULL); 392 EXTERN type_T t_channel INIT6(VAR_CHANNEL, 0, 0, 0, NULL, NULL);
392 393
394 EXTERN type_T t_func_unknown INIT6(VAR_FUNC, -1, 0, 0, &t_unknown, NULL);
393 EXTERN type_T t_func_void INIT6(VAR_FUNC, -1, 0, 0, &t_void, NULL); 395 EXTERN type_T t_func_void INIT6(VAR_FUNC, -1, 0, 0, &t_void, NULL);
394 EXTERN type_T t_func_any INIT6(VAR_FUNC, -1, 0, 0, &t_any, NULL); 396 EXTERN type_T t_func_any INIT6(VAR_FUNC, -1, 0, 0, &t_any, NULL);
395 EXTERN type_T t_func_number INIT6(VAR_FUNC, -1, 0, 0, &t_number, NULL); 397 EXTERN type_T t_func_number INIT6(VAR_FUNC, -1, 0, 0, &t_number, NULL);
396 EXTERN type_T t_func_string INIT6(VAR_FUNC, -1, 0, 0, &t_string, NULL); 398 EXTERN type_T t_func_string INIT6(VAR_FUNC, -1, 0, 0, &t_string, NULL);
397 EXTERN type_T t_func_0_void INIT6(VAR_FUNC, 0, 0, 0, &t_void, NULL); 399 EXTERN type_T t_func_0_void INIT6(VAR_FUNC, 0, 0, 0, &t_void, NULL);
399 EXTERN type_T t_func_0_number INIT6(VAR_FUNC, 0, 0, 0, &t_number, NULL); 401 EXTERN type_T t_func_0_number INIT6(VAR_FUNC, 0, 0, 0, &t_number, NULL);
400 EXTERN type_T t_func_0_string INIT6(VAR_FUNC, 0, 0, 0, &t_string, NULL); 402 EXTERN type_T t_func_0_string INIT6(VAR_FUNC, 0, 0, 0, &t_string, NULL);
401 403
402 EXTERN type_T t_list_any INIT6(VAR_LIST, 0, 0, 0, &t_any, NULL); 404 EXTERN type_T t_list_any INIT6(VAR_LIST, 0, 0, 0, &t_any, NULL);
403 EXTERN type_T t_dict_any INIT6(VAR_DICT, 0, 0, 0, &t_any, NULL); 405 EXTERN type_T t_dict_any INIT6(VAR_DICT, 0, 0, 0, &t_any, NULL);
404 EXTERN type_T t_list_empty INIT6(VAR_LIST, 0, 0, 0, &t_void, NULL); 406 EXTERN type_T t_list_empty INIT6(VAR_LIST, 0, 0, 0, &t_unknown, NULL);
405 EXTERN type_T t_dict_empty INIT6(VAR_DICT, 0, 0, 0, &t_void, NULL); 407 EXTERN type_T t_dict_empty INIT6(VAR_DICT, 0, 0, 0, &t_unknown, NULL);
406 408
407 EXTERN type_T t_list_bool INIT6(VAR_LIST, 0, 0, 0, &t_bool, NULL); 409 EXTERN type_T t_list_bool INIT6(VAR_LIST, 0, 0, 0, &t_bool, NULL);
408 EXTERN type_T t_list_number INIT6(VAR_LIST, 0, 0, 0, &t_number, NULL); 410 EXTERN type_T t_list_number INIT6(VAR_LIST, 0, 0, 0, &t_number, NULL);
409 EXTERN type_T t_list_string INIT6(VAR_LIST, 0, 0, 0, &t_string, NULL); 411 EXTERN type_T t_list_string INIT6(VAR_LIST, 0, 0, 0, &t_string, NULL);
410 EXTERN type_T t_list_dict_any INIT6(VAR_LIST, 0, 0, 0, &t_dict_any, NULL); 412 EXTERN type_T t_list_dict_any INIT6(VAR_LIST, 0, 0, 0, &t_dict_any, NULL);