vim: src/vim9class.c annotate

annotate src/vim9class.c @ 34690:ad86d59d7510 v9.1.0226

patch 9.1.0226: Not able to assign enum values to an enum static variable Commit: https://github.com/vim/vim/commit/abedca96efa76db2bba74a5264df632da862203d Author: Yegappan Lakshmanan <yegappan@yahoo.com> Date: Fri Mar 29 10:08:23 2024 +0100 patch 9.1.0226: Not able to assign enum values to an enum static variable Problem: Not able to assign enum values to an enum static variable (zzzyxwvut) Solution: Make it work (Yegappan Lakshmanan) related: #14224 closes: #14329 Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com> Signed-off-by: Christian Brabandt <cb@256bit.org>

author	Christian Brabandt <cb@256bit.org>
date	Fri, 29 Mar 2024 10:15:06 +0100
parents	75f7b311ee25
children	a1d0ef54a24b

rev	line source
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1 /* vi:set ts=8 sts=4 sw=4 noet:
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2 *
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3 * VIM - Vi IMproved by Bram Moolenaar
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	4 *
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	5 * Do ":help uganda" in Vim to read copying and usage conditions.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	6 * Do ":help credits" in Vim to see a list of people who contributed.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	7 * See README.txt for an overview of the Vim source code.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	8 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	9
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	10 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	11 * vim9class.c: Vim9 script class support
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	12 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	13
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	14 #define USING_FLOAT_STUFF
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	15 #include "vim.h"
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	16
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	17 #if defined(FEAT_EVAL) \|\| defined(PROTO)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	18
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	19 // When not generating protos this is included in proto.h
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	20 #ifdef PROTO
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	21 # include "vim9.h"
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	22 #endif
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	23
33160 4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	24 static class_T *first_class = NULL;
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	25 static class_T *next_nonref_class = NULL;
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	26
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	27 /*
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	28 * Call this function when a class has been created. It will be added to the
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	29 * list headed by "first_class".
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	30 */
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	31 static void
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	32 class_created(class_T *cl)
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	33 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	34 if (first_class != NULL)
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	35 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	36 cl->class_next_used = first_class;
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	37 first_class->class_prev_used = cl;
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	38 }
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	39 first_class = cl;
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	40 }
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	41
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	42 /*
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	43 * Call this function when a class has been cleared and is about to be freed.
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	44 * It is removed from the list headed by "first_class".
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	45 */
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	46 static void
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	47 class_cleared(class_T *cl)
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	48 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	49 if (cl->class_next_used != NULL)
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	50 cl->class_next_used->class_prev_used = cl->class_prev_used;
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	51 if (cl->class_prev_used != NULL)
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	52 cl->class_prev_used->class_next_used = cl->class_next_used;
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	53 else if (first_class == cl)
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	54 first_class = cl->class_next_used;
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	55
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	56 // update the next class to check if needed
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	57 if (cl == next_nonref_class)
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	58 next_nonref_class = cl->class_next_used;
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	59 }
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	60
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	61 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	62 * Parse a member declaration, both object and class member.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	63 * Returns OK or FAIL. When OK then "varname_end" is set to just after the
33047 9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	64 * variable name and "type_ret" is set to the declared or detected type.
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	65 * "init_expr" is set to the initialisation expression (allocated), if there is
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	66 * one. For an interface "init_expr" is NULL.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	67 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	68 static int
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	69 parse_member(
33088 667a17904f64 patch 9.0.1829: Vim9 missing access-checks for private vars Christian Brabandt <cb@256bit.org> parents: 33070 diff changeset	70 exarg_T *eap,
667a17904f64 patch 9.0.1829: Vim9 missing access-checks for private vars Christian Brabandt <cb@256bit.org> parents: 33070 diff changeset	71 char_u *line,
667a17904f64 patch 9.0.1829: Vim9 missing access-checks for private vars Christian Brabandt <cb@256bit.org> parents: 33070 diff changeset	72 char_u *varname,
33109 2b5cc29b0a0e patch 9.0.1838: Vim9: Cannot modify class member vars from def function Christian Brabandt <cb@256bit.org> parents: 33106 diff changeset	73 int has_public, // TRUE if "public" seen before "varname"
33088 667a17904f64 patch 9.0.1829: Vim9 missing access-checks for private vars Christian Brabandt <cb@256bit.org> parents: 33070 diff changeset	74 char_u **varname_end,
33446 508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	75 int *has_type,
33109 2b5cc29b0a0e patch 9.0.1838: Vim9: Cannot modify class member vars from def function Christian Brabandt <cb@256bit.org> parents: 33106 diff changeset	76 garray_T *type_list,
33088 667a17904f64 patch 9.0.1829: Vim9 missing access-checks for private vars Christian Brabandt <cb@256bit.org> parents: 33070 diff changeset	77 type_T **type_ret,
667a17904f64 patch 9.0.1829: Vim9 missing access-checks for private vars Christian Brabandt <cb@256bit.org> parents: 33070 diff changeset	78 char_u **init_expr)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	79 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	80 *varname_end = to_name_end(varname, FALSE);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	81 if (*varname == '_' && has_public)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	82 {
33343 41b50abddeea patch 9.0.1935: Vim9: not consistent error messages Christian Brabandt <cb@256bit.org> parents: 33326 diff changeset	83 semsg(_(e_public_variable_name_cannot_start_with_underscore_str), line);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	84 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	85 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	86
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	87 char_u colon = skipwhite(varname_end);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	88 char_u *type_arg = colon;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	89 type_T *type = NULL;
33446 508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	90 *has_type = FALSE;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	91 if (*colon == ':')
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	92 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	93 if (VIM_ISWHITE(**varname_end))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	94 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	95 semsg(_(e_no_white_space_allowed_before_colon_str), varname);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	96 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	97 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	98 if (!VIM_ISWHITE(colon[1]))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	99 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	100 semsg(_(e_white_space_required_after_str_str), ":", varname);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	101 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	102 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	103 type_arg = skipwhite(colon + 1);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	104 type = parse_type(&type_arg, type_list, TRUE);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	105 if (type == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	106 return FAIL;
33446 508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	107 *has_type = TRUE;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	108 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	109
32960 d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	110 char_u *init_arg = skipwhite(type_arg);
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	111 if (type == NULL && *init_arg != '=')
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	112 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	113 emsg(_(e_type_or_initialization_required));
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	114 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	115 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	116
32960 d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	117 if (init_expr == NULL && *init_arg == '=')
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	118 {
33343 41b50abddeea patch 9.0.1935: Vim9: not consistent error messages Christian Brabandt <cb@256bit.org> parents: 33326 diff changeset	119 emsg(_(e_cannot_initialize_variable_in_interface));
32960 d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	120 return FAIL;
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	121 }
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	122
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	123 if (*init_arg == '=')
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	124 {
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	125 evalarg_T evalarg;
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	126 char_u expr_start, expr_end;
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	127
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	128 if (!VIM_ISWHITE(init_arg[-1]) \|\| !VIM_ISWHITE(init_arg[1]))
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	129 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	130 semsg(_(e_white_space_required_before_and_after_str_at_str),
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	131 "=", type_arg);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	132 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	133 }
32960 d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	134 init_arg = skipwhite(init_arg + 1);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	135
32960 d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	136 fill_evalarg_from_eap(&evalarg, eap, FALSE);
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	137 (void)skip_expr_concatenate(&init_arg, &expr_start, &expr_end, &evalarg);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	138
33006 29b2193466e0 patch 9.0.1795: Indentation issues Christian Brabandt <cb@256bit.org> parents: 32972 diff changeset	139 // No type specified for the member. Set it to "any" and the correct
29b2193466e0 patch 9.0.1795: Indentation issues Christian Brabandt <cb@256bit.org> parents: 32972 diff changeset	140 // type will be set when the object is instantiated.
32960 d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	141 if (type == NULL)
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	142 type = &t_any;
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	143
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	144 *init_expr = vim_strnsave(expr_start, expr_end - expr_start);
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	145 // Free the memory pointed by expr_start.
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	146 clear_evalarg(&evalarg, NULL);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	147 }
32960 d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	148 else if (!valid_declaration_type(type))
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	149 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	150
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	151 *type_ret = type;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	152 return OK;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	153 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	154
33951 45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	155 typedef struct oc_newmember_S oc_newmember_T;
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	156 struct oc_newmember_S
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	157 {
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	158 garray_T *gap;
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	159 char_u *varname;
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	160 char_u *varname_end;
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	161 int has_public;
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	162 int has_final;
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	163 int has_type;
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	164 type_T *type;
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	165 char_u *init_expr;
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	166 };
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	167
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	168 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	169 * Add a member to an object or a class.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	170 * Returns OK when successful, "init_expr" will be consumed then.
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	171 * Returns OK on success and FAIL on memory allocation failure (caller might
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	172 * need to free "init_expr").
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	173 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	174 static int
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	175 add_member(
33109 2b5cc29b0a0e patch 9.0.1838: Vim9: Cannot modify class member vars from def function Christian Brabandt <cb@256bit.org> parents: 33106 diff changeset	176 garray_T *gap,
2b5cc29b0a0e patch 9.0.1838: Vim9: Cannot modify class member vars from def function Christian Brabandt <cb@256bit.org> parents: 33106 diff changeset	177 char_u *varname,
2b5cc29b0a0e patch 9.0.1838: Vim9: Cannot modify class member vars from def function Christian Brabandt <cb@256bit.org> parents: 33106 diff changeset	178 char_u *varname_end,
2b5cc29b0a0e patch 9.0.1838: Vim9: Cannot modify class member vars from def function Christian Brabandt <cb@256bit.org> parents: 33106 diff changeset	179 int has_public,
33951 45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	180 int has_final,
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	181 int has_const,
33446 508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	182 int has_type,
33109 2b5cc29b0a0e patch 9.0.1838: Vim9: Cannot modify class member vars from def function Christian Brabandt <cb@256bit.org> parents: 33106 diff changeset	183 type_T *type,
2b5cc29b0a0e patch 9.0.1838: Vim9: Cannot modify class member vars from def function Christian Brabandt <cb@256bit.org> parents: 33106 diff changeset	184 char_u *init_expr)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	185 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	186 if (ga_grow(gap, 1) == FAIL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	187 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	188 ocmember_T m = ((ocmember_T )gap->ga_data) + gap->ga_len;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	189 m->ocm_name = vim_strnsave(varname, varname_end - varname);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	190 m->ocm_access = has_public ? VIM_ACCESS_ALL
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	191 : *varname == '_' ? VIM_ACCESS_PRIVATE : VIM_ACCESS_READ;
33951 45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	192 if (has_final)
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	193 m->ocm_flags \|= OCMFLAG_FINAL;
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	194 if (has_const)
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	195 m->ocm_flags \|= OCMFLAG_CONST;
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	196 if (has_type)
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	197 m->ocm_flags \|= OCMFLAG_HAS_TYPE;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	198 m->ocm_type = type;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	199 if (init_expr != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	200 m->ocm_init = init_expr;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	201 ++gap->ga_len;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	202 return OK;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	203 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	204
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	205 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	206 * Move the class or object members found while parsing a class into the class.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	207 * "gap" contains the found members.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	208 * "parent_members" points to the members in the parent class (if any)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	209 * "parent_count" is the number of members in the parent class
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	210 * "members" will be set to the newly allocated array of members and
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	211 * "member_count" set to the number of members.
34508 d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	212 * Returns OK on success and FAIL on memory allocation failure.
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	213 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	214 static int
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	215 add_members_to_class(
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	216 garray_T *gap,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	217 ocmember_T *parent_members,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	218 int parent_count,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	219 ocmember_T **members,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	220 int *member_count)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	221 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	222 *member_count = parent_count + gap->ga_len;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	223 members = member_count == 0 ? NULL
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	224 : ALLOC_MULT(ocmember_T, *member_count);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	225 if (member_count > 0 && members == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	226 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	227 for (int i = 0; i < parent_count; ++i)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	228 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	229 // parent members need to be copied
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	230 ocmember_T m = members + i;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	231 *m = parent_members[i];
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	232 m->ocm_name = vim_strsave(m->ocm_name);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	233 if (m->ocm_init != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	234 m->ocm_init = vim_strsave(m->ocm_init);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	235 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	236 if (gap->ga_len > 0)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	237 // new members are moved
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	238 mch_memmove(*members + parent_count,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	239 gap->ga_data, sizeof(ocmember_T) * gap->ga_len);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	240 VIM_CLEAR(gap->ga_data);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	241 return OK;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	242 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	243
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	244 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	245 * Convert a member index "idx" of interface "itf" to the member index of class
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	246 * "cl" implementing that interface.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	247 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	248 int
33387 577ef266309d patch 9.0.1952: Vim9: unused static field Christian Brabandt <cb@256bit.org> parents: 33385 diff changeset	249 object_index_from_itf_index(class_T itf, int is_method, int idx, class_T cl)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	250 {
33173 9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	251 if (idx >= (is_method ? itf->class_obj_method_count
33387 577ef266309d patch 9.0.1952: Vim9: unused static field Christian Brabandt <cb@256bit.org> parents: 33385 diff changeset	252 : itf->class_obj_member_count))
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	253 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	254 siemsg("index %d out of range for interface %s", idx, itf->class_name);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	255 return 0;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	256 }
32772 0dc750a24875 patch 9.0.1703: Vim9 Calling a method in an extended class fails Christian Brabandt <cb@256bit.org> parents: 32764 diff changeset	257
0dc750a24875 patch 9.0.1703: Vim9 Calling a method in an extended class fails Christian Brabandt <cb@256bit.org> parents: 32764 diff changeset	258 // If "cl" is the interface or the class that is extended, then the method
0dc750a24875 patch 9.0.1703: Vim9 Calling a method in an extended class fails Christian Brabandt <cb@256bit.org> parents: 32764 diff changeset	259 // index can be used directly and there is no need to search for the method
0dc750a24875 patch 9.0.1703: Vim9 Calling a method in an extended class fails Christian Brabandt <cb@256bit.org> parents: 32764 diff changeset	260 // index in one of the child classes.
0dc750a24875 patch 9.0.1703: Vim9 Calling a method in an extended class fails Christian Brabandt <cb@256bit.org> parents: 32764 diff changeset	261 if (cl == itf)
0dc750a24875 patch 9.0.1703: Vim9 Calling a method in an extended class fails Christian Brabandt <cb@256bit.org> parents: 32764 diff changeset	262 return idx;
0dc750a24875 patch 9.0.1703: Vim9 Calling a method in an extended class fails Christian Brabandt <cb@256bit.org> parents: 32764 diff changeset	263
33211 71a097aab64d patch 9.0.1883: Vim9: Calling an interface method using a child object fails Christian Brabandt <cb@256bit.org> parents: 33204 diff changeset	264 itf2class_T *i2c = NULL;
71a097aab64d patch 9.0.1883: Vim9: Calling an interface method using a child object fails Christian Brabandt <cb@256bit.org> parents: 33204 diff changeset	265 int searching = TRUE;
71a097aab64d patch 9.0.1883: Vim9: Calling an interface method using a child object fails Christian Brabandt <cb@256bit.org> parents: 33204 diff changeset	266 int method_offset = 0;
71a097aab64d patch 9.0.1883: Vim9: Calling an interface method using a child object fails Christian Brabandt <cb@256bit.org> parents: 33204 diff changeset	267
33204 36aebbf8389f patch 9.0.1880: Vim9: Need more tests for inheritance Christian Brabandt <cb@256bit.org> parents: 33201 diff changeset	268 for (class_T *super = cl; super != NULL && searching;
36aebbf8389f patch 9.0.1880: Vim9: Need more tests for inheritance Christian Brabandt <cb@256bit.org> parents: 33201 diff changeset	269 super = super->class_extends)
33211 71a097aab64d patch 9.0.1883: Vim9: Calling an interface method using a child object fails Christian Brabandt <cb@256bit.org> parents: 33204 diff changeset	270 {
33204 36aebbf8389f patch 9.0.1880: Vim9: Need more tests for inheritance Christian Brabandt <cb@256bit.org> parents: 33201 diff changeset	271 for (i2c = itf->class_itf2class; i2c != NULL; i2c = i2c->i2c_next)
33211 71a097aab64d patch 9.0.1883: Vim9: Calling an interface method using a child object fails Christian Brabandt <cb@256bit.org> parents: 33204 diff changeset	272 {
33204 36aebbf8389f patch 9.0.1880: Vim9: Need more tests for inheritance Christian Brabandt <cb@256bit.org> parents: 33201 diff changeset	273 if (i2c->i2c_class == super && i2c->i2c_is_method == is_method)
36aebbf8389f patch 9.0.1880: Vim9: Need more tests for inheritance Christian Brabandt <cb@256bit.org> parents: 33201 diff changeset	274 {
36aebbf8389f patch 9.0.1880: Vim9: Need more tests for inheritance Christian Brabandt <cb@256bit.org> parents: 33201 diff changeset	275 searching = FALSE;
36aebbf8389f patch 9.0.1880: Vim9: Need more tests for inheritance Christian Brabandt <cb@256bit.org> parents: 33201 diff changeset	276 break;
36aebbf8389f patch 9.0.1880: Vim9: Need more tests for inheritance Christian Brabandt <cb@256bit.org> parents: 33201 diff changeset	277 }
33211 71a097aab64d patch 9.0.1883: Vim9: Calling an interface method using a child object fails Christian Brabandt <cb@256bit.org> parents: 33204 diff changeset	278 }
71a097aab64d patch 9.0.1883: Vim9: Calling an interface method using a child object fails Christian Brabandt <cb@256bit.org> parents: 33204 diff changeset	279 if (searching && is_method)
71a097aab64d patch 9.0.1883: Vim9: Calling an interface method using a child object fails Christian Brabandt <cb@256bit.org> parents: 33204 diff changeset	280 // The parent class methods are stored after the current class
71a097aab64d patch 9.0.1883: Vim9: Calling an interface method using a child object fails Christian Brabandt <cb@256bit.org> parents: 33204 diff changeset	281 // methods.
33387 577ef266309d patch 9.0.1952: Vim9: unused static field Christian Brabandt <cb@256bit.org> parents: 33385 diff changeset	282 method_offset += super->class_obj_method_count_child;
33211 71a097aab64d patch 9.0.1883: Vim9: Calling an interface method using a child object fails Christian Brabandt <cb@256bit.org> parents: 33204 diff changeset	283 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	284 if (i2c == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	285 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	286 siemsg("class %s not found on interface %s",
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	287 cl->class_name, itf->class_name);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	288 return 0;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	289 }
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	290
33387 577ef266309d patch 9.0.1952: Vim9: unused static field Christian Brabandt <cb@256bit.org> parents: 33385 diff changeset	291 // A table follows the i2c for the class
577ef266309d patch 9.0.1952: Vim9: unused static field Christian Brabandt <cb@256bit.org> parents: 33385 diff changeset	292 int table = (int )(i2c + 1);
577ef266309d patch 9.0.1952: Vim9: unused static field Christian Brabandt <cb@256bit.org> parents: 33385 diff changeset	293 // "method_offset" is 0, if method is in the current class. If method
577ef266309d patch 9.0.1952: Vim9: unused static field Christian Brabandt <cb@256bit.org> parents: 33385 diff changeset	294 // is in a parent class, then it is non-zero.
577ef266309d patch 9.0.1952: Vim9: unused static field Christian Brabandt <cb@256bit.org> parents: 33385 diff changeset	295 return table[idx] + method_offset;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	296 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	297
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	298 /*
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	299 * Check whether a class named "extends_name" is present. If the class is
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	300 * valid, then "extends_clp" is set with the class pointer.
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	301 * Returns TRUE if the class name "extends_names" is a valid class.
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	302 */
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	303 static int
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	304 validate_extends_class(
34508 d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	305 class_T *cl,
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	306 char_u *extends_name,
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	307 class_T **extends_clp,
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	308 int is_class)
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	309 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	310 typval_T tv;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	311 int success = FALSE;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	312
34508 d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	313 if (STRCMP(cl->class_name, extends_name) == 0)
d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	314 {
d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	315 semsg(_(e_cannot_extend_str), extends_name);
d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	316 return success;
d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	317 }
d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	318
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	319 tv.v_type = VAR_UNKNOWN;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	320 if (eval_variable_import(extends_name, &tv) == FAIL)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	321 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	322 semsg(_(e_class_name_not_found_str), extends_name);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	323 return success;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	324 }
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	325
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	326 if (tv.v_type != VAR_CLASS \|\| tv.vval.v_class == NULL
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	327 \|\| (is_class && IS_INTERFACE(tv.vval.v_class))
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	328 \|\| (!is_class && !IS_INTERFACE(tv.vval.v_class))
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	329 \|\| (is_class && IS_ENUM(tv.vval.v_class)))
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	330 {
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	331 // a class cannot extend an interface
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	332 // an interface cannot extend a class
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	333 // a class cannot extend an enum.
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	334 semsg(_(e_cannot_extend_str), extends_name);
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	335 }
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	336 else
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	337 {
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	338 class_T *extends_cl = tv.vval.v_class;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	339 ++extends_cl->class_refcount;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	340 *extends_clp = extends_cl;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	341 success = TRUE;
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	342 }
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	343 clear_tv(&tv);
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	344
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	345 return success;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	346 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	347
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	348 /*
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	349 * Check method names in the parent class lineage to make sure the access is
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	350 * the same for overridden methods.
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	351 */
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	352 static int
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	353 validate_extends_methods(
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	354 garray_T *objmethods_gap,
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	355 class_T *extends_cl)
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	356 {
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	357 class_T *super = extends_cl;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	358 int method_count = objmethods_gap->ga_len;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	359 ufunc_T cl_fp = (ufunc_T )(objmethods_gap->ga_data);
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	360
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	361 while (super != NULL)
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	362 {
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	363 int extends_method_count = super->class_obj_method_count_child;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	364 if (extends_method_count == 0)
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	365 {
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	366 super = super->class_extends;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	367 continue;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	368 }
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	369
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	370 ufunc_T **extends_methods = super->class_obj_methods;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	371
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	372 for (int i = 0; i < extends_method_count; i++)
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	373 {
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	374 char_u *pstr = extends_methods[i]->uf_name;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	375 int extends_private = (*pstr == '_');
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	376 if (extends_private)
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	377 pstr++;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	378
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	379 // When comparing the method names, ignore the access type (public
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	380 // and private methods are considered the same).
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	381 for (int j = 0; j < method_count; j++)
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	382 {
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	383 char_u *qstr = cl_fp[j]->uf_name;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	384 int priv_method = (*qstr == '_');
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	385 if (priv_method)
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	386 qstr++;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	387 if (STRCMP(pstr, qstr) == 0 && priv_method != extends_private)
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	388 {
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	389 // Method access is different between the super class and
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	390 // the subclass
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	391 semsg(_(e_method_str_of_class_str_has_different_access),
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	392 cl_fp[j]->uf_name, super->class_name);
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	393 return FALSE;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	394 }
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	395 }
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	396 }
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	397 super = super->class_extends;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	398 }
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	399
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	400 return TRUE;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	401 }
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	402
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	403 /*
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	404 * Check whether a object member variable in "objmembers_gap" is a duplicate of
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	405 * a member in any of the extended parent class lineage. Returns TRUE if there
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	406 * are no duplicates.
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	407 */
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	408 static int
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	409 extends_check_dup_members(
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	410 garray_T *objmembers_gap,
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	411 class_T *extends_cl)
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	412 {
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	413 int member_count = objmembers_gap->ga_len;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	414 if (member_count == 0)
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	415 return TRUE;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	416
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	417 ocmember_T members = (ocmember_T )(objmembers_gap->ga_data);
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	418
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	419 // Validate each member variable
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	420 for (int c_i = 0; c_i < member_count; c_i++)
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	421 {
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	422 class_T *p_cl = extends_cl;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	423 ocmember_T *c_m = members + c_i;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	424 char_u pstr = (c_m->ocm_name == '_')
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	425 ? c_m->ocm_name + 1 : c_m->ocm_name;
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	426
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	427 // Check in all the parent classes in the lineage
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	428 while (p_cl != NULL)
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	429 {
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	430 int p_member_count = p_cl->class_obj_member_count;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	431 if (p_member_count == 0)
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	432 {
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	433 p_cl = p_cl->class_extends;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	434 continue;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	435 }
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	436 ocmember_T *p_members = p_cl->class_obj_members;
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	437
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	438 // Compare against all the members in the parent class
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	439 for (int p_i = 0; p_i < p_member_count; p_i++)
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	440 {
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	441 ocmember_T *p_m = p_members + p_i;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	442 char_u qstr = (p_m->ocm_name == '_')
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	443 ? p_m->ocm_name + 1 : p_m->ocm_name;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	444 if (STRCMP(pstr, qstr) == 0)
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	445 {
33343 41b50abddeea patch 9.0.1935: Vim9: not consistent error messages Christian Brabandt <cb@256bit.org> parents: 33326 diff changeset	446 semsg(_(e_duplicate_variable_str), c_m->ocm_name);
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	447 return FALSE;
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	448 }
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	449 }
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	450
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	451 p_cl = p_cl->class_extends;
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	452 }
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	453 }
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	454
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	455 return TRUE;
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	456 }
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	457
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	458 /*
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	459 * Compare the variable type of interface variables in "objmembers_gap" against
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	460 * the variable in any of the extended super interface lineage. Used to
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	461 * compare the variable types when extending interfaces. Returns TRUE if the
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	462 * variable types are the same.
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	463 */
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	464 static int
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	465 extends_check_intf_var_type(
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	466 garray_T *objmembers_gap,
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	467 class_T *extends_cl)
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	468 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	469 int member_count = objmembers_gap->ga_len;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	470 if (member_count == 0)
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	471 return TRUE;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	472
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	473 ocmember_T members = (ocmember_T )(objmembers_gap->ga_data);
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	474
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	475 // Validate each member variable
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	476 for (int c_i = 0; c_i < member_count; c_i++)
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	477 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	478 class_T *p_cl = extends_cl;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	479 ocmember_T *c_m = members + c_i;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	480 int var_found = FALSE;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	481
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	482 // Check in all the parent classes in the lineage
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	483 while (p_cl != NULL && !var_found)
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	484 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	485 int p_member_count = p_cl->class_obj_member_count;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	486 if (p_member_count == 0)
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	487 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	488 p_cl = p_cl->class_extends;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	489 continue;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	490 }
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	491 ocmember_T *p_members = p_cl->class_obj_members;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	492
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	493 // Compare against all the members in the parent class
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	494 for (int p_i = 0; p_i < p_member_count; p_i++)
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	495 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	496 where_T where = WHERE_INIT;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	497 ocmember_T *p_m = p_members + p_i;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	498
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	499 if (STRCMP(p_m->ocm_name, c_m->ocm_name) != 0)
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	500 continue;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	501
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	502 // Ensure the type is matching.
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	503 where.wt_func_name = (char *)c_m->ocm_name;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	504 where.wt_kind = WT_MEMBER;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	505
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	506 if (check_type(p_m->ocm_type, c_m->ocm_type, TRUE,
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	507 where) == FAIL)
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	508 return FALSE;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	509
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	510 var_found = TRUE;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	511 }
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	512
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	513 p_cl = p_cl->class_extends;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	514 }
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	515 }
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	516
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	517 return TRUE;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	518 }
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	519
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	520 /*
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	521 * When extending an abstract class, check whether all the abstract methods in
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	522 * the parent class are implemented. Returns TRUE if all the methods are
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	523 * implemented.
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	524 */
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	525 static int
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	526 validate_abstract_class_methods(
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	527 garray_T *classmethods_gap,
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	528 garray_T *objmethods_gap,
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	529 class_T *extends_cl)
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	530 {
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	531 for (int loop = 1; loop <= 2; ++loop)
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	532 {
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	533 // loop == 1: check class methods
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	534 // loop == 2: check object methods
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	535 int extends_method_count = loop == 1
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	536 ? extends_cl->class_class_function_count
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	537 : extends_cl->class_obj_method_count;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	538 if (extends_method_count == 0)
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	539 continue;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	540
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	541 ufunc_T **extends_methods = loop == 1
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	542 ? extends_cl->class_class_functions
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	543 : extends_cl->class_obj_methods;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	544
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	545 int method_count = loop == 1 ? classmethods_gap->ga_len
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	546 : objmethods_gap->ga_len;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	547 ufunc_T cl_fp = (ufunc_T )(loop == 1
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	548 ? classmethods_gap->ga_data
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	549 : objmethods_gap->ga_data);
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	550
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	551 for (int i = 0; i < extends_method_count; i++)
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	552 {
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	553 ufunc_T *uf = extends_methods[i];
33297 6340c608ca54 patch 9.0.1914: Vim9: few issues when accessing object members Christian Brabandt <cb@256bit.org> parents: 33291 diff changeset	554 if (!IS_ABSTRACT_METHOD(uf))
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	555 continue;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	556
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	557 int method_found = FALSE;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	558
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	559 for (int j = 0; j < method_count; j++)
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	560 {
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	561 if (STRCMP(uf->uf_name, cl_fp[j]->uf_name) == 0)
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	562 {
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	563 method_found = TRUE;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	564 break;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	565 }
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	566 }
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	567
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	568 if (!method_found)
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	569 {
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	570 semsg(_(e_abstract_method_str_not_found), uf->uf_name);
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	571 return FALSE;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	572 }
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	573 }
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	574 }
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	575
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	576 return TRUE;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	577 }
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	578
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	579 /*
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	580 * Returns TRUE if the interface variable "if_var" is present in the list of
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	581 * variables in "cl_mt" or in the parent lineage of one of the extended classes
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	582 * in "extends_cl". For a class variable, 'is_class_var' is TRUE.
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	583 */
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	584 static int
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	585 intf_variable_present(
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	586 char_u *intf_class_name,
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	587 ocmember_T *if_var,
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	588 ocmember_T *cl_mt,
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	589 int cl_member_count,
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	590 class_T *extends_cl)
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	591 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	592 int variable_present = FALSE;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	593
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	594 for (int cl_i = 0; cl_i < cl_member_count; ++cl_i)
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	595 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	596 ocmember_T *m = &cl_mt[cl_i];
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	597 where_T where = WHERE_INIT;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	598
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	599 if (STRCMP(if_var->ocm_name, m->ocm_name) != 0)
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	600 continue;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	601
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	602 // Ensure the access type is same
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	603 if (if_var->ocm_access != m->ocm_access)
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	604 {
33343 41b50abddeea patch 9.0.1935: Vim9: not consistent error messages Christian Brabandt <cb@256bit.org> parents: 33326 diff changeset	605 semsg(_(e_variable_str_of_interface_str_has_different_access),
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	606 if_var->ocm_name, intf_class_name);
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	607 return FALSE;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	608 }
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	609
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	610 // Ensure the type is matching.
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	611 if (m->ocm_type == &t_any)
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	612 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	613 // variable type is not specified. Use the variable type in the
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	614 // interface.
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	615 m->ocm_type = if_var->ocm_type;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	616 }
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	617 else
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	618 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	619 where.wt_func_name = (char *)m->ocm_name;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	620 where.wt_kind = WT_MEMBER;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	621 if (check_type(if_var->ocm_type, m->ocm_type, TRUE,
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	622 where) == FAIL)
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	623 return FALSE;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	624 }
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	625
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	626 variable_present = TRUE;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	627 break;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	628 }
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	629
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	630 if (!variable_present && extends_cl != NULL)
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	631 {
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	632 int ext_cl_count = extends_cl->class_obj_member_count;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	633 ocmember_T *ext_cl_mt = extends_cl->class_obj_members;
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	634 return intf_variable_present(intf_class_name, if_var,
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	635 ext_cl_mt, ext_cl_count,
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	636 extends_cl->class_extends);
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	637 }
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	638
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	639 return variable_present;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	640 }
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	641
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	642 /*
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	643 * Check the variables of the interface class "ifcl" match object variables
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	644 * ("objmembers_gap") of a class.
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	645 * Returns TRUE if the object variables names are valid.
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	646 */
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	647 static int
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	648 validate_interface_variables(
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	649 char_u *intf_class_name,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	650 class_T *ifcl,
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	651 garray_T *objmembers_gap,
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	652 class_T *extends_cl)
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	653 {
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	654 int if_count = ifcl->class_obj_member_count;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	655 if (if_count == 0)
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	656 return TRUE;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	657
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	658 ocmember_T *if_ms = ifcl->class_obj_members;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	659 ocmember_T cl_ms = (ocmember_T )(objmembers_gap->ga_data);
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	660 int cl_count = objmembers_gap->ga_len;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	661 for (int if_i = 0; if_i < if_count; ++if_i)
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	662 {
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	663 if (!intf_variable_present(intf_class_name, &if_ms[if_i], cl_ms,
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	664 cl_count, extends_cl))
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	665 {
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	666 semsg(_(e_variable_str_of_interface_str_not_implemented),
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	667 if_ms[if_i].ocm_name, intf_class_name);
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	668 return FALSE;
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	669 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	670 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	671
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	672 return TRUE;
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	673 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	674
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	675 /*
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	676 * Returns TRUE if the method signature of "if_method" and "cl_method" matches.
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	677 */
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	678 static int
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	679 intf_method_type_matches(ufunc_T if_method, ufunc_T cl_method)
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	680 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	681 where_T where = WHERE_INIT;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	682
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	683 // Ensure the type is matching.
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	684 where.wt_func_name = (char *)if_method->uf_name;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	685 where.wt_kind = WT_METHOD;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	686 if (check_type(if_method->uf_func_type, cl_method->uf_func_type, TRUE,
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	687 where) == FAIL)
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	688 return FALSE;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	689
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	690 return TRUE;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	691 }
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	692
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	693 /*
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	694 * Returns TRUE if the interface method "if_ufunc" is present in the list of
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	695 * methods in "cl_fp" or in the parent lineage of one of the extended classes
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	696 * in "extends_cl". For a class method, 'is_class_method' is TRUE.
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	697 */
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	698 static int
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	699 intf_method_present(
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	700 ufunc_T *if_ufunc,
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	701 ufunc_T **cl_fp,
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	702 int cl_count,
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	703 class_T *extends_cl)
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	704 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	705 int method_present = FALSE;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	706
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	707 for (int cl_i = 0; cl_i < cl_count; ++cl_i)
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	708 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	709 char_u *cl_name = cl_fp[cl_i]->uf_name;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	710 if (STRCMP(if_ufunc->uf_name, cl_name) == 0)
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	711 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	712 // Ensure the type is matching.
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	713 if (!intf_method_type_matches(if_ufunc, cl_fp[cl_i]))
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	714 return FALSE;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	715 method_present = TRUE;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	716 break;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	717 }
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	718 }
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	719
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	720 if (!method_present && extends_cl != NULL)
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	721 {
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	722 ufunc_T ext_cl_fp = (ufunc_T )(extends_cl->class_obj_methods);
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	723 int ext_cl_count = extends_cl->class_obj_method_count;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	724 return intf_method_present(if_ufunc, ext_cl_fp, ext_cl_count,
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	725 extends_cl->class_extends);
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	726 }
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	727
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	728 return method_present;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	729 }
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	730
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	731 /*
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	732 * Validate that a new class implements all the class/instance methods in the
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	733 * interface "ifcl". The new class methods are in "classfunctions_gap" and the
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	734 * new object methods are in "objmemthods_gap". Also validates the method
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	735 * types.
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	736 * Returns TRUE if all the interface class/object methods are implemented in
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	737 * the new class.
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	738 */
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	739 static int
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	740 validate_interface_methods(
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	741 char_u *intf_class_name,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	742 class_T *ifcl,
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	743 garray_T *objmethods_gap,
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	744 class_T *extends_cl)
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	745 {
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	746 int if_count = ifcl->class_obj_method_count;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	747 if (if_count == 0)
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	748 return TRUE;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	749
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	750 ufunc_T **if_fp = ifcl->class_obj_methods;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	751 ufunc_T cl_fp = (ufunc_T )(objmethods_gap->ga_data);
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	752 int cl_count = objmethods_gap->ga_len;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	753 for (int if_i = 0; if_i < if_count; ++if_i)
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	754 {
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	755 char_u *if_name = if_fp[if_i]->uf_name;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	756
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	757 if (!intf_method_present(if_fp[if_i], cl_fp, cl_count, extends_cl))
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	758 {
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	759 semsg(_(e_method_str_of_interface_str_not_implemented),
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	760 if_name, intf_class_name);
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	761 return FALSE;
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	762 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	763 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	764
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	765 return TRUE;
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	766 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	767
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	768 /*
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	769 * Validate all the "implements" classes when creating a new class. The
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	770 * classes are returned in "intf_classes". The class functions, class members,
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	771 * object methods and object members in the new class are in
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	772 * "classfunctions_gap", "classmembers_gap", "objmethods_gap", and
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	773 * "objmembers_gap" respectively.
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	774 */
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	775 static int
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	776 validate_implements_classes(
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	777 garray_T *impl_gap,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	778 class_T **intf_classes,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	779 garray_T *objmethods_gap,
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	780 garray_T *objmembers_gap,
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	781 class_T *extends_cl)
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	782 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	783 int success = TRUE;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	784
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	785 for (int i = 0; i < impl_gap->ga_len && success; ++i)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	786 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	787 char_u impl = ((char_u *)impl_gap->ga_data)[i];
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	788 typval_T tv;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	789 tv.v_type = VAR_UNKNOWN;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	790 if (eval_variable_import(impl, &tv) == FAIL)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	791 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	792 semsg(_(e_interface_name_not_found_str), impl);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	793 success = FALSE;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	794 break;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	795 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	796
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	797 if (tv.v_type != VAR_CLASS
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	798 \|\| tv.vval.v_class == NULL
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	799 \|\| !IS_INTERFACE(tv.vval.v_class))
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	800 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	801 semsg(_(e_not_valid_interface_str), impl);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	802 success = FALSE;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	803 clear_tv(&tv);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	804 break;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	805 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	806
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	807 class_T *ifcl = tv.vval.v_class;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	808 intf_classes[i] = ifcl;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	809 ++ifcl->class_refcount;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	810
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	811 // check the variables of the interface match the members of the class
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	812 success = validate_interface_variables(impl, ifcl, objmembers_gap,
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	813 extends_cl);
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	814
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	815 // check the functions/methods of the interface match the
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	816 // functions/methods of the class
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	817 if (success)
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	818 success = validate_interface_methods(impl, ifcl, objmethods_gap,
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	819 extends_cl);
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	820 clear_tv(&tv);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	821 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	822
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	823 return success;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	824 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	825
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	826 /*
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	827 * Check no function argument name is used as a class member.
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	828 * (Object members are always accessed with "this." prefix, so no need
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	829 * to check them.)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	830 */
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	831 static int
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	832 check_func_arg_names(
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	833 garray_T *classfunctions_gap,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	834 garray_T *objmethods_gap,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	835 garray_T *classmembers_gap)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	836 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	837 // loop 1: class functions, loop 2: object methods
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	838 for (int loop = 1; loop <= 2; ++loop)
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	839 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	840 garray_T *gap = loop == 1 ? classfunctions_gap : objmethods_gap;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	841
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	842 for (int fi = 0; fi < gap->ga_len; ++fi)
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	843 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	844 ufunc_T uf = ((ufunc_T *)gap->ga_data)[fi];
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	845
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	846 for (int i = 0; i < uf->uf_args.ga_len; ++i)
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	847 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	848 char_u aname = ((char_u *)uf->uf_args.ga_data)[i];
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	849 garray_T *mgap = classmembers_gap;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	850
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	851 // Check all the class member names
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	852 for (int mi = 0; mi < mgap->ga_len; ++mi)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	853 {
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	854 char_u *mname =
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	855 ((ocmember_T *)mgap->ga_data + mi)->ocm_name;
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	856 if (STRCMP(aname, mname) == 0)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	857 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	858 if (uf->uf_script_ctx.sc_sid > 0)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	859 SOURCING_LNUM = uf->uf_script_ctx.sc_lnum;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	860
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	861 semsg(_(e_argument_already_declared_in_class_str),
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	862 aname);
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	863
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	864 return FALSE;
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	865 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	866 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	867 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	868 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	869 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	870
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	871 return TRUE;
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	872 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	873
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	874 /*
33381 17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	875 * Returns TRUE if 'varname' is a reserved keyword name
33047 9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	876 */
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	877 static int
33381 17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	878 is_reserved_varname(char_u varname, char_u varname_end)
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	879 {
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	880 int reserved = FALSE;
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	881 char_u save_varname_end = *varname_end;
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	882 *varname_end = NUL;
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	883
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	884 reserved = check_reserved_name(varname, FALSE) == FAIL;
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	885
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	886 *varname_end = save_varname_end;
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	887
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	888 return reserved;
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	889 }
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	890
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	891 /*
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	892 * Returns TRUE if the variable "varname" is already defined either as a class
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	893 * variable or as an object variable.
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	894 */
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	895 static int
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	896 is_duplicate_variable(
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	897 garray_T *class_members,
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	898 garray_T *obj_members,
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	899 char_u *varname,
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	900 char_u *varname_end)
33047 9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	901 {
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	902 char_u *name = vim_strnsave(varname, varname_end - varname);
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	903 char_u pstr = (name == '_') ? name + 1 : name;
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	904 int dup = FALSE;
33047 9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	905
33381 17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	906 for (int loop = 1; loop <= 2; loop++)
33047 9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	907 {
33381 17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	908 // loop == 1: class variables, loop == 2: object variables
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	909 garray_T *vgap = (loop == 1) ? class_members : obj_members;
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	910 for (int i = 0; i < vgap->ga_len; ++i)
33047 9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	911 {
33381 17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	912 ocmember_T m = ((ocmember_T )vgap->ga_data) + i;
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	913 char_u qstr = m->ocm_name == '_' ? m->ocm_name + 1
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	914 : m->ocm_name;
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	915 if (STRCMP(pstr, qstr) == 0)
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	916 {
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	917 semsg(_(e_duplicate_variable_str), name);
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	918 dup = TRUE;
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	919 break;
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	920 }
33047 9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	921 }
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	922 }
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	923
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	924 vim_free(name);
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	925 return dup;
33047 9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	926 }
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	927
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	928 /*
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	929 * Returns TRUE if the method "name" is already defined.
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	930 */
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	931 static int
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	932 is_duplicate_method(
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	933 garray_T *classmethods_gap,
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	934 garray_T *objmethods_gap,
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	935 char_u *name)
33047 9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	936 {
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	937 char_u pstr = (name == '_') ? name + 1 : name;
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	938
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	939 // loop 1: class methods, loop 2: object methods
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	940 for (int loop = 1; loop <= 2; loop++)
33047 9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	941 {
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	942 garray_T *fgap = (loop == 1) ? classmethods_gap : objmethods_gap;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	943 for (int i = 0; i < fgap->ga_len; ++i)
33047 9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	944 {
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	945 char_u n = ((ufunc_T *)fgap->ga_data)[i]->uf_name;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	946 char_u qstr = n == '_' ? n + 1 : n;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	947 if (STRCMP(pstr, qstr) == 0)
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	948 {
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	949 semsg(_(e_duplicate_function_str), name);
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	950 return TRUE;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	951 }
33047 9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	952 }
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	953 }
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	954
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	955 return FALSE;
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	956 }
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	957
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	958 /*
33068 d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	959 * Returns TRUE if the constructor is valid.
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	960 */
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	961 static int
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	962 is_valid_constructor(ufunc_T *uf, int is_abstract, int has_static)
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	963 {
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	964 // Constructors are not allowed in abstract classes.
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	965 if (is_abstract)
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	966 {
33343 41b50abddeea patch 9.0.1935: Vim9: not consistent error messages Christian Brabandt <cb@256bit.org> parents: 33326 diff changeset	967 emsg(_(e_cannot_define_new_method_in_abstract_class));
33068 d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	968 return FALSE;
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	969 }
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	970 // A constructor is always static, no need to define it so.
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	971 if (has_static)
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	972 {
33343 41b50abddeea patch 9.0.1935: Vim9: not consistent error messages Christian Brabandt <cb@256bit.org> parents: 33326 diff changeset	973 emsg(_(e_cannot_define_new_method_as_static));
33068 d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	974 return FALSE;
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	975 }
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	976 // A return type should not be specified for the new()
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	977 // constructor method.
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	978 if (uf->uf_ret_type->tt_type != VAR_VOID)
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	979 {
33343 41b50abddeea patch 9.0.1935: Vim9: not consistent error messages Christian Brabandt <cb@256bit.org> parents: 33326 diff changeset	980 emsg(_(e_cannot_use_a_return_type_with_new_method));
33068 d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	981 return FALSE;
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	982 }
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	983 return TRUE;
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	984 }
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	985
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	986 /*
34472 5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	987 * Returns TRUE if 'uf' is a supported builtin method and has the correct
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	988 * method signature.
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	989 */
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	990 static int
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	991 object_check_builtin_method_sig(ufunc_T *uf)
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	992 {
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	993 char_u *name = uf->uf_name;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	994 int valid = FALSE;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	995 type_T method_sig;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	996 type_T method_rt;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	997 where_T where = WHERE_INIT;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	998
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	999 // validate the method signature
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1000 CLEAR_FIELD(method_sig);
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1001 CLEAR_FIELD(method_rt);
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1002 method_sig.tt_type = VAR_FUNC;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1003
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1004 if (STRCMP(name, "len") == 0)
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1005 {
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1006 // def __len(): number
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1007 method_rt.tt_type = VAR_NUMBER;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1008 method_sig.tt_member = &method_rt;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1009 valid = TRUE;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1010 }
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1011 else if (STRCMP(name, "empty") == 0)
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1012 {
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1013 // def __empty(): bool
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1014 method_rt.tt_type = VAR_BOOL;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1015 method_sig.tt_member = &method_rt;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1016 valid = TRUE;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1017 }
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1018 else if (STRCMP(name, "string") == 0)
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1019 {
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1020 // def __string(): string
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1021 method_rt.tt_type = VAR_STRING;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1022 method_sig.tt_member = &method_rt;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1023 valid = TRUE;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1024 }
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1025 else
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1026 semsg(_(e_builtin_object_method_str_not_supported), uf->uf_name);
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1027
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1028 where.wt_func_name = (char *)uf->uf_name;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1029 where.wt_kind = WT_METHOD;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1030 if (valid && !check_type(&method_sig, uf->uf_func_type, TRUE, where))
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1031 valid = FALSE;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1032
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1033 return valid;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1034 }
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1035
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1036 /*
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1037 * Returns TRUE if "funcname" is a supported builtin object method name
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1038 */
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1039 int
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1040 is_valid_builtin_obj_methodname(char_u *funcname)
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1041 {
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1042 switch (funcname[0])
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1043 {
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1044 case 'e':
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1045 return STRNCMP(funcname, "empty", 5) == 0;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1046
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1047 case 'l':
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1048 return STRNCMP(funcname, "len", 3) == 0;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1049
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1050 case 'n':
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1051 return STRNCMP(funcname, "new", 3) == 0;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1052
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1053 case 's':
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1054 return STRNCMP(funcname, "string", 6) == 0;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1055 }
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1056
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1057 return FALSE;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1058 }
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1059
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1060
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1061 /*
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1062 * Returns the builtin method "name" in object "obj". Returns NULL if the
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1063 * method is not found.
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1064 */
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1065 ufunc_T *
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1066 class_get_builtin_method(
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1067 class_T *cl,
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1068 class_builtin_T builtin_method,
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1069 int *method_idx)
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1070 {
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1071 *method_idx = -1;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1072
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1073 if (cl == NULL)
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1074 return NULL;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1075
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1076 *method_idx = cl->class_builtin_methods[builtin_method];
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1077 return method_idx != -1 ? cl->class_obj_methods[method_idx] : NULL;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1078 }
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1079
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1080 /*
32854 5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1081 * Update the interface class lookup table for the member index on the
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1082 * interface to the member index in the class implementing the interface.
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1083 * And a lookup table for the object method index on the interface
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1084 * to the object method index in the class implementing the interface.
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1085 * This is also used for updating the lookup table for the extended class
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1086 * hierarchy.
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1087 */
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1088 static int
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1089 update_member_method_lookup_table(
33109 2b5cc29b0a0e patch 9.0.1838: Vim9: Cannot modify class member vars from def function Christian Brabandt <cb@256bit.org> parents: 33106 diff changeset	1090 class_T *ifcl,
2b5cc29b0a0e patch 9.0.1838: Vim9: Cannot modify class member vars from def function Christian Brabandt <cb@256bit.org> parents: 33106 diff changeset	1091 class_T *cl,
33088 667a17904f64 patch 9.0.1829: Vim9 missing access-checks for private vars Christian Brabandt <cb@256bit.org> parents: 33070 diff changeset	1092 garray_T *objmethods,
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1093 int pobj_method_offset)
32854 5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1094 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1095 if (ifcl == NULL)
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1096 return OK;
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1097
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1098 // Table for members.
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1099 itf2class_T *if2cl = alloc_clear(sizeof(itf2class_T)
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1100 + ifcl->class_obj_member_count * sizeof(int));
32854 5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1101 if (if2cl == NULL)
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1102 return FAIL;
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1103 if2cl->i2c_next = ifcl->class_itf2class;
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1104 ifcl->class_itf2class = if2cl;
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1105 if2cl->i2c_class = cl;
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1106 if2cl->i2c_is_method = FALSE;
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1107
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1108 for (int if_i = 0; if_i < ifcl->class_obj_member_count; ++if_i)
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1109 for (int cl_i = 0; cl_i < cl->class_obj_member_count; ++cl_i)
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1110 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1111 if (STRCMP(ifcl->class_obj_members[if_i].ocm_name,
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1112 cl->class_obj_members[cl_i].ocm_name) == 0)
32854 5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1113 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1114 int table = (int )(if2cl + 1);
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1115 table[if_i] = cl_i;
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1116 break;
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1117 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1118 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1119
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1120 // Table for methods.
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1121 if2cl = alloc_clear(sizeof(itf2class_T)
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1122 + ifcl->class_obj_method_count * sizeof(int));
32854 5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1123 if (if2cl == NULL)
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1124 return FAIL;
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1125 if2cl->i2c_next = ifcl->class_itf2class;
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1126 ifcl->class_itf2class = if2cl;
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1127 if2cl->i2c_class = cl;
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1128 if2cl->i2c_is_method = TRUE;
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1129
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1130 for (int if_i = 0; if_i < ifcl->class_obj_method_count; ++if_i)
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1131 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1132 int done = FALSE;
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1133 for (int cl_i = 0; cl_i < objmethods->ga_len; ++cl_i)
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1134 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1135 if (STRCMP(ifcl->class_obj_methods[if_i]->uf_name,
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1136 ((ufunc_T **)objmethods->ga_data)[cl_i]->uf_name) == 0)
32854 5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1137 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1138 int table = (int )(if2cl + 1);
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1139 table[if_i] = cl_i;
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1140 done = TRUE;
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1141 break;
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1142 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1143 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1144
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1145 // extended class object method is not overridden by the child class.
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1146 // Keep the method declared in one of the parent classes in the
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1147 // lineage.
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1148 if (!done)
32854 5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1149 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1150 // If "ifcl" is not the immediate parent of "cl", then search in
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1151 // the intermediate parent classes.
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1152 if (cl->class_extends != ifcl)
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1153 {
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1154 class_T *parent = cl->class_extends;
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1155 int method_offset = objmethods->ga_len;
32854 5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1156
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1157 while (!done && parent != NULL && parent != ifcl)
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1158 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1159
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1160 for (int cl_i = 0;
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1161 cl_i < parent->class_obj_method_count_child; ++cl_i)
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1162 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1163 if (STRCMP(ifcl->class_obj_methods[if_i]->uf_name,
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1164 parent->class_obj_methods[cl_i]->uf_name)
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1165 == 0)
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1166 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1167 int table = (int )(if2cl + 1);
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1168 table[if_i] = method_offset + cl_i;
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1169 done = TRUE;
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1170 break;
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1171 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1172 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1173 method_offset += parent->class_obj_method_count_child;
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1174 parent = parent->class_extends;
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1175 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1176 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1177
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1178 if (!done)
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1179 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1180 int table = (int )(if2cl + 1);
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1181 table[if_i] = pobj_method_offset + if_i;
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1182 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1183 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1184 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1185
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1186 return OK;
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1187 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1188
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1189 /*
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1190 * Update the member and object method lookup tables for a new class in the
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1191 * interface class.
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1192 * For each interface add a lookup table for the member index on the interface
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1193 * to the member index in the new class. And a lookup table for the object
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1194 * method index on the interface to the object method index in the new class.
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1195 */
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1196 static int
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1197 add_lookup_tables(class_T cl, class_T extends_cl, garray_T *objmethods_gap)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1198 {
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1199 // update the lookup table for all the implemented interfaces
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1200 for (int i = 0; i < cl->class_interface_count; ++i)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1201 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1202 class_T *ifcl = cl->class_interfaces_cl[i];
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1203
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1204 // update the lookup table for this interface and all its super
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1205 // interfaces.
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1206 while (ifcl != NULL)
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1207 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1208 if (update_member_method_lookup_table(ifcl, cl, objmethods_gap,
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1209 0) == FAIL)
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1210 return FAIL;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1211 ifcl = ifcl->class_extends;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1212 }
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1213 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1214
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	1215 // Update the lookup table for the extended class, if any
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1216 if (extends_cl != NULL)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1217 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1218 class_T *pclass = extends_cl;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1219 int pobj_method_offset = objmethods_gap->ga_len;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1220
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1221 // Update the entire lineage of extended classes.
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1222 while (pclass != NULL)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1223 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1224 if (update_member_method_lookup_table(pclass, cl,
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1225 objmethods_gap, pobj_method_offset) == FAIL)
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1226 return FAIL;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1227
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1228 pobj_method_offset += pclass->class_obj_method_count_child;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1229 pclass = pclass->class_extends;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1230 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1231 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1232
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1233 return OK;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1234 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1235
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1236 /*
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1237 * Add class members to a new class. Allocate a typval for each class member
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1238 * and initialize it.
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1239 */
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1240 static int
33471 baa62f464436 patch 9.0.1988: Vim9: potential use-after-free for class members Christian Brabandt <cb@256bit.org> parents: 33456 diff changeset	1241 add_class_members(class_T cl, exarg_T eap, garray_T *type_list_gap)
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1242 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1243 // Allocate a typval for each class member and initialize it.
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1244 cl->class_members_tv = ALLOC_CLEAR_MULT(typval_T,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1245 cl->class_class_member_count);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1246 if (cl->class_members_tv == NULL)
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1247 return FAIL;
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1248
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1249 for (int i = 0; i < cl->class_class_member_count; ++i)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1250 {
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1251 ocmember_T *m = &cl->class_class_members[i];
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1252 typval_T *tv = &cl->class_members_tv[i];
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1253 if (m->ocm_init != NULL)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1254 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1255 typval_T *etv = eval_expr(m->ocm_init, eap);
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1256 if (etv == NULL)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1257 return FAIL;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1258
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1259 if (m->ocm_type->tt_type == VAR_ANY
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1260 && !(m->ocm_flags & OCMFLAG_HAS_TYPE)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1261 && etv->v_type != VAR_SPECIAL)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1262 // If the member variable type is not yet set, then use
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1263 // the initialization expression type.
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1264 m->ocm_type = typval2type(etv, get_copyID(),
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1265 type_list_gap,
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1266 TVTT_DO_MEMBER\|TVTT_MORE_SPECIFIC);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1267 tv = etv;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1268 vim_free(etv);
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1269 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1270 else
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1271 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1272 // TODO: proper default value
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1273 tv->v_type = m->ocm_type->tt_type;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1274 tv->vval.v_string = NULL;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1275 }
33951 45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	1276 if (m->ocm_flags & OCMFLAG_CONST)
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	1277 item_lock(tv, DICT_MAXNEST, TRUE, TRUE);
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1278 }
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1279
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1280 return OK;
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1281 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1282
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1283 /*
32903 54c01bb98b8e patch 9.0.1760: vim9 class problem with new() constructor Christian Brabandt <cb@256bit.org> parents: 32896 diff changeset	1284 * Add a default constructor method (new()) to the class "cl".
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1285 */
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1286 static void
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1287 add_default_constructor(
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1288 class_T *cl,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1289 garray_T *classfunctions_gap,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1290 garray_T *type_list_gap)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1291 {
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1292 garray_T fga;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1293 int is_enum = IS_ENUM(cl);
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1294
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1295 ga_init2(&fga, 1, 1000);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1296 ga_concat(&fga, (char_u *)"new(");
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1297 for (int i = 0; i < cl->class_obj_member_count; ++i)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1298 {
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1299 if (i < 2 && is_enum)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1300 // The first two object variables in an enum are the enum value
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1301 // name and ordinal. Don't initialize these object variables in
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1302 // the default constructor as they are already initialized right
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1303 // after creating the object.
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1304 continue;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1305
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1306 if (i > (is_enum ? 2 : 0))
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1307 ga_concat(&fga, (char_u *)", ");
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1308 ga_concat(&fga, (char_u *)"this.");
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1309 ocmember_T *m = cl->class_obj_members + i;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1310 ga_concat(&fga, (char_u *)m->ocm_name);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1311 ga_concat(&fga, (char_u *)" = v:none");
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1312 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1313 ga_concat(&fga, (char_u *)")\nenddef\n");
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1314 ga_append(&fga, NUL);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1315
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1316 exarg_T fea;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1317 CLEAR_FIELD(fea);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1318 fea.cmdidx = CMD_def;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1319 fea.cmd = fea.arg = fga.ga_data;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1320
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1321 garray_T lines_to_free;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1322 ga_init2(&lines_to_free, sizeof(char_u *), 50);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1323
33326 4e531adb3fac patch 9.0.1928: Vim9: constructor type checking bug Christian Brabandt <cb@256bit.org> parents: 33297 diff changeset	1324 ufunc_T *nf = define_function(&fea, NULL, &lines_to_free, CF_CLASS,
4e531adb3fac patch 9.0.1928: Vim9: constructor type checking bug Christian Brabandt <cb@256bit.org> parents: 33297 diff changeset	1325 cl->class_obj_members, cl->class_obj_member_count);
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1326
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1327 ga_clear_strings(&lines_to_free);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1328 vim_free(fga.ga_data);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1329
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1330 if (nf != NULL && ga_grow(classfunctions_gap, 1) == OK)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1331 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1332 ((ufunc_T **)classfunctions_gap->ga_data)[classfunctions_gap->ga_len]
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1333 = nf;
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1334 ++classfunctions_gap->ga_len;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1335
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1336 nf->uf_flags \|= FC_NEW;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1337 nf->uf_ret_type = get_type_ptr(type_list_gap);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1338 if (nf->uf_ret_type != NULL)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1339 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1340 nf->uf_ret_type->tt_type = VAR_OBJECT;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1341 nf->uf_ret_type->tt_class = cl;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1342 nf->uf_ret_type->tt_argcount = 0;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1343 nf->uf_ret_type->tt_args = NULL;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1344 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1345 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1346 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1347
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1348 /*
33268 e231b9af0f44 patch 9.0.1902: Vim9: Coverity complains about dead code Christian Brabandt <cb@256bit.org> parents: 33260 diff changeset	1349 * Add the class methods and object methods to the new class "cl".
e231b9af0f44 patch 9.0.1902: Vim9: Coverity complains about dead code Christian Brabandt <cb@256bit.org> parents: 33260 diff changeset	1350 * When extending a class "extends_cl", add the instance methods from the
e231b9af0f44 patch 9.0.1902: Vim9: Coverity complains about dead code Christian Brabandt <cb@256bit.org> parents: 33260 diff changeset	1351 * parent class also.
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1352 * Returns OK on success and FAIL on memory allocation failure.
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1353 */
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1354 static int
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1355 add_classfuncs_objmethods(
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1356 class_T *cl,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1357 class_T *extends_cl,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1358 garray_T *classfunctions_gap,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1359 garray_T *objmethods_gap)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1360 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1361 // loop 1: class functions, loop 2: object methods
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1362 for (int loop = 1; loop <= 2; ++loop)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1363 {
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1364 garray_T *gap = loop == 1 ? classfunctions_gap : objmethods_gap;
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1365 int *fcount = loop == 1 ? &cl->class_class_function_count
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1366 : &cl->class_obj_method_count;
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1367 ufunc_T ***fup = loop == 1 ? &cl->class_class_functions
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1368 : &cl->class_obj_methods;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1369
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1370 int parent_count = 0;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1371 if (extends_cl != NULL)
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	1372 // Include object methods from the parent.
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	1373 // Don't include the parent class methods.
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1374 parent_count = loop == 1
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	1375 ? 0
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1376 : extends_cl->class_obj_method_count;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1377
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1378 *fcount = parent_count + gap->ga_len;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1379 if (*fcount == 0)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1380 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1381 *fup = NULL;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1382 continue;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1383 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1384 fup = ALLOC_MULT(ufunc_T , *fcount);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1385 if (*fup == NULL)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1386 return FAIL;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1387
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1388 if (gap->ga_len != 0)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1389 mch_memmove(fup, gap->ga_data, sizeof(ufunc_T ) * gap->ga_len);
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1390 VIM_CLEAR(gap->ga_data);
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1391 if (loop == 1)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1392 cl->class_class_function_count_child = gap->ga_len;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1393 else
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1394 cl->class_obj_method_count_child = gap->ga_len;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1395
33268 e231b9af0f44 patch 9.0.1902: Vim9: Coverity complains about dead code Christian Brabandt <cb@256bit.org> parents: 33260 diff changeset	1396 if (loop == 2)
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1397 {
33268 e231b9af0f44 patch 9.0.1902: Vim9: Coverity complains about dead code Christian Brabandt <cb@256bit.org> parents: 33260 diff changeset	1398 // Copy instance methods from the parent.
e231b9af0f44 patch 9.0.1902: Vim9: Coverity complains about dead code Christian Brabandt <cb@256bit.org> parents: 33260 diff changeset	1399
e231b9af0f44 patch 9.0.1902: Vim9: Coverity complains about dead code Christian Brabandt <cb@256bit.org> parents: 33260 diff changeset	1400 for (int i = 0; i < parent_count; ++i)
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1401 {
33268 e231b9af0f44 patch 9.0.1902: Vim9: Coverity complains about dead code Christian Brabandt <cb@256bit.org> parents: 33260 diff changeset	1402 // Can't use the same parent function, because "uf_class" is
e231b9af0f44 patch 9.0.1902: Vim9: Coverity complains about dead code Christian Brabandt <cb@256bit.org> parents: 33260 diff changeset	1403 // different and compilation will have a different result.
e231b9af0f44 patch 9.0.1902: Vim9: Coverity complains about dead code Christian Brabandt <cb@256bit.org> parents: 33260 diff changeset	1404 // Put them after the functions in the current class, object
e231b9af0f44 patch 9.0.1902: Vim9: Coverity complains about dead code Christian Brabandt <cb@256bit.org> parents: 33260 diff changeset	1405 // methods may be overruled, then "super.Method()" is used to
e231b9af0f44 patch 9.0.1902: Vim9: Coverity complains about dead code Christian Brabandt <cb@256bit.org> parents: 33260 diff changeset	1406 // find a method from the parent.
e231b9af0f44 patch 9.0.1902: Vim9: Coverity complains about dead code Christian Brabandt <cb@256bit.org> parents: 33260 diff changeset	1407 ufunc_T *pf = (extends_cl->class_obj_methods)[i];
e231b9af0f44 patch 9.0.1902: Vim9: Coverity complains about dead code Christian Brabandt <cb@256bit.org> parents: 33260 diff changeset	1408 (*fup)[gap->ga_len + i] = copy_function(pf);
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1409
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1410 // If the child class overrides a function from the parent
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1411 // the signature must be equal.
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1412 char_u *pname = pf->uf_name;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1413 for (int ci = 0; ci < gap->ga_len; ++ci)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1414 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1415 ufunc_T cf = (fup)[ci];
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1416 char_u *cname = cf->uf_name;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1417 if (STRCMP(pname, cname) == 0)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1418 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1419 where_T where = WHERE_INIT;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1420 where.wt_func_name = (char *)pname;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1421 where.wt_kind = WT_METHOD;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1422 (void)check_type(pf->uf_func_type, cf->uf_func_type,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1423 TRUE, where);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1424 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1425 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1426 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1427 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1428
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1429 // Set the class pointer on all the functions and object methods.
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1430 for (int i = 0; i < *fcount; ++i)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1431 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1432 ufunc_T fp = (fup)[i];
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1433 fp->uf_class = cl;
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	1434 if (i < gap->ga_len)
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	1435 fp->uf_defclass = cl;
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1436 if (loop == 2)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1437 fp->uf_flags \|= FC_OBJECT;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1438 }
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1439
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1440 ga_clear(gap);
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1441 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1442
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1443 return OK;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1444 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1445
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1446 /*
34472 5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1447 * Update the index of object methods called by builtin functions.
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1448 */
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1449 static void
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1450 update_builtin_method_index(class_T *cl)
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1451 {
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1452 int i;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1453
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1454 for (i = 0; i < CLASS_BUILTIN_MAX; i++)
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1455 cl->class_builtin_methods[i] = -1;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1456
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1457 for (i = 0; i < cl->class_obj_method_count; i++)
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1458 {
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1459 ufunc_T *uf = cl->class_obj_methods[i];
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1460
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1461 if (cl->class_builtin_methods[CLASS_BUILTIN_STRING] == -1
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1462 && STRCMP(uf->uf_name, "string") == 0)
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1463 cl->class_builtin_methods[CLASS_BUILTIN_STRING] = i;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1464 else if (cl->class_builtin_methods[CLASS_BUILTIN_EMPTY] == -1 &&
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1465 STRCMP(uf->uf_name, "empty") == 0)
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1466 cl->class_builtin_methods[CLASS_BUILTIN_EMPTY] = i;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1467 else if (cl->class_builtin_methods[CLASS_BUILTIN_LEN] == -1 &&
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1468 STRCMP(uf->uf_name, "len") == 0)
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1469 cl->class_builtin_methods[CLASS_BUILTIN_LEN] = i;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1470 }
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1471 }
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1472
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	1473 /*
33929 34c5f47e98ba patch 9.0.2161: Vim9: not able to use imported interfaces and classes Christian Brabandt <cb@256bit.org> parents: 33924 diff changeset	1474 * Return the end of the class name starting at "arg". Valid characters in a
34c5f47e98ba patch 9.0.2161: Vim9: not able to use imported interfaces and classes Christian Brabandt <cb@256bit.org> parents: 33924 diff changeset	1475 * class name are alphanumeric characters and "_". Also handles imported class
34c5f47e98ba patch 9.0.2161: Vim9: not able to use imported interfaces and classes Christian Brabandt <cb@256bit.org> parents: 33924 diff changeset	1476 * names.
34c5f47e98ba patch 9.0.2161: Vim9: not able to use imported interfaces and classes Christian Brabandt <cb@256bit.org> parents: 33924 diff changeset	1477 */
34c5f47e98ba patch 9.0.2161: Vim9: not able to use imported interfaces and classes Christian Brabandt <cb@256bit.org> parents: 33924 diff changeset	1478 static char_u *
34c5f47e98ba patch 9.0.2161: Vim9: not able to use imported interfaces and classes Christian Brabandt <cb@256bit.org> parents: 33924 diff changeset	1479 find_class_name_end(char_u *arg)
34c5f47e98ba patch 9.0.2161: Vim9: not able to use imported interfaces and classes Christian Brabandt <cb@256bit.org> parents: 33924 diff changeset	1480 {
34c5f47e98ba patch 9.0.2161: Vim9: not able to use imported interfaces and classes Christian Brabandt <cb@256bit.org> parents: 33924 diff changeset	1481 char_u *end = arg;
34c5f47e98ba patch 9.0.2161: Vim9: not able to use imported interfaces and classes Christian Brabandt <cb@256bit.org> parents: 33924 diff changeset	1482
34c5f47e98ba patch 9.0.2161: Vim9: not able to use imported interfaces and classes Christian Brabandt <cb@256bit.org> parents: 33924 diff changeset	1483 while (ASCII_ISALNUM(end) \|\| end == '_'
34c5f47e98ba patch 9.0.2161: Vim9: not able to use imported interfaces and classes Christian Brabandt <cb@256bit.org> parents: 33924 diff changeset	1484 \|\| (*end == '.' && (ASCII_ISALNUM(end[1]) \|\| end[1] == '_')))
34c5f47e98ba patch 9.0.2161: Vim9: not able to use imported interfaces and classes Christian Brabandt <cb@256bit.org> parents: 33924 diff changeset	1485 ++end;
34c5f47e98ba patch 9.0.2161: Vim9: not able to use imported interfaces and classes Christian Brabandt <cb@256bit.org> parents: 33924 diff changeset	1486
34c5f47e98ba patch 9.0.2161: Vim9: not able to use imported interfaces and classes Christian Brabandt <cb@256bit.org> parents: 33924 diff changeset	1487 return end;
34c5f47e98ba patch 9.0.2161: Vim9: not able to use imported interfaces and classes Christian Brabandt <cb@256bit.org> parents: 33924 diff changeset	1488 }
34c5f47e98ba patch 9.0.2161: Vim9: not able to use imported interfaces and classes Christian Brabandt <cb@256bit.org> parents: 33924 diff changeset	1489
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1490 /*
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1491 * Returns TRUE if the enum value "varname" is already defined.
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1492 */
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1493 static int
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1494 is_duplicate_enum(
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1495 garray_T *enum_gap,
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1496 char_u *varname,
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1497 char_u *varname_end)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1498 {
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1499 char_u *name = vim_strnsave(varname, varname_end - varname);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1500 int dup = FALSE;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1501
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1502 for (int i = 0; i < enum_gap->ga_len; ++i)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1503 {
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1504 ocmember_T m = ((ocmember_T )enum_gap->ga_data) + i;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1505 if (STRCMP(name, m->ocm_name) == 0)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1506 {
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1507 semsg(_(e_duplicate_enum_str), name);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1508 dup = TRUE;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1509 break;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1510 }
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1511 }
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1512
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1513 vim_free(name);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1514 return dup;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1515 }
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1516
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1517 /*
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1518 * Parse the enum values in "line" separated by comma and add them to "gap".
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1519 * If the last enum value is found, then "enum_end" is set to TRUE.
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1520 */
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1521 static int
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1522 enum_parse_values(
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1523 exarg_T *eap,
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1524 class_T *en,
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1525 char_u *line,
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1526 garray_T *gap,
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1527 int *num_enum_values,
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1528 int *enum_end)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1529 {
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1530 evalarg_T evalarg;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1531 char_u *p = line;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1532 char initexpr_buf[1024];
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1533 char_u last_char = NUL;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1534 int rc = OK;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1535
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1536 fill_evalarg_from_eap(&evalarg, eap, FALSE);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1537
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1538 int did_emsg_before = did_emsg;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1539 while (*p != NUL)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1540 {
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1541 // ignore comment
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1542 if (*p == '#')
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1543 break;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1544
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1545 if (!eval_isnamec1(*p))
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1546 {
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1547 semsg(_(e_invalid_enum_value_declaration_str), p);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1548 break;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1549 }
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1550
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1551 char_u *eni_name_start = p;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1552 char_u *eni_name_end = to_name_end(p, FALSE);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1553
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1554 if (is_duplicate_enum(gap, eni_name_start, eni_name_end))
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1555 break;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1556
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1557 p = skipwhite(eni_name_end);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1558
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1559 char_u *init_expr = NULL;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1560 if (*p == '(')
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1561 {
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1562 if (VIM_ISWHITE(p[-1]))
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1563 {
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1564 semsg(_(e_no_white_space_allowed_before_str_str), "(", line);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1565 break;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1566 }
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1567
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1568 char_u expr_start, expr_end;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1569
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1570 p = eni_name_start;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1571 (void)skip_expr_concatenate(&p, &expr_start, &expr_end, &evalarg);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1572
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1573 while (expr_start && expr_start != '(')
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1574 expr_start++;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1575
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1576 if (expr_end > expr_start)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1577 init_expr = vim_strnsave(expr_start, expr_end - expr_start);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1578 }
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1579
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1580 if (init_expr == NULL)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1581 vim_snprintf(initexpr_buf, sizeof(initexpr_buf), "%s.new()",
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1582 en->class_name);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1583 else
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1584 {
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1585 vim_snprintf(initexpr_buf, sizeof(initexpr_buf), "%s.new%s",
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1586 en->class_name, init_expr);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1587 vim_free(init_expr);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1588 }
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1589 if (add_member(gap, eni_name_start, eni_name_end, FALSE,
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1590 TRUE, TRUE, TRUE, &en->class_object_type,
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1591 vim_strsave((char_u *)initexpr_buf)) == FAIL)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1592 break;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1593
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1594 ++*num_enum_values;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1595
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1596 if (*p != '#')
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1597 last_char = *p;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1598
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1599 if (p != NUL && p != ',')
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1600 break;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1601
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1602 if (*p == ',')
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1603 {
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1604 if (!IS_WHITE_OR_NUL(p[1]))
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1605 {
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1606 semsg(_(e_white_space_required_after_str_str), ",", line);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1607 break;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1608 }
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1609 if (VIM_ISWHITE(p[-1]))
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1610 {
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1611 semsg(_(e_no_white_space_allowed_before_str_str), ",", line);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1612 break;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1613 }
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1614 p = skipwhite(p + 1);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1615 }
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1616 }
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1617
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1618 if (p != NUL && p != '#')
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1619 {
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1620 if (did_emsg == did_emsg_before)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1621 semsg(_(e_missing_comma_before_argument_str), p);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1622 rc = FAIL;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1623 }
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1624
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1625 if (last_char != ',')
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1626 // last enum value should not be terminated by ","
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1627 *enum_end = TRUE;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1628
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1629 // Free the memory pointed by expr_start.
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1630 clear_evalarg(&evalarg, NULL);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1631
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1632 return rc;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1633 }
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1634
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1635 /*
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1636 * Add the "values" class variable (List of enum value objects) to the enum
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1637 * class "en"
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1638 */
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1639 static int
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1640 enum_add_values_member(
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1641 class_T *en,
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1642 garray_T *gap,
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1643 int num_enum_values,
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1644 garray_T *type_list_gap)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1645 {
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1646 garray_T fga;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1647 int rc = FAIL;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1648
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1649 ga_init2(&fga, 1, 1000);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1650 ga_concat(&fga, (char_u *)"[");
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1651 for (int i = 0; i < num_enum_values; ++i)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1652 {
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1653 ocmember_T m = ((ocmember_T )gap->ga_data) + i;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1654
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1655 if (i > 0)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1656 ga_concat(&fga, (char_u *)", ");
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1657 ga_concat(&fga, en->class_name);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1658 ga_concat(&fga, (char_u *)".");
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1659 ga_concat(&fga, (char_u *)m->ocm_name);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1660 }
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1661 ga_concat(&fga, (char_u *)"]");
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1662 ga_append(&fga, NUL);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1663
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1664 char_u varname = (char_u )"values";
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1665
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1666 type_T *type = get_type_ptr(type_list_gap);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1667 if (type == NULL)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1668 goto done;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1669
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1670 type->tt_type = VAR_LIST;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1671 type->tt_member = get_type_ptr(type_list_gap);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1672 if (type->tt_member != NULL)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1673 {
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1674 type->tt_member->tt_type = VAR_OBJECT;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1675 type->tt_member->tt_class = en;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1676 }
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1677
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1678 rc = add_member(gap, varname, varname + 6, FALSE, FALSE, TRUE, TRUE, type,
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1679 vim_strsave((char_u *)fga.ga_data));
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1680
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1681 done:
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1682 vim_free(fga.ga_data);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1683
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1684 return rc;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1685 }
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1686
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1687 /*
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1688 * Clear the constructor method names in a enum class, so that an enum class
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1689 * cannot be instantiated.
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1690 */
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1691 static void
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1692 enum_clear_constructors(class_T *en)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1693 {
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1694 for (int i = 0; i < en->class_class_function_count; ++i)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1695 {
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1696 ufunc_T *fp = en->class_class_functions[i];
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1697
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1698 if (fp->uf_flags & FC_NEW)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1699 *fp->uf_name = NUL;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1700 }
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1701 }
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1702
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1703 /*
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1704 * Initialize the name and ordinal object variable in the enum value "enval" in
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1705 * the enum "en". These values are set during the enum value object creation.
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1706 */
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1707 void
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1708 enum_set_internal_obj_vars(class_T en, object_T enval)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1709 {
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1710 int i;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1711
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1712 for (i = 0; i < en->class_class_member_count; ++i)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1713 {
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1714 typval_T *en_tv = en->class_members_tv + i;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1715 if (en_tv != NULL && en_tv->v_type == VAR_UNKNOWN)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1716 break;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1717 }
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1718
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1719 // First object variable is the name
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1720 ocmember_T *value_ocm = en->class_class_members + i;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1721 typval_T name_tv = (typval_T )(enval + 1);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1722 name_tv->v_type = VAR_STRING;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1723 name_tv->vval.v_string = vim_strsave(value_ocm->ocm_name);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1724
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1725 // Second object variable is the ordinal
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1726 typval_T ord_tv = (typval_T )(name_tv + 1);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1727 ord_tv->v_type = VAR_NUMBER;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1728 ord_tv->vval.v_number = i;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1729 }
33929 34c5f47e98ba patch 9.0.2161: Vim9: not able to use imported interfaces and classes Christian Brabandt <cb@256bit.org> parents: 33924 diff changeset	1730
34c5f47e98ba patch 9.0.2161: Vim9: not able to use imported interfaces and classes Christian Brabandt <cb@256bit.org> parents: 33924 diff changeset	1731 /*
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1732 * Handle ":class" and ":abstract class" up to ":endclass".
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1733 * Handle ":interface" up to ":endinterface".
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1734 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1735 void
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1736 ex_class(exarg_T *eap)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1737 {
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1738 int is_class = eap->cmdidx == CMD_class;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1739 int is_abstract = eap->cmdidx == CMD_abstract;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1740 int is_enum = eap->cmdidx == CMD_enum;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1741 int is_interface;
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1742 long start_lnum = SOURCING_LNUM;
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1743 char_u *arg = eap->arg;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1744
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1745 if (is_abstract)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1746 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1747 if (STRNCMP(arg, "class", 5) != 0 \|\| !VIM_ISWHITE(arg[5]))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1748 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1749 semsg(_(e_invalid_argument_str), arg);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1750 return;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1751 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1752 arg = skipwhite(arg + 5);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1753 is_class = TRUE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1754 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1755
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1756 is_interface = !is_class && !is_enum;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1757
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1758 if (!current_script_is_vim9()
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1759 \|\| (cmdmod.cmod_flags & CMOD_LEGACY)
33988 7c30841c60a0 patch 9.0.2180: POSIX function name in exarg causes issues Christian Brabandt <cb@256bit.org> parents: 33951 diff changeset	1760 \|\| !getline_equal(eap->ea_getline, eap->cookie, getsourceline))
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1761 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1762 if (is_class)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1763 emsg(_(e_class_can_only_be_defined_in_vim9_script));
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1764 else if (is_enum)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1765 emsg(_(e_enum_can_only_be_defined_in_vim9_script));
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1766 else
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1767 emsg(_(e_interface_can_only_be_defined_in_vim9_script));
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1768 return;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1769 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1770
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1771 if (!ASCII_ISUPPER(*arg))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1772 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1773 if (is_class)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1774 semsg(_(e_class_name_must_start_with_uppercase_letter_str), arg);
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1775 else if (is_enum)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1776 semsg(_(e_enum_name_must_start_with_uppercase_letter_str), arg);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1777 else
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1778 semsg(_(e_interface_name_must_start_with_uppercase_letter_str),
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1779 arg);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1780 return;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1781 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1782 char_u *name_end = find_name_end(arg, NULL, NULL, FNE_CHECK_START);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1783 if (!IS_WHITE_OR_NUL(*name_end))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1784 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1785 semsg(_(e_white_space_required_after_name_str), arg);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1786 return;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1787 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1788 char_u *name_start = arg;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1789
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1790 // TODO:
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1791 // generics: <Tkey, Tentry>
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1792
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1793 // Name for "extends BaseClass"
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1794 char_u *extends = NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1795
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1796 // Names for "implements SomeInterface"
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1797 garray_T ga_impl;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1798 ga_init2(&ga_impl, sizeof(char_u *), 5);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1799
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1800 arg = skipwhite(name_end);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1801 while (arg != NUL && arg != '#' && *arg != '\n')
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1802 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1803 // TODO:
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1804 // specifies SomeInterface
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1805 if (STRNCMP(arg, "extends", 7) == 0 && IS_WHITE_OR_NUL(arg[7]))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1806 {
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1807 if (is_enum)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1808 {
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1809 emsg(_(e_enum_cannot_extend_class));
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1810 goto early_ret;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1811 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1812 if (extends != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1813 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1814 emsg(_(e_duplicate_extends));
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1815 goto early_ret;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1816 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1817 arg = skipwhite(arg + 7);
33929 34c5f47e98ba patch 9.0.2161: Vim9: not able to use imported interfaces and classes Christian Brabandt <cb@256bit.org> parents: 33924 diff changeset	1818
34c5f47e98ba patch 9.0.2161: Vim9: not able to use imported interfaces and classes Christian Brabandt <cb@256bit.org> parents: 33924 diff changeset	1819 char_u *end = find_class_name_end(arg);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1820 if (!IS_WHITE_OR_NUL(*end))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1821 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1822 semsg(_(e_white_space_required_after_name_str), arg);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1823 goto early_ret;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1824 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1825 extends = vim_strnsave(arg, end - arg);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1826 if (extends == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1827 goto early_ret;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1828
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1829 arg = skipwhite(end + 1);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1830 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1831 else if (STRNCMP(arg, "implements", 10) == 0
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1832 && IS_WHITE_OR_NUL(arg[10]))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1833 {
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1834 if (is_interface)
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1835 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1836 emsg(_(e_interface_cannot_use_implements));
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1837 goto early_ret;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1838 }
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1839
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1840 if (ga_impl.ga_len > 0)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1841 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1842 emsg(_(e_duplicate_implements));
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1843 goto early_ret;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1844 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1845 arg = skipwhite(arg + 10);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1846
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1847 for (;;)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1848 {
33929 34c5f47e98ba patch 9.0.2161: Vim9: not able to use imported interfaces and classes Christian Brabandt <cb@256bit.org> parents: 33924 diff changeset	1849 char_u *impl_end = find_class_name_end(arg);
33372 3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	1850 if ((!IS_WHITE_OR_NUL(impl_end) && impl_end != ',')
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	1851 \|\| (*impl_end == ','
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	1852 && !IS_WHITE_OR_NUL(*(impl_end + 1))))
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1853 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1854 semsg(_(e_white_space_required_after_name_str), arg);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1855 goto early_ret;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1856 }
33372 3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	1857 if (impl_end - arg == 0)
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	1858 {
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	1859 emsg(_(e_missing_name_after_implements));
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	1860 goto early_ret;
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	1861 }
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	1862
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1863 char_u *iname = vim_strnsave(arg, impl_end - arg);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1864 if (iname == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1865 goto early_ret;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1866 for (int i = 0; i < ga_impl.ga_len; ++i)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1867 if (STRCMP(((char_u **)ga_impl.ga_data)[i], iname) == 0)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1868 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1869 semsg(_(e_duplicate_interface_after_implements_str),
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1870 iname);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1871 vim_free(iname);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1872 goto early_ret;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1873 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1874 if (ga_add_string(&ga_impl, iname) == FAIL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1875 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1876 vim_free(iname);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1877 goto early_ret;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1878 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1879 if (*impl_end != ',')
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1880 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1881 arg = skipwhite(impl_end);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1882 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1883 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1884 arg = skipwhite(impl_end + 1);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1885 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1886 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1887 else
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1888 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1889 semsg(_(e_trailing_characters_str), arg);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1890 early_ret:
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1891 vim_free(extends);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1892 ga_clear_strings(&ga_impl);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1893 return;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1894 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1895 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1896
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1897 garray_T type_list; // list of pointers to allocated types
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1898 ga_init2(&type_list, sizeof(type_T *), 10);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1899
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1900 // Growarray with class members declared in the class.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1901 garray_T classmembers;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1902 ga_init2(&classmembers, sizeof(ocmember_T), 10);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1903
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1904 // Growarray with functions declared in the class.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1905 garray_T classfunctions;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1906 ga_init2(&classfunctions, sizeof(ufunc_T *), 10);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1907
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1908 // Growarray with object members declared in the class.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1909 garray_T objmembers;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1910 ga_init2(&objmembers, sizeof(ocmember_T), 10);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1911
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1912 // Growarray with object methods declared in the class.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1913 garray_T objmethods;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1914 ga_init2(&objmethods, sizeof(ufunc_T *), 10);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1915
34508 d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	1916 class_T *cl = NULL;
d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	1917 class_T *extends_cl = NULL; // class from "extends" argument
d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	1918 class_T **intf_classes = NULL;
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1919 int num_enum_values = 0;
34508 d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	1920
d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	1921 cl = ALLOC_CLEAR_ONE(class_T);
d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	1922 if (cl == NULL)
d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	1923 goto cleanup;
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1924
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1925 if (is_enum)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1926 cl->class_flags = CLASS_ENUM;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1927 else if (is_interface)
34508 d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	1928 cl->class_flags = CLASS_INTERFACE;
d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	1929 else if (is_abstract)
d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	1930 cl->class_flags = CLASS_ABSTRACT;
d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	1931
d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	1932 cl->class_refcount = 1;
d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	1933 cl->class_name = vim_strnsave(name_start, name_end - name_start);
d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	1934 if (cl->class_name == NULL)
d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	1935 goto cleanup;
d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	1936
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1937 cl->class_type.tt_type = VAR_CLASS;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1938 cl->class_type.tt_class = cl;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1939 cl->class_object_type.tt_type = VAR_OBJECT;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1940 cl->class_object_type.tt_class = cl;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1941
34508 d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	1942 // Add the class to the script-local variables.
d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	1943 // TODO: handle other context, e.g. in a function
d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	1944 // TODO: does uf_hash need to be cleared?
d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	1945 typval_T tv;
d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	1946 tv.v_type = VAR_CLASS;
d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	1947 tv.vval.v_class = cl;
d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	1948 SOURCING_LNUM = start_lnum;
d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	1949 int rc = set_var_const(cl->class_name, current_sctx.sc_sid,
d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	1950 NULL, &tv, FALSE, 0, 0);
d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	1951 if (rc == FAIL)
d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	1952 goto cleanup;
d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	1953
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1954 if (is_enum)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1955 {
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1956 // All the enum classes have the name and ordinal object variables.
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1957 char_u varname = (char_u )"name";
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1958 if (add_member(&objmembers, varname, varname + 4, FALSE, FALSE, TRUE,
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1959 TRUE, &t_string, NULL) == FAIL)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1960 goto cleanup;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1961
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1962 varname = (char_u *)"ordinal";
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1963 if (add_member(&objmembers, varname, varname + 7, FALSE, FALSE, TRUE,
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1964 TRUE, &t_number, NULL) == FAIL)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1965 goto cleanup;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1966 }
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1967
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1968 // "export class" gets used when creating the class, don't use "is_export"
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1969 // for the items inside the class.
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1970 is_export = FALSE;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1971
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1972 // When parsing an enum definition, this denotes whether all the enumerated
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1973 // values are parsed or not.
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1974 int enum_end = FALSE;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1975
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1976 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1977 * Go over the body of the class/interface until "endclass" or
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	1978 * "endinterface" or "endenum" is found.
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1979 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1980 char_u *theline = NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1981 int success = FALSE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1982 for (;;)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1983 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1984 vim_free(theline);
33988 7c30841c60a0 patch 9.0.2180: POSIX function name in exarg causes issues Christian Brabandt <cb@256bit.org> parents: 33951 diff changeset	1985 theline = eap->ea_getline(':', eap->cookie, 0, GETLINE_CONCAT_ALL);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1986 if (theline == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1987 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1988 char_u *line = skipwhite(theline);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1989
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1990 // Skip empty and comment lines.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1991 if (*line == NUL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1992 continue;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1993 if (*line == '#')
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1994 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1995 if (vim9_bad_comment(line))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1996 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1997 continue;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1998 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1999
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2000 char_u *p = line;
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2001
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2002 char *end_name;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2003 int shortlen;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2004 int fullen;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2005 if (is_class)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2006 {
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2007 end_name = "endclass";
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2008 shortlen = 4;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2009 fullen = 8;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2010 }
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2011 else if (is_enum)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2012 {
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2013 end_name = "endenum";
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2014 shortlen = 4;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2015 fullen = 7;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2016 }
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2017 else
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2018 {
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2019 end_name = "endinterface";
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2020 shortlen = 5;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2021 fullen = 12;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2022 }
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2023
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2024 if (checkforcmd(&p, end_name, shortlen))
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2025 {
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2026 if (STRNCMP(line, end_name, fullen) != 0)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2027 semsg(_(e_command_cannot_be_shortened_str), line);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2028 else if (*p == '\|' \|\| !ends_excmd2(line, p))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2029 semsg(_(e_trailing_characters_str), p);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2030 else
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2031 success = TRUE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2032 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2033 }
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2034
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2035 int wrong_endname = FALSE;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2036 if (is_class)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2037 wrong_endname = checkforcmd(&p, "endinterface", 5)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2038 \|\| checkforcmd(&p, "endenum", 4);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2039 else if (is_enum)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2040 wrong_endname = checkforcmd(&p, "endclass", 4)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2041 \|\| checkforcmd(&p, "endinterface", 5);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2042 else
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2043 wrong_endname = checkforcmd(&p, "endclass", 4)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2044 \|\| checkforcmd(&p, "endenum", 4);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2045 if (wrong_endname)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2046 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2047 semsg(_(e_invalid_command_str_expected_str), line, end_name);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2048 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2049 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2050
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2051 if (is_enum && !enum_end)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2052 {
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2053 // In an enum, all the enumerated values are at the beginning
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2054 // separated by comma. The class and object variables/methods
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2055 // follow the values.
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2056 if (enum_parse_values(eap, cl, line, &classmembers,
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2057 &num_enum_values, &enum_end) == FAIL)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2058 break;
34690 ad86d59d7510 patch 9.1.0226: Not able to assign enum values to an enum static variable Christian Brabandt <cb@256bit.org> parents: 34678 diff changeset	2059
ad86d59d7510 patch 9.1.0226: Not able to assign enum values to an enum static variable Christian Brabandt <cb@256bit.org> parents: 34678 diff changeset	2060 if (enum_end)
ad86d59d7510 patch 9.1.0226: Not able to assign enum values to an enum static variable Christian Brabandt <cb@256bit.org> parents: 34678 diff changeset	2061 // Add the enum "values" class variable.
ad86d59d7510 patch 9.1.0226: Not able to assign enum values to an enum static variable Christian Brabandt <cb@256bit.org> parents: 34678 diff changeset	2062 enum_add_values_member(cl, &classmembers, num_enum_values,
ad86d59d7510 patch 9.1.0226: Not able to assign enum values to an enum static variable Christian Brabandt <cb@256bit.org> parents: 34678 diff changeset	2063 &type_list);
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2064 continue;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2065 }
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2066
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2067 int has_public = FALSE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2068 if (checkforcmd(&p, "public", 3))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2069 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2070 if (STRNCMP(line, "public", 6) != 0)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2071 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2072 semsg(_(e_command_cannot_be_shortened_str), line);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2073 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2074 }
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2075 if (is_interface)
33372 3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	2076 {
33385 b5ad84fdc702 patch 9.0.1951: Vim9: hard to debug vim9_class errors from CI Christian Brabandt <cb@256bit.org> parents: 33381 diff changeset	2077 emsg(_(e_public_variable_not_supported_in_interface));
33372 3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	2078 break;
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	2079 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2080 has_public = TRUE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2081 p = skipwhite(line + 6);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2082
33951 45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2083 if (STRNCMP(p, "var", 3) != 0 && STRNCMP(p, "static", 6) != 0
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2084 && STRNCMP(p, "final", 5) != 0 && STRNCMP(p, "const", 5) != 0)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2085 {
33951 45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2086 emsg(_(e_public_must_be_followed_by_var_static_final_or_const));
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2087 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2088 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2089 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2090
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	2091 int abstract_method = FALSE;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	2092 char_u *pa = p;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	2093 if (checkforcmd(&p, "abstract", 3))
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	2094 {
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	2095 if (STRNCMP(pa, "abstract", 8) != 0)
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	2096 {
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	2097 semsg(_(e_command_cannot_be_shortened_str), pa);
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	2098 break;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	2099 }
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	2100
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2101 if (is_enum)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2102 {
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2103 // "abstract" not supported in an enum
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2104 emsg(_(e_abstract_cannot_be_used_in_enum));
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2105 break;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2106 }
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2107
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2108 if (is_interface)
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	2109 {
33700 275617cdd99f patch 9.0.2085: Vim9: abstract can be used in interface Christian Brabandt <cb@256bit.org> parents: 33698 diff changeset	2110 // "abstract" not supported in an interface
275617cdd99f patch 9.0.2085: Vim9: abstract can be used in interface Christian Brabandt <cb@256bit.org> parents: 33698 diff changeset	2111 emsg(_(e_abstract_cannot_be_used_in_interface));
275617cdd99f patch 9.0.2085: Vim9: abstract can be used in interface Christian Brabandt <cb@256bit.org> parents: 33698 diff changeset	2112 break;
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	2113 }
33700 275617cdd99f patch 9.0.2085: Vim9: abstract can be used in interface Christian Brabandt <cb@256bit.org> parents: 33698 diff changeset	2114
275617cdd99f patch 9.0.2085: Vim9: abstract can be used in interface Christian Brabandt <cb@256bit.org> parents: 33698 diff changeset	2115 if (!is_abstract)
275617cdd99f patch 9.0.2085: Vim9: abstract can be used in interface Christian Brabandt <cb@256bit.org> parents: 33698 diff changeset	2116 {
275617cdd99f patch 9.0.2085: Vim9: abstract can be used in interface Christian Brabandt <cb@256bit.org> parents: 33698 diff changeset	2117 semsg(_(e_abstract_method_in_concrete_class), pa);
275617cdd99f patch 9.0.2085: Vim9: abstract can be used in interface Christian Brabandt <cb@256bit.org> parents: 33698 diff changeset	2118 break;
275617cdd99f patch 9.0.2085: Vim9: abstract can be used in interface Christian Brabandt <cb@256bit.org> parents: 33698 diff changeset	2119 }
275617cdd99f patch 9.0.2085: Vim9: abstract can be used in interface Christian Brabandt <cb@256bit.org> parents: 33698 diff changeset	2120
33708 b076a133faf9 patch 9.0.2088: Vim9: still allows abstract static methods Christian Brabandt <cb@256bit.org> parents: 33704 diff changeset	2121 p = skipwhite(pa + 8);
b076a133faf9 patch 9.0.2088: Vim9: still allows abstract static methods Christian Brabandt <cb@256bit.org> parents: 33704 diff changeset	2122 if (STRNCMP(p, "def", 3) != 0)
b076a133faf9 patch 9.0.2088: Vim9: still allows abstract static methods Christian Brabandt <cb@256bit.org> parents: 33704 diff changeset	2123 {
b076a133faf9 patch 9.0.2088: Vim9: still allows abstract static methods Christian Brabandt <cb@256bit.org> parents: 33704 diff changeset	2124 emsg(_(e_abstract_must_be_followed_by_def));
b076a133faf9 patch 9.0.2088: Vim9: still allows abstract static methods Christian Brabandt <cb@256bit.org> parents: 33704 diff changeset	2125 break;
b076a133faf9 patch 9.0.2088: Vim9: still allows abstract static methods Christian Brabandt <cb@256bit.org> parents: 33704 diff changeset	2126 }
b076a133faf9 patch 9.0.2088: Vim9: still allows abstract static methods Christian Brabandt <cb@256bit.org> parents: 33704 diff changeset	2127
33700 275617cdd99f patch 9.0.2085: Vim9: abstract can be used in interface Christian Brabandt <cb@256bit.org> parents: 33698 diff changeset	2128 abstract_method = TRUE;
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	2129 }
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	2130
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2131 int has_static = FALSE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2132 char_u *ps = p;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2133 if (checkforcmd(&p, "static", 4))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2134 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2135 if (STRNCMP(ps, "static", 6) != 0)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2136 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2137 semsg(_(e_command_cannot_be_shortened_str), ps);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2138 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2139 }
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	2140
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2141 if (is_interface)
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	2142 {
33286 0c3553cfe22e patch 9.0.1909: Vim9: problem calling class method from other class Christian Brabandt <cb@256bit.org> parents: 33278 diff changeset	2143 emsg(_(e_static_member_not_supported_in_interface));
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	2144 break;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	2145 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2146 has_static = TRUE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2147 p = skipwhite(ps + 6);
33942 3bba09502b8d patch 9.0.2167: Vim9: not consistently using :var for declarations Christian Brabandt <cb@256bit.org> parents: 33936 diff changeset	2148
33951 45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2149 if (STRNCMP(p, "var", 3) != 0 && STRNCMP(p, "def", 3) != 0
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2150 && STRNCMP(p, "final", 5) != 0 && STRNCMP(p, "const", 5) != 0)
33942 3bba09502b8d patch 9.0.2167: Vim9: not consistently using :var for declarations Christian Brabandt <cb@256bit.org> parents: 33936 diff changeset	2151 {
33951 45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2152 emsg(_(e_static_must_be_followed_by_var_def_final_or_const));
33942 3bba09502b8d patch 9.0.2167: Vim9: not consistently using :var for declarations Christian Brabandt <cb@256bit.org> parents: 33936 diff changeset	2153 break;
3bba09502b8d patch 9.0.2167: Vim9: not consistently using :var for declarations Christian Brabandt <cb@256bit.org> parents: 33936 diff changeset	2154 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2155 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2156
33951 45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2157 int has_final = FALSE;
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2158 int has_var = FALSE;
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2159 int has_const = FALSE;
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2160 if (checkforcmd(&p, "var", 3))
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2161 has_var = TRUE;
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2162 else if (checkforcmd(&p, "final", 5))
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2163 {
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2164 if (is_interface)
33951 45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2165 {
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2166 emsg(_(e_final_variable_not_supported_in_interface));
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2167 break;
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2168 }
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2169 has_final = TRUE;
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2170 }
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2171 else if (checkforcmd(&p, "const", 5))
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2172 {
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2173 if (is_interface)
33951 45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2174 {
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2175 emsg(_(e_const_variable_not_supported_in_interface));
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2176 break;
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2177 }
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2178 has_const = TRUE;
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2179 }
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2180 p = skipwhite(p);
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2181
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2182 // object members (public, read access, private):
33942 3bba09502b8d patch 9.0.2167: Vim9: not consistently using :var for declarations Christian Brabandt <cb@256bit.org> parents: 33936 diff changeset	2183 // "var _varname"
3bba09502b8d patch 9.0.2167: Vim9: not consistently using :var for declarations Christian Brabandt <cb@256bit.org> parents: 33936 diff changeset	2184 // "var varname"
3bba09502b8d patch 9.0.2167: Vim9: not consistently using :var for declarations Christian Brabandt <cb@256bit.org> parents: 33936 diff changeset	2185 // "public var varname"
33951 45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2186 // "final _varname"
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2187 // "final varname"
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2188 // "public final varname"
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2189 // "const _varname"
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2190 // "const varname"
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2191 // "public const varname"
33942 3bba09502b8d patch 9.0.2167: Vim9: not consistently using :var for declarations Christian Brabandt <cb@256bit.org> parents: 33936 diff changeset	2192 // class members (public, read access, private):
3bba09502b8d patch 9.0.2167: Vim9: not consistently using :var for declarations Christian Brabandt <cb@256bit.org> parents: 33936 diff changeset	2193 // "static var _varname"
3bba09502b8d patch 9.0.2167: Vim9: not consistently using :var for declarations Christian Brabandt <cb@256bit.org> parents: 33936 diff changeset	2194 // "static var varname"
3bba09502b8d patch 9.0.2167: Vim9: not consistently using :var for declarations Christian Brabandt <cb@256bit.org> parents: 33936 diff changeset	2195 // "public static var varname"
33951 45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2196 // "static final _varname"
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2197 // "static final varname"
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2198 // "public static final varname"
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2199 // "static const _varname"
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2200 // "static const varname"
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2201 // "public static const varname"
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2202 if (has_var \|\| has_final \|\| has_const)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2203 {
33942 3bba09502b8d patch 9.0.2167: Vim9: not consistently using :var for declarations Christian Brabandt <cb@256bit.org> parents: 33936 diff changeset	2204 char_u *varname = p;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2205 char_u *varname_end = NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2206 type_T *type = NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2207 char_u *init_expr = NULL;
33446 508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2208 int has_type = FALSE;
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	2209
33942 3bba09502b8d patch 9.0.2167: Vim9: not consistently using :var for declarations Christian Brabandt <cb@256bit.org> parents: 33936 diff changeset	2210 if (!eval_isnamec1(*p))
3bba09502b8d patch 9.0.2167: Vim9: not consistently using :var for declarations Christian Brabandt <cb@256bit.org> parents: 33936 diff changeset	2211 {
3bba09502b8d patch 9.0.2167: Vim9: not consistently using :var for declarations Christian Brabandt <cb@256bit.org> parents: 33936 diff changeset	2212 if (has_static)
3bba09502b8d patch 9.0.2167: Vim9: not consistently using :var for declarations Christian Brabandt <cb@256bit.org> parents: 33936 diff changeset	2213 semsg(_(e_invalid_class_variable_declaration_str), line);
3bba09502b8d patch 9.0.2167: Vim9: not consistently using :var for declarations Christian Brabandt <cb@256bit.org> parents: 33936 diff changeset	2214 else
3bba09502b8d patch 9.0.2167: Vim9: not consistently using :var for declarations Christian Brabandt <cb@256bit.org> parents: 33936 diff changeset	2215 semsg(_(e_invalid_object_variable_declaration_str), line);
3bba09502b8d patch 9.0.2167: Vim9: not consistently using :var for declarations Christian Brabandt <cb@256bit.org> parents: 33936 diff changeset	2216 break;
3bba09502b8d patch 9.0.2167: Vim9: not consistently using :var for declarations Christian Brabandt <cb@256bit.org> parents: 33936 diff changeset	2217 }
3bba09502b8d patch 9.0.2167: Vim9: not consistently using :var for declarations Christian Brabandt <cb@256bit.org> parents: 33936 diff changeset	2218
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2219 if (is_interface && *varname == '_')
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	2220 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	2221 // private variables are not supported in an interface
33738 2172872dfbcd patch 9.0.2096: Vim9: confusing usage of private Christian Brabandt <cb@256bit.org> parents: 33708 diff changeset	2222 semsg(_(e_protected_variable_not_supported_in_interface),
33286 0c3553cfe22e patch 9.0.1909: Vim9: problem calling class method from other class Christian Brabandt <cb@256bit.org> parents: 33278 diff changeset	2223 varname);
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	2224 break;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	2225 }
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	2226
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2227 if (parse_member(eap, line, varname, has_public,
33446 508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2228 &varname_end, &has_type, &type_list, &type,
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2229 !is_interface ? &init_expr: NULL) == FAIL)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2230 break;
34472 5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	2231
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	2232 if (is_reserved_varname(varname, varname_end)
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	2233 \|\| is_duplicate_variable(&classmembers, &objmembers,
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	2234 varname, varname_end))
33047 9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	2235 {
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	2236 vim_free(init_expr);
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	2237 break;
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	2238 }
33951 45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2239 if (add_member(has_static ? &classmembers : &objmembers, varname,
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2240 varname_end, has_public, has_final, has_const,
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	2241 has_type, type, init_expr) == FAIL)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2242 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2243 vim_free(init_expr);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2244 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2245 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2246 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2247
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2248 // constructors:
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2249 // def new()
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2250 // enddef
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2251 // def newOther()
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2252 // enddef
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2253 // object methods and class functions:
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2254 // def SomeMethod()
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2255 // enddef
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2256 // static def ClassFunction()
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2257 // enddef
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2258 // TODO:
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2259 // def <Tval> someMethod()
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2260 // enddef
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2261 else if (checkforcmd(&p, "def", 3))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2262 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2263 exarg_T ea;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2264 garray_T lines_to_free;
34472 5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	2265 int is_new = STRNCMP(p, "new", 3) == 0;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2266
33372 3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	2267 if (has_public)
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	2268 {
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	2269 // "public" keyword is not supported when defining an object or
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	2270 // class method
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	2271 emsg(_(e_public_keyword_not_supported_for_method));
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	2272 break;
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	2273 }
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	2274
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	2275 if (*p == NUL)
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	2276 {
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	2277 // No method name following def
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	2278 semsg(_(e_not_valid_command_in_class_str), line);
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	2279 break;
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	2280 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2281
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2282 if (is_interface && *p == '_')
33996 6d33f47b71b8 patch 9.0.2182: Vim9: need a way to reserve future extension Christian Brabandt <cb@256bit.org> parents: 33988 diff changeset	2283 {
34472 5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	2284 // private methods are not supported in an interface
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	2285 semsg(_(e_protected_method_not_supported_in_interface), p);
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	2286 break;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	2287 }
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	2288
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	2289 if (has_static && !is_new && SAFE_islower(*p) &&
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	2290 is_valid_builtin_obj_methodname(p))
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	2291 {
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	2292 semsg(_(e_builtin_class_method_not_supported), p);
33996 6d33f47b71b8 patch 9.0.2182: Vim9: need a way to reserve future extension Christian Brabandt <cb@256bit.org> parents: 33988 diff changeset	2293 break;
6d33f47b71b8 patch 9.0.2182: Vim9: need a way to reserve future extension Christian Brabandt <cb@256bit.org> parents: 33988 diff changeset	2294 }
6d33f47b71b8 patch 9.0.2182: Vim9: need a way to reserve future extension Christian Brabandt <cb@256bit.org> parents: 33988 diff changeset	2295
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2296 CLEAR_FIELD(ea);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2297 ea.cmd = line;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2298 ea.arg = p;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2299 ea.cmdidx = CMD_def;
33988 7c30841c60a0 patch 9.0.2180: POSIX function name in exarg causes issues Christian Brabandt <cb@256bit.org> parents: 33951 diff changeset	2300 ea.ea_getline = eap->ea_getline;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2301 ea.cookie = eap->cookie;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2302
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2303 ga_init2(&lines_to_free, sizeof(char_u *), 50);
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	2304 int class_flags;
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2305 if (is_interface)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2306 class_flags = CF_INTERFACE;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2307 else
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	2308 class_flags = abstract_method ? CF_ABSTRACT_METHOD : CF_CLASS;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2309 ufunc_T *uf = define_function(&ea, NULL, &lines_to_free,
33326 4e531adb3fac patch 9.0.1928: Vim9: constructor type checking bug Christian Brabandt <cb@256bit.org> parents: 33297 diff changeset	2310 class_flags, objmembers.ga_data, objmembers.ga_len);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2311 ga_clear_strings(&lines_to_free);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2312
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2313 if (uf != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2314 {
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2315 char_u *name = uf->uf_name;
34472 5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	2316
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	2317 if (is_new && !is_valid_constructor(uf, is_abstract,
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	2318 has_static))
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	2319 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	2320 // private variables are not supported in an interface
33738 2172872dfbcd patch 9.0.2096: Vim9: confusing usage of private Christian Brabandt <cb@256bit.org> parents: 33708 diff changeset	2321 semsg(_(e_protected_method_not_supported_in_interface),
33286 0c3553cfe22e patch 9.0.1909: Vim9: problem calling class method from other class Christian Brabandt <cb@256bit.org> parents: 33278 diff changeset	2322 name);
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	2323 func_clear_free(uf, FALSE);
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	2324 break;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	2325 }
34472 5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	2326
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	2327 // check for builtin method
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	2328 if (!is_new && SAFE_islower(*name) &&
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	2329 !object_check_builtin_method_sig(uf))
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2330 {
32854 5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	2331 func_clear_free(uf, FALSE);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2332 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2333 }
33068 d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	2334
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2335 // Check the name isn't used already.
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	2336 if (is_duplicate_method(&classfunctions, &objmethods, name))
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	2337 {
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	2338 success = FALSE;
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	2339 func_clear_free(uf, FALSE);
33047 9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	2340 break;
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	2341 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2342
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	2343 garray_T *fgap = has_static \|\| is_new
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	2344 ? &classfunctions : &objmethods;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2345 if (ga_grow(fgap, 1) == OK)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2346 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2347 if (is_new)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2348 uf->uf_flags \|= FC_NEW;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2349
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	2350 if (abstract_method)
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	2351 uf->uf_flags \|= FC_ABSTRACT;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	2352
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2353 ((ufunc_T **)fgap->ga_data)[fgap->ga_len] = uf;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2354 ++fgap->ga_len;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2355 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2356 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2357 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2358
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2359 else
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2360 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2361 if (is_class)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2362 semsg(_(e_not_valid_command_in_class_str), line);
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2363 else if (is_enum)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2364 semsg(_(e_not_valid_command_in_enum_str), line);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2365 else
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2366 semsg(_(e_not_valid_command_in_interface_str), line);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2367 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2368 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2369 }
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2370
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2371 if (theline == NULL && !success && is_enum)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2372 emsg(_(e_missing_endenum));
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2373
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2374 vim_free(theline);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2375
34690 ad86d59d7510 patch 9.1.0226: Not able to assign enum values to an enum static variable Christian Brabandt <cb@256bit.org> parents: 34678 diff changeset	2376 if (success && is_enum && num_enum_values == 0)
ad86d59d7510 patch 9.1.0226: Not able to assign enum values to an enum static variable Christian Brabandt <cb@256bit.org> parents: 34678 diff changeset	2377 // Empty enum statement. Add an empty "values" class variable
ad86d59d7510 patch 9.1.0226: Not able to assign enum values to an enum static variable Christian Brabandt <cb@256bit.org> parents: 34678 diff changeset	2378 enum_add_values_member(cl, &classmembers, 0, &type_list);
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2379
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2380 /*
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2381 * Check a few things
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2382 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2383
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2384 // Check the "extends" class is valid.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2385 if (success && extends != NULL)
34508 d7b7fa7edb3b patch 9.1.0160: Vim9: Add support for using a class type of itself in an object method Christian Brabandt <cb@256bit.org> parents: 34472 diff changeset	2386 success = validate_extends_class(cl, extends, &extends_cl, is_class);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2387 VIM_CLEAR(extends);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2388
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	2389 // Check the new object methods to make sure their access (public or
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	2390 // private) is the same as that in the extended class lineage.
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	2391 if (success && extends_cl != NULL)
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	2392 success = validate_extends_methods(&objmethods, extends_cl);
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	2393
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	2394 // Check the new class and object variables are not duplicates of the
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	2395 // variables in the extended class lineage. If an interface is extending
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	2396 // another interface, then it can duplicate the member variables.
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	2397 if (success && extends_cl != NULL)
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	2398 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	2399 if (is_class)
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	2400 success = extends_check_dup_members(&objmembers, extends_cl);
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	2401 else
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	2402 success = extends_check_intf_var_type(&objmembers, extends_cl);
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	2403 }
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	2404
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	2405 // When extending an abstract class, make sure all the abstract methods in
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	2406 // the parent class are implemented. If the current class is an abstract
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	2407 // class, then there is no need for this check.
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	2408 if (success && !is_abstract && extends_cl != NULL
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	2409 && (extends_cl->class_flags & CLASS_ABSTRACT))
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	2410 success = validate_abstract_class_methods(&classfunctions,
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	2411 &objmethods, extends_cl);
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	2412
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2413 // Check all "implements" entries are valid.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2414 if (success && ga_impl.ga_len > 0)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2415 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2416 intf_classes = ALLOC_CLEAR_MULT(class_T *, ga_impl.ga_len);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2417
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	2418 success = validate_implements_classes(&ga_impl, intf_classes,
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2419 &objmethods, &objmembers, extends_cl);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2420 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2421
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	2422 // Check no function argument name is used as a class member.
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2423 if (success)
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	2424 success = check_func_arg_names(&classfunctions, &objmethods,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	2425 &classmembers);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2426
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2427 if (success)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2428 {
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2429 // "endclass" or "endinterface" or "endenum" encountered without any
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2430 // failures
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2431
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2432 if (extends_cl != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2433 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2434 cl->class_extends = extends_cl;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2435 extends_cl->class_flags \|= CLASS_EXTENDED;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2436 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2437
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	2438 // Add class and object variables to "cl".
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2439 if (add_members_to_class(&classmembers,
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	2440 NULL,
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	2441 0,
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2442 &cl->class_class_members,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2443 &cl->class_class_member_count) == FAIL
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2444 \|\| add_members_to_class(&objmembers,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2445 extends_cl == NULL ? NULL
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2446 : extends_cl->class_obj_members,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2447 extends_cl == NULL ? 0
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2448 : extends_cl->class_obj_member_count,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2449 &cl->class_obj_members,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2450 &cl->class_obj_member_count) == FAIL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2451 goto cleanup;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2452
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2453 if (ga_impl.ga_len > 0)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2454 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2455 // Move the "implements" names into the class.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2456 cl->class_interface_count = ga_impl.ga_len;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2457 cl->class_interfaces = ALLOC_MULT(char_u *, ga_impl.ga_len);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2458 if (cl->class_interfaces == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2459 goto cleanup;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2460 for (int i = 0; i < ga_impl.ga_len; ++i)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2461 cl->class_interfaces[i] = ((char_u **)ga_impl.ga_data)[i];
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2462 VIM_CLEAR(ga_impl.ga_data);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2463 ga_impl.ga_len = 0;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2464
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2465 cl->class_interfaces_cl = intf_classes;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2466 intf_classes = NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2467 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2468
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2469 if (cl->class_interface_count > 0 \|\| extends_cl != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2470 {
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	2471 // Add a method and member lookup table to each of the interface
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	2472 // classes.
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	2473 if (add_lookup_tables(cl, extends_cl, &objmethods) == FAIL)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	2474 goto cleanup;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2475 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2476
32903 54c01bb98b8e patch 9.0.1760: vim9 class problem with new() constructor Christian Brabandt <cb@256bit.org> parents: 32896 diff changeset	2477 int have_new = FALSE;
54c01bb98b8e patch 9.0.1760: vim9 class problem with new() constructor Christian Brabandt <cb@256bit.org> parents: 32896 diff changeset	2478 ufunc_T *class_func = NULL;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2479 for (int i = 0; i < classfunctions.ga_len; ++i)
32903 54c01bb98b8e patch 9.0.1760: vim9 class problem with new() constructor Christian Brabandt <cb@256bit.org> parents: 32896 diff changeset	2480 {
54c01bb98b8e patch 9.0.1760: vim9 class problem with new() constructor Christian Brabandt <cb@256bit.org> parents: 32896 diff changeset	2481 class_func = ((ufunc_T **)classfunctions.ga_data)[i];
54c01bb98b8e patch 9.0.1760: vim9 class problem with new() constructor Christian Brabandt <cb@256bit.org> parents: 32896 diff changeset	2482 if (STRCMP(class_func->uf_name, "new") == 0)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2483 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2484 have_new = TRUE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2485 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2486 }
32903 54c01bb98b8e patch 9.0.1760: vim9 class problem with new() constructor Christian Brabandt <cb@256bit.org> parents: 32896 diff changeset	2487 }
54c01bb98b8e patch 9.0.1760: vim9 class problem with new() constructor Christian Brabandt <cb@256bit.org> parents: 32896 diff changeset	2488
54c01bb98b8e patch 9.0.1760: vim9 class problem with new() constructor Christian Brabandt <cb@256bit.org> parents: 32896 diff changeset	2489 if (have_new)
54c01bb98b8e patch 9.0.1760: vim9 class problem with new() constructor Christian Brabandt <cb@256bit.org> parents: 32896 diff changeset	2490 // The return type of new() is an object of class "cl"
54c01bb98b8e patch 9.0.1760: vim9 class problem with new() constructor Christian Brabandt <cb@256bit.org> parents: 32896 diff changeset	2491 class_func->uf_ret_type->tt_class = cl;
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2492 else if ((is_class \|\| is_enum) && !is_abstract && !have_new)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2493 // No new() method was defined, add the default constructor.
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	2494 add_default_constructor(cl, &classfunctions, &type_list);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2495
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2496 // Move all the functions into the created class.
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	2497 if (add_classfuncs_objmethods(cl, extends_cl, &classfunctions,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	2498 &objmethods) == FAIL)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	2499 goto cleanup;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2500
34472 5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	2501 update_builtin_method_index(cl);
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	2502
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2503 class_created(cl);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2504
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2505 // Allocate a typval for each class member and initialize it.
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2506 if ((is_class \|\| is_enum) && cl->class_class_member_count > 0)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2507 if (add_class_members(cl, eap, &type_list) == FAIL)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2508 goto cleanup;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2509
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2510 cl->class_type_list = type_list;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2511
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2512 if (is_enum)
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2513 {
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2514 // clear the constructor method names, so that an enum class cannot
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2515 // be instantiated
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2516 enum_clear_constructors(cl);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	2517 }
33160 4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2518
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2519 // TODO:
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2520 // - Fill hashtab with object members and methods ?
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2521
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2522 return;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2523 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2524
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2525 cleanup:
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2526 vim_free(extends);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2527 class_unref(extends_cl);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2528
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2529 if (intf_classes != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2530 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2531 for (int i = 0; i < ga_impl.ga_len; ++i)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2532 class_unref(intf_classes[i]);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2533 vim_free(intf_classes);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2534 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2535 ga_clear_strings(&ga_impl);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2536
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2537 for (int round = 1; round <= 2; ++round)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2538 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2539 garray_T *gap = round == 1 ? &classmembers : &objmembers;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2540 if (gap->ga_len == 0 \|\| gap->ga_data == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2541 continue;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2542
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2543 for (int i = 0; i < gap->ga_len; ++i)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2544 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2545 ocmember_T m = ((ocmember_T )gap->ga_data) + i;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2546 vim_free(m->ocm_name);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2547 vim_free(m->ocm_init);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2548 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2549 ga_clear(gap);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2550 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2551
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2552 for (int i = 0; i < objmethods.ga_len; ++i)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2553 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2554 ufunc_T uf = ((ufunc_T *)objmethods.ga_data)[i];
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2555 func_clear_free(uf, FALSE);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2556 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2557 ga_clear(&objmethods);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2558
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2559 for (int i = 0; i < classfunctions.ga_len; ++i)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2560 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2561 ufunc_T uf = ((ufunc_T *)classfunctions.ga_data)[i];
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2562 func_clear_free(uf, FALSE);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2563 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2564 ga_clear(&classfunctions);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2565
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2566 clear_type_list(&type_list);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2567 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2568
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2569 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2570 * Find member "name" in class "cl", set "member_idx" to the member index and
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2571 * return its type.
33109 2b5cc29b0a0e patch 9.0.1838: Vim9: Cannot modify class member vars from def function Christian Brabandt <cb@256bit.org> parents: 33106 diff changeset	2572 * When "is_object" is TRUE, then look for object members. Otherwise look for
2b5cc29b0a0e patch 9.0.1838: Vim9: Cannot modify class member vars from def function Christian Brabandt <cb@256bit.org> parents: 33106 diff changeset	2573 * class members.
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2574 * When not found "member_idx" is set to -1 and t_any is returned.
33106 d994ba4bd9ca patch 9.0.1837: Vim9: class_member_type() can be optimized Christian Brabandt <cb@256bit.org> parents: 33088 diff changeset	2575 * Set *p_m ocmmember_T if not NULL
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2576 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2577 type_T *
33534 c8bd88bdb630 patch 9.0.2016: Vim9: assignment operators don't work for class vars Christian Brabandt <cb@256bit.org> parents: 33506 diff changeset	2578 oc_member_type(
33088 667a17904f64 patch 9.0.1829: Vim9 missing access-checks for private vars Christian Brabandt <cb@256bit.org> parents: 33070 diff changeset	2579 class_T *cl,
33109 2b5cc29b0a0e patch 9.0.1838: Vim9: Cannot modify class member vars from def function Christian Brabandt <cb@256bit.org> parents: 33106 diff changeset	2580 int is_object,
33088 667a17904f64 patch 9.0.1829: Vim9 missing access-checks for private vars Christian Brabandt <cb@256bit.org> parents: 33070 diff changeset	2581 char_u *name,
667a17904f64 patch 9.0.1829: Vim9 missing access-checks for private vars Christian Brabandt <cb@256bit.org> parents: 33070 diff changeset	2582 char_u *name_end,
33286 0c3553cfe22e patch 9.0.1909: Vim9: problem calling class method from other class Christian Brabandt <cb@256bit.org> parents: 33278 diff changeset	2583 int *member_idx)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2584 {
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2585 size_t len = name_end - name;
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2586 ocmember_T *m;
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2587
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2588 *member_idx = -1; // not found (yet)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2589
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2590 m = member_lookup(cl, is_object ? VAR_OBJECT : VAR_CLASS, name, len,
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2591 member_idx);
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2592 if (m == NULL)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2593 {
33286 0c3553cfe22e patch 9.0.1909: Vim9: problem calling class method from other class Christian Brabandt <cb@256bit.org> parents: 33278 diff changeset	2594 member_not_found_msg(cl, is_object ? VAR_OBJECT : VAR_CLASS, name,
0c3553cfe22e patch 9.0.1909: Vim9: problem calling class method from other class Christian Brabandt <cb@256bit.org> parents: 33278 diff changeset	2595 len);
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2596 return &t_any;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2597 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2598
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2599 return m->ocm_type;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2600 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2601
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2602 /*
33446 508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2603 * Given a class or object variable index, return the variable type
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2604 */
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2605 type_T *
33534 c8bd88bdb630 patch 9.0.2016: Vim9: assignment operators don't work for class vars Christian Brabandt <cb@256bit.org> parents: 33506 diff changeset	2606 oc_member_type_by_idx(
33446 508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2607 class_T *cl,
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2608 int is_object,
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2609 int member_idx)
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2610 {
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2611 ocmember_T *m;
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2612 int member_count;
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2613
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2614 if (is_object)
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2615 {
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2616 m = cl->class_obj_members;
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2617 member_count = cl->class_obj_member_count;
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2618 }
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2619 else
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2620 {
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2621 m = cl->class_class_members;
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2622 member_count = cl->class_class_member_count;
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2623 }
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2624
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2625 if (member_idx >= member_count)
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2626 return NULL;
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2627
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2628 return m[member_idx].ocm_type;
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2629 }
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2630
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2631 /*
33678 7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2632 * Type aliases (:type)
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2633 */
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2634
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2635 void
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2636 typealias_free(typealias_T *ta)
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2637 {
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2638 // ta->ta_type is freed in clear_type_list()
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2639 vim_free(ta->ta_name);
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2640 vim_free(ta);
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2641 }
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2642
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2643 void
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2644 typealias_unref(typealias_T *ta)
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2645 {
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2646 if (ta != NULL && --ta->ta_refcount <= 0)
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2647 typealias_free(ta);
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2648 }
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2649
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2650 /*
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2651 * Handle ":type". Create an alias for a type specification.
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2652 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2653 void
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2654 ex_type(exarg_T *eap UNUSED)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2655 {
33678 7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2656 char_u *arg = eap->arg;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2657
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2658 if (!current_script_is_vim9()
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2659 \|\| (cmdmod.cmod_flags & CMOD_LEGACY)
33988 7c30841c60a0 patch 9.0.2180: POSIX function name in exarg causes issues Christian Brabandt <cb@256bit.org> parents: 33951 diff changeset	2660 \|\| !getline_equal(eap->ea_getline, eap->cookie, getsourceline))
33678 7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2661 {
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2662 emsg(_(e_type_can_only_be_defined_in_vim9_script));
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2663 return;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2664 }
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2665
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2666 if (*arg == NUL)
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2667 {
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2668 emsg(_(e_missing_typealias_name));
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2669 return;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2670 }
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2671
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2672 if (!ASCII_ISUPPER(*arg))
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2673 {
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2674 semsg(_(e_type_name_must_start_with_uppercase_letter_str), arg);
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2675 return;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2676 }
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2677
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2678 char_u *name_end = find_name_end(arg, NULL, NULL, FNE_CHECK_START);
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2679 if (!IS_WHITE_OR_NUL(*name_end))
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2680 {
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2681 semsg(_(e_white_space_required_after_name_str), arg);
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2682 return;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2683 }
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2684 char_u *name_start = arg;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2685
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2686 arg = skipwhite(name_end);
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2687 if (*arg != '=')
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2688 {
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2689 semsg(_(e_missing_equal_str), arg);
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2690 return;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2691 }
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2692 if (!IS_WHITE_OR_NUL(*(arg + 1)))
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2693 {
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2694 semsg(_(e_white_space_required_after_str_str), "=", arg);
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2695 return;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2696 }
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2697 arg++;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2698 arg = skipwhite(arg);
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2699
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2700 if (*arg == NUL)
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2701 {
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2702 emsg(_(e_missing_typealias_type));
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2703 return;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2704 }
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2705
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2706 scriptitem_T *si = SCRIPT_ITEM(current_sctx.sc_sid);
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2707 type_T *type = parse_type(&arg, &si->sn_type_list, TRUE);
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2708 if (type == NULL)
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2709 return;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2710
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2711 if (*arg != NUL)
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2712 {
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2713 // some text after the type
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2714 semsg(_(e_trailing_characters_str), arg);
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2715 return;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2716 }
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2717
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2718 int cc = *name_end;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2719 *name_end = NUL;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2720
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2721 typval_T tv;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2722 tv.v_type = VAR_UNKNOWN;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2723 if (eval_variable_import(name_start, &tv) == OK)
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2724 {
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2725 if (tv.v_type == VAR_TYPEALIAS)
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2726 semsg(_(e_typealias_already_exists_for_str), name_start);
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2727 else
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2728 semsg(_(e_redefining_script_item_str), name_start);
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2729 clear_tv(&tv);
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2730 goto done;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2731 }
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2732
33682 f126ffc85f7c patch 9.0.2078: several problems with type aliases Christian Brabandt <cb@256bit.org> parents: 33678 diff changeset	2733 // Create a script-local variable for the type alias.
f126ffc85f7c patch 9.0.2078: several problems with type aliases Christian Brabandt <cb@256bit.org> parents: 33678 diff changeset	2734 if (type->tt_type != VAR_OBJECT)
f126ffc85f7c patch 9.0.2078: several problems with type aliases Christian Brabandt <cb@256bit.org> parents: 33678 diff changeset	2735 {
f126ffc85f7c patch 9.0.2078: several problems with type aliases Christian Brabandt <cb@256bit.org> parents: 33678 diff changeset	2736 tv.v_type = VAR_TYPEALIAS;
f126ffc85f7c patch 9.0.2078: several problems with type aliases Christian Brabandt <cb@256bit.org> parents: 33678 diff changeset	2737 tv.v_lock = 0;
f126ffc85f7c patch 9.0.2078: several problems with type aliases Christian Brabandt <cb@256bit.org> parents: 33678 diff changeset	2738 tv.vval.v_typealias = ALLOC_CLEAR_ONE(typealias_T);
f126ffc85f7c patch 9.0.2078: several problems with type aliases Christian Brabandt <cb@256bit.org> parents: 33678 diff changeset	2739 ++tv.vval.v_typealias->ta_refcount;
f126ffc85f7c patch 9.0.2078: several problems with type aliases Christian Brabandt <cb@256bit.org> parents: 33678 diff changeset	2740 tv.vval.v_typealias->ta_name = vim_strsave(name_start);
f126ffc85f7c patch 9.0.2078: several problems with type aliases Christian Brabandt <cb@256bit.org> parents: 33678 diff changeset	2741 tv.vval.v_typealias->ta_type = type;
f126ffc85f7c patch 9.0.2078: several problems with type aliases Christian Brabandt <cb@256bit.org> parents: 33678 diff changeset	2742 }
f126ffc85f7c patch 9.0.2078: several problems with type aliases Christian Brabandt <cb@256bit.org> parents: 33678 diff changeset	2743 else
f126ffc85f7c patch 9.0.2078: several problems with type aliases Christian Brabandt <cb@256bit.org> parents: 33678 diff changeset	2744 {
f126ffc85f7c patch 9.0.2078: several problems with type aliases Christian Brabandt <cb@256bit.org> parents: 33678 diff changeset	2745 // When creating a type alias for a class, use the class type itself to
f126ffc85f7c patch 9.0.2078: several problems with type aliases Christian Brabandt <cb@256bit.org> parents: 33678 diff changeset	2746 // create the type alias variable. This is needed to use the type
f126ffc85f7c patch 9.0.2078: several problems with type aliases Christian Brabandt <cb@256bit.org> parents: 33678 diff changeset	2747 // alias to invoke class methods (e.g. new()) and use class variables.
f126ffc85f7c patch 9.0.2078: several problems with type aliases Christian Brabandt <cb@256bit.org> parents: 33678 diff changeset	2748 tv.v_type = VAR_CLASS;
f126ffc85f7c patch 9.0.2078: several problems with type aliases Christian Brabandt <cb@256bit.org> parents: 33678 diff changeset	2749 tv.v_lock = 0;
f126ffc85f7c patch 9.0.2078: several problems with type aliases Christian Brabandt <cb@256bit.org> parents: 33678 diff changeset	2750 tv.vval.v_class = type->tt_class;
f126ffc85f7c patch 9.0.2078: several problems with type aliases Christian Brabandt <cb@256bit.org> parents: 33678 diff changeset	2751 ++tv.vval.v_class->class_refcount;
f126ffc85f7c patch 9.0.2078: several problems with type aliases Christian Brabandt <cb@256bit.org> parents: 33678 diff changeset	2752 }
33678 7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2753 set_var_const(name_start, current_sctx.sc_sid, NULL, &tv, FALSE,
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2754 ASSIGN_CONST \| ASSIGN_FINAL, 0);
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2755
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2756 done:
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2757 *name_end = cc;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2758 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2759
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2760 /*
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2761 * Returns OK if a member variable named "name" is present in the class "cl".
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2762 * Otherwise returns FAIL. If found, the member variable typval is set in
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2763 * "rettv". If "is_object" is TRUE, then the object member variable table is
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2764 * searched. Otherwise the class member variable table is searched.
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2765 */
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2766 static int
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2767 get_member_tv(
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2768 class_T *cl,
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2769 int is_object,
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2770 char_u *name,
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2771 size_t namelen,
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2772 typval_T *rettv)
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2773 {
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2774 ocmember_T *m;
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2775 int m_idx;
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2776
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2777 m = member_lookup(cl, is_object ? VAR_OBJECT : VAR_CLASS, name, namelen,
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2778 &m_idx);
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2779 if (m == NULL)
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2780 return FAIL;
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2781
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2782 if (*name == '_')
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2783 {
33738 2172872dfbcd patch 9.0.2096: Vim9: confusing usage of private Christian Brabandt <cb@256bit.org> parents: 33708 diff changeset	2784 emsg_var_cl_define(e_cannot_access_protected_variable_str,
33498 bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	2785 m->ocm_name, 0, cl);
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2786 return FAIL;
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2787 }
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2788
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2789 if (is_object)
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2790 {
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2791 // The object only contains a pointer to the class, the member values
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2792 // array follows right after that.
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2793 object_T *obj = rettv->vval.v_object;
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2794 typval_T tv = (typval_T )(obj + 1) + m_idx;
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2795 copy_tv(tv, rettv);
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2796 object_unref(obj);
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2797 }
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2798 else
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2799 {
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2800 copy_tv(&cl->class_members_tv[m_idx], rettv);
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2801 class_unref(cl);
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2802 }
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2803
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2804 return OK;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2805 }
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2806
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2807 /*
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2808 * Call an object or class method "name" in class "cl". The method return
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2809 * value is returned in "rettv".
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2810 */
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2811 static int
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2812 call_oc_method(
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2813 class_T *cl,
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2814 char_u *name,
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2815 size_t len,
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2816 char_u *name_end,
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2817 evalarg_T *evalarg,
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2818 char_u **arg,
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2819 typval_T *rettv)
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2820 {
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2821 ufunc_T *fp;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2822 typval_T argvars[MAX_FUNC_ARGS + 1];
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2823 int argcount = 0;
33540 86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2824 ocmember_T *ocm = NULL;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2825 int m_idx;
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2826
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2827 fp = method_lookup(cl, rettv->v_type, name, len, NULL);
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2828 if (fp == NULL)
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2829 {
33540 86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2830 // could be an object or class funcref variable
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2831 ocm = member_lookup(cl, rettv->v_type, name, len, &m_idx);
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2832 if (ocm == NULL \|\| ocm->ocm_type->tt_type != VAR_FUNC)
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2833 {
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2834 method_not_found_msg(cl, rettv->v_type, name, len);
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2835 return FAIL;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2836 }
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2837
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2838 if (rettv->v_type == VAR_OBJECT)
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2839 {
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2840 // funcref object variable
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2841 object_T *obj = rettv->vval.v_object;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2842 typval_T tv = (typval_T )(obj + 1) + m_idx;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2843 copy_tv(tv, rettv);
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2844 }
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2845 else
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2846 // funcref class variable
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2847 copy_tv(&cl->class_members_tv[m_idx], rettv);
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2848 *arg = name_end;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2849 return OK;
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2850 }
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2851
33540 86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2852 if (ocm == NULL && *fp->uf_name == '_')
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2853 {
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2854 // Cannot access a private method outside of a class
33738 2172872dfbcd patch 9.0.2096: Vim9: confusing usage of private Christian Brabandt <cb@256bit.org> parents: 33708 diff changeset	2855 semsg(_(e_cannot_access_protected_method_str), fp->uf_name);
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2856 return FAIL;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2857 }
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2858
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2859 char_u *argp = name_end;
33936 bdd408288d95 patch 9.0.2164: Vim9: can use type a func arg/return value Christian Brabandt <cb@256bit.org> parents: 33929 diff changeset	2860 int ret = get_func_arguments(&argp, evalarg, 0, argvars, &argcount, FALSE);
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2861 if (ret == FAIL)
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2862 return FAIL;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2863
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2864 funcexe_T funcexe;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2865 CLEAR_FIELD(funcexe);
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2866 funcexe.fe_evaluate = TRUE;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2867 if (rettv->v_type == VAR_OBJECT)
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2868 {
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2869 funcexe.fe_object = rettv->vval.v_object;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2870 ++funcexe.fe_object->obj_refcount;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2871 }
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2872
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2873 // Clear the class or object after calling the function, in
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2874 // case the refcount is one.
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2875 typval_T tv_tofree = *rettv;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2876 rettv->v_type = VAR_UNKNOWN;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2877
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2878 // Call the user function. Result goes into rettv;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2879 int error = call_user_func_check(fp, argcount, argvars, rettv, &funcexe,
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2880 NULL);
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2881
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2882 // Clear the previous rettv and the arguments.
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2883 clear_tv(&tv_tofree);
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2884 for (int idx = 0; idx < argcount; ++idx)
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2885 clear_tv(&argvars[idx]);
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2886
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2887 if (error != FCERR_NONE)
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2888 {
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2889 user_func_error(error, printable_func_name(fp), funcexe.fe_found_var);
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2890 return FAIL;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2891 }
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2892 *arg = argp;
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2893
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2894 return OK;
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2895 }
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2896
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2897 /*
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2898 * Evaluate what comes after a class:
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2899 * - class member: SomeClass.varname
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2900 * - class function: SomeClass.SomeMethod()
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2901 * - class constructor: SomeClass.new()
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2902 * - object member: someObject.varname
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2903 * - object method: someObject.SomeMethod()
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2904 *
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2905 * "*arg" points to the '.'.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2906 * "*arg" is advanced to after the member name or method call.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2907 *
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2908 * Returns FAIL or OK.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2909 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2910 int
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2911 class_object_index(
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2912 char_u **arg,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2913 typval_T *rettv,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2914 evalarg_T *evalarg,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2915 int verbose UNUSED) // give error messages
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2916 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2917 if (VIM_ISWHITE((*arg)[1]))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2918 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2919 semsg(_(e_no_white_space_allowed_after_str_str), ".", *arg);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2920 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2921 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2922
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2923 ++*arg;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2924 char_u name = arg;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2925 char_u *name_end = find_name_end(name, NULL, NULL, FNE_CHECK_START);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2926 if (name_end == name)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2927 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2928 size_t len = name_end - name;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2929
33473 156d07bea2ac patch 9.0.1989: Vim9: double error message given Christian Brabandt <cb@256bit.org> parents: 33471 diff changeset	2930 int did_emsg_save = did_emsg;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2931 class_T *cl;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2932 if (rettv->v_type == VAR_CLASS)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2933 cl = rettv->vval.v_class;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2934 else // VAR_OBJECT
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2935 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2936 if (rettv->vval.v_object == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2937 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2938 emsg(_(e_using_null_object));
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2939 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2940 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2941 cl = rettv->vval.v_object->obj_class;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2942 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2943
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2944 if (cl == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2945 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2946 emsg(_(e_incomplete_type));
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2947 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2948 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2949
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2950 if (*name_end == '(')
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2951 // Invoke the class or object method
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2952 return call_oc_method(cl, name, len, name_end, evalarg, arg, rettv);
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2953
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2954 else if (rettv->v_type == VAR_OBJECT \|\| rettv->v_type == VAR_CLASS)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2955 {
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2956 // Search in the object member variable table and the class member
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2957 // variable table.
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2958 int is_object = rettv->v_type == VAR_OBJECT;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2959 if (get_member_tv(cl, is_object, name, len, rettv) == OK)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2960 {
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2961 *arg = name_end;
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2962 return OK;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2963 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2964
33540 86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2965 // could be a class method or an object method
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2966 int fidx;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2967 ufunc_T *fp = method_lookup(cl, rettv->v_type, name, len, &fidx);
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2968 if (fp != NULL)
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2969 {
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2970 // Private methods are not accessible outside the class
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2971 if (*name == '_')
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2972 {
33738 2172872dfbcd patch 9.0.2096: Vim9: confusing usage of private Christian Brabandt <cb@256bit.org> parents: 33708 diff changeset	2973 semsg(_(e_cannot_access_protected_method_str), fp->uf_name);
33540 86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2974 return FAIL;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2975 }
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2976
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2977 partial_T *pt = ALLOC_CLEAR_ONE(partial_T);
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2978 if (pt == NULL)
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2979 return FAIL;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2980
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2981 pt->pt_refcount = 1;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2982 if (is_object)
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2983 {
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2984 pt->pt_obj = rettv->vval.v_object;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2985 ++pt->pt_obj->obj_refcount;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2986 }
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2987 pt->pt_auto = TRUE;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2988 pt->pt_func = fp;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2989 func_ptr_ref(pt->pt_func);
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2990 rettv->v_type = VAR_PARTIAL;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2991 rettv->vval.v_partial = pt;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2992 *arg = name_end;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2993 return OK;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2994 }
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2995
33473 156d07bea2ac patch 9.0.1989: Vim9: double error message given Christian Brabandt <cb@256bit.org> parents: 33471 diff changeset	2996 if (did_emsg == did_emsg_save)
33636 53416c49a7ab patch 9.0.2059: outstanding exceptions may be skipped Christian Brabandt <cb@256bit.org> parents: 33627 diff changeset	2997 member_not_found_msg(cl, rettv->v_type, name, len);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2998 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2999
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3000 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3001 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3002
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3003 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3004 * If "arg" points to a class or object method, return it.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3005 * Otherwise return NULL.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3006 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3007 ufunc_T *
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3008 find_class_func(char_u **arg)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3009 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3010 char_u name = arg;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3011 char_u *name_end = find_name_end(name, NULL, NULL, FNE_CHECK_START);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3012 if (name_end == name \|\| *name_end != '.')
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3013 return NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3014
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3015 ufunc_T *fp = NULL;
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	3016 size_t len = name_end - name;
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	3017 typval_T tv;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3018 tv.v_type = VAR_UNKNOWN;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3019 if (eval_variable(name, (int)len,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3020 0, &tv, NULL, EVAL_VAR_NOAUTOLOAD) == FAIL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3021 return NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3022 if (tv.v_type != VAR_CLASS && tv.v_type != VAR_OBJECT)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3023 goto fail_after_eval;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3024
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3025 class_T *cl = tv.v_type == VAR_CLASS ? tv.vval.v_class
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3026 : tv.vval.v_object->obj_class;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3027 if (cl == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3028 goto fail_after_eval;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3029 char_u *fname = name_end + 1;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3030 char_u *fname_end = find_name_end(fname, NULL, NULL, FNE_CHECK_START);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3031 if (fname_end == fname)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3032 goto fail_after_eval;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3033 len = fname_end - fname;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3034
33246 877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3035 fp = method_lookup(cl, tv.v_type, fname, len, NULL);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3036
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3037 fail_after_eval:
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3038 clear_tv(&tv);
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3039 return fp;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3040 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3041
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3042 /*
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3043 * Returns the index of class variable "name" in the class "cl".
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3044 * Returns -1, if the variable is not found.
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3045 * If "namelen" is zero, then it is assumed that "name" is NUL terminated.
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3046 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3047 int
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3048 class_member_idx(class_T cl, char_u name, size_t namelen)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3049 {
33246 877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3050 int idx;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3051 class_member_lookup(cl, name, namelen, &idx);
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3052 return idx;
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3053 }
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3054
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3055 /*
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3056 * Returns a pointer to the class member variable "name" in the class "cl".
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3057 * Returns NULL if the variable is not found.
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3058 * The member variable index is set in "idx".
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3059 */
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3060 ocmember_T *
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3061 class_member_lookup(class_T cl, char_u name, size_t namelen, int *idx)
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3062 {
33246 877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3063 ocmember_T *ret_m = NULL;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3064 int ret_idx = -1;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3065 for (int i = 0; i < cl->class_class_member_count; ++i)
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3066 {
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3067 ocmember_T *m = &cl->class_class_members[i];
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3068 if (namelen)
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3069 {
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3070 if (STRNCMP(name, m->ocm_name, namelen) == 0
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3071 && m->ocm_name[namelen] == NUL)
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3072 {
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3073 ret_m = m;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3074 ret_idx = i;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3075 break;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3076 }
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3077 }
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3078 else if (STRCMP(name, m->ocm_name) == 0)
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3079 {
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3080 ret_m = m;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3081 ret_idx = i;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3082 break;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3083 }
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3084 }
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3085 if (idx != NULL)
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3086 *idx = ret_idx;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3087 return ret_m;
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3088 }
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3089
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3090 /*
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3091 * Returns a pointer to the class method "name" in class "cl".
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3092 * Returns NULL if the method is not found.
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3093 * The method index is set in "idx".
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3094 */
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3095 static ufunc_T *
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3096 class_method_lookup(class_T cl, char_u name, size_t namelen, int *idx)
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3097 {
33246 877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3098 ufunc_T *ret_fp = NULL;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3099 int ret_idx = -1;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3100 for (int i = 0; i < cl->class_class_function_count; ++i)
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3101 {
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3102 ufunc_T *fp = cl->class_class_functions[i];
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3103 char_u ufname = (char_u )fp->uf_name;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3104 if (STRNCMP(name, ufname, namelen) == 0 && ufname[namelen] == NUL)
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3105 {
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3106 ret_fp = fp;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3107 ret_idx = i;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3108 break;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3109 }
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3110 }
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3111 if (idx != NULL)
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3112 *idx = ret_idx;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3113 return ret_fp;
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3114 }
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3115
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3116 /*
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3117 * Returns the index of class method "name" in the class "cl".
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3118 * Returns -1, if the method is not found.
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3119 */
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3120 int
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3121 class_method_idx(class_T cl, char_u name, size_t namelen)
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3122 {
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3123 int idx;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3124 class_method_lookup(cl, name, namelen, &idx);
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3125 return idx;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3126 }
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3127
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3128 /*
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3129 * Returns the index of object member variable "name" in the class "cl".
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3130 * Returns -1, if the variable is not found.
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3131 * If "namelen" is zero, then it is assumed that "name" is NUL terminated.
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3132 */
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3133 static int
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3134 object_member_idx(class_T cl, char_u name, size_t namelen)
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3135 {
33246 877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3136 int idx;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3137 object_member_lookup(cl, name, namelen, &idx);
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3138 return idx;
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3139 }
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3140
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3141 /*
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3142 * Returns a pointer to the object member variable "name" in the class "cl".
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3143 * Returns NULL if the variable is not found.
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3144 * The object member variable index is set in "idx".
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3145 */
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3146 ocmember_T *
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3147 object_member_lookup(class_T cl, char_u name, size_t namelen, int *idx)
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3148 {
33246 877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3149 ocmember_T *ret_m = NULL;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3150 int ret_idx = -1;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3151 for (int i = 0; i < cl->class_obj_member_count; ++i)
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3152 {
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3153 ocmember_T *m = &cl->class_obj_members[i];
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3154 if (namelen)
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3155 {
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3156 if (STRNCMP(name, m->ocm_name, namelen) == 0
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3157 && m->ocm_name[namelen] == NUL)
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3158 {
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3159 ret_m = m;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3160 ret_idx = i;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3161 break;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3162 }
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3163 }
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3164 else if (STRCMP(name, m->ocm_name) == 0)
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3165 {
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3166 ret_m = m;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3167 ret_idx = i;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3168 break;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3169 }
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3170 }
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3171 if (idx != NULL)
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3172 *idx = ret_idx;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3173 return ret_m;
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3174 }
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3175
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3176 /*
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3177 * Returns a pointer to the object method "name" in class "cl".
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3178 * Returns NULL if the method is not found.
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3179 * The object method index is set in "idx".
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3180 */
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3181 static ufunc_T *
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3182 object_method_lookup(class_T cl, char_u name, size_t namelen, int *idx)
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3183 {
33246 877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3184 ufunc_T *ret_fp = NULL;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3185 int ret_idx = -1;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3186 for (int i = 0; i < cl->class_obj_method_count; ++i)
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3187 {
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3188 ufunc_T *fp = cl->class_obj_methods[i];
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3189 // Use a separate pointer to avoid that ASAN complains about
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3190 // uf_name[] only being 4 characters.
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3191 char_u ufname = (char_u )fp->uf_name;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3192 if (STRNCMP(name, ufname, namelen) == 0 && ufname[namelen] == NUL)
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3193 {
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3194 ret_fp = fp;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3195 ret_idx = i;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3196 break;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3197 }
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3198 }
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3199 if (idx != NULL)
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3200 *idx = ret_idx;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	3201 return ret_fp;
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3202 }
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3203
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3204 /*
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3205 * Returns the index of object method "name" in the class "cl".
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3206 * Returns -1, if the method is not found.
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3207 */
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3208 int
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3209 object_method_idx(class_T cl, char_u name, size_t namelen)
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3210 {
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3211 int idx;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3212 object_method_lookup(cl, name, namelen, &idx);
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3213 return idx;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3214 }
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3215
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3216 /*
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3217 * Lookup a class or object member variable by name. If v_type is VAR_CLASS,
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3218 * then lookup a class member variable and if it is VAR_OBJECT, then lookup a
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3219 * object member variable.
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3220 *
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3221 * Returns a pointer to the member variable structure if variable is found.
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3222 * Otherwise returns NULL. The member variable index is set in "*idx".
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3223 */
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3224 ocmember_T *
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3225 member_lookup(
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3226 class_T *cl,
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3227 vartype_T v_type,
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3228 char_u *name,
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3229 size_t namelen,
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3230 int *idx)
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3231 {
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3232 if (v_type == VAR_CLASS)
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3233 return class_member_lookup(cl, name, namelen, idx);
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3234 else
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3235 return object_member_lookup(cl, name, namelen, idx);
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3236 }
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3237
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3238 /*
33498 bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3239 * Find the class that defines the named member. Look up the hierarchy
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3240 * starting at "cl".
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3241 *
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3242 * Return the class that defines the member "name", else NULL.
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3243 * Fill in "p_m", if specified, for ocmember_T in found class.
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3244 */
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3245 // NOTE: if useful for something could also indirectly return vartype and idx.
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3246 static class_T *
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3247 class_defining_member(class_T cl, char_u name, size_t len, ocmember_T **p_m)
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3248 {
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3249 class_T *cl_found = NULL;
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3250 vartype_T vartype = VAR_UNKNOWN;
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3251 ocmember_T *m_found = NULL;
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3252
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3253 len = len != 0 ? len : STRLEN(name);
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3254
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3255 // Loop assumes if member is not defined in "cl", then it is not
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3256 // defined in any super class; the last class where it's found is the
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3257 // class where it is defined. Once the vartype is found, the other
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3258 // type is no longer checked.
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3259 for (class_T *super = cl; super != NULL; super = super->class_extends)
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3260 {
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3261 class_T *cl_tmp = NULL;
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3262 ocmember_T *m = NULL;
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3263 if (vartype == VAR_UNKNOWN \|\| vartype == VAR_OBJECT)
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3264 {
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3265 if ((m = object_member_lookup(super, name, len, NULL)) != NULL)
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3266 {
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3267 cl_tmp = super;
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3268 vartype = VAR_OBJECT;
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3269 }
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3270 }
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3271 if (vartype == VAR_UNKNOWN \|\| vartype == VAR_CLASS)
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3272 {
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3273 if (( m = class_member_lookup(super, name, len, NULL)) != NULL)
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3274 {
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3275 cl_tmp = super;
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3276 vartype = VAR_OBJECT;
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3277 }
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3278 }
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3279 if (cl_tmp == NULL)
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3280 break; // member is not in this or any super class.
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3281 cl_found = cl_tmp;
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3282 m_found = m;
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3283 }
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3284 if (p_m != NULL)
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3285 *p_m = m_found;
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3286 return cl_found;
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3287 }
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3288
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3289 /*
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3290 * Lookup a class or object method by name. If v_type is VAR_CLASS, then
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3291 * lookup a class method and if it is VAR_OBJECT, then lookup a object method.
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3292 *
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3293 * Returns a pointer to the method structure if variable is found.
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3294 * Otherwise returns NULL. The method variable index is set in "*idx".
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3295 */
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3296 ufunc_T *
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3297 method_lookup(
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3298 class_T *cl,
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3299 vartype_T v_type,
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3300 char_u *name,
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3301 size_t namelen,
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3302 int *idx)
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3303 {
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3304 if (v_type == VAR_CLASS)
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3305 return class_method_lookup(cl, name, namelen, idx);
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3306 else
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3307 return object_method_lookup(cl, name, namelen, idx);
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3308 }
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3309
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	3310 /*
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3311 * Return TRUE if current context "cctx_arg" is inside class "cl".
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3312 * Return FALSE if not.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3313 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3314 int
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3315 inside_class(cctx_T cctx_arg, class_T cl)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3316 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3317 for (cctx_T *cctx = cctx_arg; cctx != NULL; cctx = cctx->ctx_outer)
33204 36aebbf8389f patch 9.0.1880: Vim9: Need more tests for inheritance Christian Brabandt <cb@256bit.org> parents: 33201 diff changeset	3318 if (cctx->ctx_ufunc != NULL
33432 97ceabebaeaf patch 9.0.1974: vim9: using contra-variant type-checks Christian Brabandt <cb@256bit.org> parents: 33401 diff changeset	3319 && class_instance_of(cctx->ctx_ufunc->uf_class, cl))
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3320 return TRUE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3321 return FALSE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3322 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3323
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3324 /*
33951 45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3325 * Return TRUE if object/class variable "m" is read-only.
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3326 * Also give an error message.
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3327 */
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3328 int
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3329 oc_var_check_ro(class_T cl, ocmember_T m)
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3330 {
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3331 if (m->ocm_flags & (OCMFLAG_FINAL \| OCMFLAG_CONST))
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3332 {
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3333 semsg(_(e_cannot_change_readonly_variable_str_in_class_str),
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3334 m->ocm_name, cl->class_name);
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3335 return TRUE;
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3336 }
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3337 return FALSE;
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3338 }
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3339
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3340 /*
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3341 * Lock all the constant object variables. Called after creating and
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3342 * initializing a new object.
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3343 */
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3344 void
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3345 obj_lock_const_vars(object_T *obj)
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3346 {
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3347 for (int i = 0; i < obj->obj_class->class_obj_member_count; i++)
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3348 {
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3349 ocmember_T *ocm = &obj->obj_class->class_obj_members[i];
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3350 if (ocm->ocm_flags & OCMFLAG_CONST)
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3351 {
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3352 typval_T mtv = ((typval_T )(obj + 1)) + i;
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3353 item_lock(mtv, DICT_MAXNEST, TRUE, TRUE);
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3354 }
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3355 }
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3356 }
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3357
45a50fd59a73 patch 9.0.2170: Vim9: no support for const/final class/objects vars Christian Brabandt <cb@256bit.org> parents: 33942 diff changeset	3358 /*
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3359 * Make a copy of an object.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3360 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3361 void
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3362 copy_object(typval_T from, typval_T to)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3363 {
32960 d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	3364 if (from->vval.v_object == NULL)
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	3365 to->vval.v_object = NULL;
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	3366 else
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	3367 {
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	3368 to->vval.v_object = from->vval.v_object;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3369 ++to->vval.v_object->obj_refcount;
32960 d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	3370 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3371 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3372
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3373 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3374 * Make a copy of a class.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3375 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3376 void
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3377 copy_class(typval_T from, typval_T to)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3378 {
32960 d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	3379 if (from->vval.v_class == NULL)
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	3380 to->vval.v_class = NULL;
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	3381 else
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	3382 {
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	3383 to->vval.v_class = from->vval.v_class;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3384 ++to->vval.v_class->class_refcount;
32960 d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	3385 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3386 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3387
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3388 /*
33160 4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3389 * Free the class "cl" and its contents.
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3390 */
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3391 static void
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3392 class_free(class_T *cl)
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3393 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3394 // Freeing what the class contains may recursively come back here.
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3395 // Clear "class_name" first, if it is NULL the class does not need to
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3396 // be freed.
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3397 VIM_CLEAR(cl->class_name);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3398
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3399 class_unref(cl->class_extends);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3400
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3401 for (int i = 0; i < cl->class_interface_count; ++i)
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3402 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3403 vim_free(((char_u **)cl->class_interfaces)[i]);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3404 if (cl->class_interfaces_cl[i] != NULL)
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3405 class_unref(cl->class_interfaces_cl[i]);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3406 }
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3407 vim_free(cl->class_interfaces);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3408 vim_free(cl->class_interfaces_cl);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3409
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3410 itf2class_T *next;
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3411 for (itf2class_T *i2c = cl->class_itf2class; i2c != NULL; i2c = next)
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3412 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3413 next = i2c->i2c_next;
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3414 vim_free(i2c);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3415 }
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3416
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3417 for (int i = 0; i < cl->class_class_member_count; ++i)
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3418 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3419 ocmember_T *m = &cl->class_class_members[i];
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3420 vim_free(m->ocm_name);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3421 vim_free(m->ocm_init);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3422 if (cl->class_members_tv != NULL)
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3423 clear_tv(&cl->class_members_tv[i]);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3424 }
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3425 vim_free(cl->class_class_members);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3426 vim_free(cl->class_members_tv);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3427
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3428 for (int i = 0; i < cl->class_obj_member_count; ++i)
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3429 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3430 ocmember_T *m = &cl->class_obj_members[i];
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3431 vim_free(m->ocm_name);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3432 vim_free(m->ocm_init);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3433 }
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3434 vim_free(cl->class_obj_members);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3435
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3436 for (int i = 0; i < cl->class_class_function_count; ++i)
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3437 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3438 ufunc_T *uf = cl->class_class_functions[i];
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3439 func_clear_free(uf, FALSE);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3440 }
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3441 vim_free(cl->class_class_functions);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3442
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3443 for (int i = 0; i < cl->class_obj_method_count; ++i)
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3444 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3445 ufunc_T *uf = cl->class_obj_methods[i];
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3446 func_clear_free(uf, FALSE);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3447 }
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3448 vim_free(cl->class_obj_methods);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3449
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3450 clear_type_list(&cl->class_type_list);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3451
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3452 class_cleared(cl);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3453
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3454 vim_free(cl);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3455 }
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3456
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3457 /*
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3458 * Unreference a class. Free it when the reference count goes down to zero.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3459 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3460 void
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3461 class_unref(class_T *cl)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3462 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3463 if (cl != NULL && --cl->class_refcount <= 0 && cl->class_name != NULL)
33160 4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3464 class_free(cl);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3465 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3466
33160 4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3467 /*
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3468 * Go through the list of all classes and free items without "copyID".
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3469 */
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3470 int
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3471 class_free_nonref(int copyID)
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3472 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3473 int did_free = FALSE;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3474
33160 4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3475 for (class_T *cl = first_class; cl != NULL; cl = next_nonref_class)
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3476 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3477 next_nonref_class = cl->class_next_used;
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3478 if ((cl->class_copyID & COPYID_MASK) != (copyID & COPYID_MASK))
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3479 {
33160 4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3480 // Free the class and items it contains.
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3481 class_free(cl);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3482 did_free = TRUE;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3483 }
33160 4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3484 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3485
33160 4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3486 next_nonref_class = NULL;
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3487 return did_free;
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3488 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3489
33160 4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3490 int
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3491 set_ref_in_classes(int copyID)
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3492 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3493 for (class_T *cl = first_class; cl != NULL; cl = cl->class_next_used)
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3494 set_ref_in_item_class(cl, copyID, NULL, NULL);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3495
33160 4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	3496 return FALSE;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3497 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3498
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3499 static object_T *first_object = NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3500
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3501 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3502 * Call this function when an object has been created. It will be added to the
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3503 * list headed by "first_object".
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3504 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3505 void
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3506 object_created(object_T *obj)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3507 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3508 if (first_object != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3509 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3510 obj->obj_next_used = first_object;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3511 first_object->obj_prev_used = obj;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3512 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3513 first_object = obj;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3514 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3515
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3516 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3517 * Call this function when an object has been cleared and is about to be freed.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3518 * It is removed from the list headed by "first_object".
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3519 */
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3520 static void
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3521 object_cleared(object_T *obj)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3522 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3523 if (obj->obj_next_used != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3524 obj->obj_next_used->obj_prev_used = obj->obj_prev_used;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3525 if (obj->obj_prev_used != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3526 obj->obj_prev_used->obj_next_used = obj->obj_next_used;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3527 else if (first_object == obj)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3528 first_object = obj->obj_next_used;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3529 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3530
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3531 /*
33540 86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3532 * Free the contents of an object ignoring the reference count.
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3533 */
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3534 static void
33540 86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3535 object_free_contents(object_T *obj)
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3536 {
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3537 class_T *cl = obj->obj_class;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3538
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3539 if (!cl)
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3540 return;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3541
33540 86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3542 // Avoid a recursive call, it can happen if "obj" has a circular reference.
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3543 obj->obj_refcount = INT_MAX;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3544
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3545 // the member values are just after the object structure
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3546 typval_T tv = (typval_T )(obj + 1);
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3547 for (int i = 0; i < cl->class_obj_member_count; ++i)
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3548 clear_tv(tv + i);
33540 86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3549 }
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3550
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3551 static void
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3552 object_free_object(object_T *obj)
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3553 {
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3554 class_T *cl = obj->obj_class;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3555
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3556 if (!cl)
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3557 return;
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3558
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3559 // Remove from the list headed by "first_object".
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3560 object_cleared(obj);
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3561
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3562 vim_free(obj);
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3563 class_unref(cl);
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3564 }
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3565
33540 86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3566 static void
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3567 object_free(object_T *obj)
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3568 {
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3569 if (in_free_unref_items)
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3570 return;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3571
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3572 object_free_contents(obj);
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3573 object_free_object(obj);
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3574 }
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3575
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3576 /*
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3577 * Unreference an object.
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3578 */
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3579 void
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3580 object_unref(object_T *obj)
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3581 {
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3582 if (obj != NULL && --obj->obj_refcount <= 0)
33540 86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3583 object_free(obj);
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3584 }
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3585
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3586 /*
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3587 * Go through the list of all objects and free items without "copyID".
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3588 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3589 int
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3590 object_free_nonref(int copyID)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3591 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3592 int did_free = FALSE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3593
33540 86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3594 for (object_T *obj = first_object; obj != NULL; obj = obj->obj_next_used)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3595 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3596 if ((obj->obj_copyID & COPYID_MASK) != (copyID & COPYID_MASK))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3597 {
33540 86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3598 // Free the object contents. Object itself will be freed later.
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3599 object_free_contents(obj);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3600 did_free = TRUE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3601 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3602 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3603
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3604 return did_free;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3605 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3606
33540 86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3607 void
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3608 object_free_items(int copyID)
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3609 {
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3610 object_T *obj_next;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3611
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3612 for (object_T *obj = first_object; obj != NULL; obj = obj_next)
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3613 {
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3614 obj_next = obj->obj_next_used;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3615 if ((obj->obj_copyID & COPYID_MASK) != (copyID & COPYID_MASK))
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3616 object_free_object(obj);
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3617 }
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3618 }
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3619
32972 e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3620 /*
33498 bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3621 * Output message which takes a variable name and the class that defines it.
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3622 * "cl" is that class where the name was found. Search "cl"'s hierarchy to
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3623 * find the defining class.
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3624 */
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3625 void
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3626 emsg_var_cl_define(char msg, char_u name, size_t len, class_T *cl)
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3627 {
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3628 ocmember_T *m;
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3629 class_T *cl_def = class_defining_member(cl, name, len, &m);
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3630 if (cl_def != NULL)
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3631 semsg(_(msg), m->ocm_name, cl_def->class_name);
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3632 else
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3633 emsg(_(e_internal_error_please_report_a_bug));
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3634 }
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3635
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3636 /*
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3637 * Echo a class or object method not found message.
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3638 */
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3639 void
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3640 method_not_found_msg(class_T cl, vartype_T v_type, char_u name, size_t len)
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3641 {
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3642 char_u *method_name = vim_strnsave(name, len);
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3643 if ((v_type == VAR_OBJECT)
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3644 && (class_method_idx(cl, name, len) >= 0))
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3645 {
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3646 // If this is a class method, then give a different error
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3647 if (*name == '_')
33738 2172872dfbcd patch 9.0.2096: Vim9: confusing usage of private Christian Brabandt <cb@256bit.org> parents: 33708 diff changeset	3648 semsg(_(e_cannot_access_protected_method_str), method_name);
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3649 else
33343 41b50abddeea patch 9.0.1935: Vim9: not consistent error messages Christian Brabandt <cb@256bit.org> parents: 33326 diff changeset	3650 semsg(_(e_class_method_str_accessible_only_using_class_str),
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3651 method_name, cl->class_name);
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3652 }
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3653 else if ((v_type == VAR_CLASS)
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3654 && (object_method_idx(cl, name, len) >= 0))
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3655 {
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3656 // If this is an object method, then give a different error
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3657 if (*name == '_')
33738 2172872dfbcd patch 9.0.2096: Vim9: confusing usage of private Christian Brabandt <cb@256bit.org> parents: 33708 diff changeset	3658 semsg(_(e_cannot_access_protected_method_str), method_name);
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3659 else
33343 41b50abddeea patch 9.0.1935: Vim9: not consistent error messages Christian Brabandt <cb@256bit.org> parents: 33326 diff changeset	3660 semsg(_(e_object_method_str_accessible_only_using_object_str),
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3661 method_name, cl->class_name);
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3662 }
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3663 else
33627 41c64cb748c1 patch 9.0.2055: Vim9: non-consistent error messages Christian Brabandt <cb@256bit.org> parents: 33618 diff changeset	3664 semsg(_(e_method_not_found_on_class_str_str), method_name,
41c64cb748c1 patch 9.0.2055: Vim9: non-consistent error messages Christian Brabandt <cb@256bit.org> parents: 33618 diff changeset	3665 cl->class_name);
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3666 vim_free(method_name);
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3667 }
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3668
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3669 /*
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3670 * Echo a class or object member not found message.
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3671 */
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3672 void
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3673 member_not_found_msg(class_T cl, vartype_T v_type, char_u name, size_t len)
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3674 {
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3675 char_u *varname = len ? vim_strnsave(name, len) : vim_strsave(name);
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3676
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3677 if (v_type == VAR_OBJECT)
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3678 {
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3679 if (class_member_idx(cl, name, len) >= 0)
33343 41b50abddeea patch 9.0.1935: Vim9: not consistent error messages Christian Brabandt <cb@256bit.org> parents: 33326 diff changeset	3680 semsg(_(e_class_variable_str_accessible_only_using_class_str),
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3681 varname, cl->class_name);
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3682 else
33627 41c64cb748c1 patch 9.0.2055: Vim9: non-consistent error messages Christian Brabandt <cb@256bit.org> parents: 33618 diff changeset	3683 semsg(_(e_variable_not_found_on_object_str_str), varname,
41c64cb748c1 patch 9.0.2055: Vim9: non-consistent error messages Christian Brabandt <cb@256bit.org> parents: 33618 diff changeset	3684 cl->class_name);
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3685 }
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3686 else
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3687 {
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3688 if (object_member_idx(cl, name, len) >= 0)
33343 41b50abddeea patch 9.0.1935: Vim9: not consistent error messages Christian Brabandt <cb@256bit.org> parents: 33326 diff changeset	3689 semsg(_(e_object_variable_str_accessible_only_using_object_str),
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3690 varname, cl->class_name);
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3691 else
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	3692 {
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	3693 if (IS_ENUM(cl))
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	3694 semsg(_(e_enum_value_str_not_found_in_enum_str),
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	3695 varname, cl->class_name);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	3696 else
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	3697 semsg(_(e_class_variable_str_not_found_in_class_str),
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	3698 varname, cl->class_name);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	3699 }
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3700 }
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3701 vim_free(varname);
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3702 }
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3703
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3704 /*
34112 0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3705 * Compile all the class and object methods in "cl".
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3706 */
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3707 void
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3708 defcompile_class(class_T *cl)
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3709 {
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3710 for (int loop = 1; loop <= 2; ++loop)
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3711 {
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3712 int func_count = loop == 1 ? cl->class_class_function_count
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3713 : cl->class_obj_method_count;
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3714 for (int i = 0; i < func_count; i++)
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3715 {
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3716 ufunc_T *ufunc = loop == 1 ? cl->class_class_functions[i]
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3717 : cl->class_obj_methods[i];
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3718 defcompile_function(ufunc, cl);
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3719 }
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3720 }
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3721 }
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3722
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3723 /*
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3724 * Compile all the classes defined in the current script
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3725 */
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3726 void
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3727 defcompile_classes_in_script(void)
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3728 {
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3729 for (class_T *cl = first_class; cl != NULL; cl = cl->class_next_used)
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3730 {
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3731 if (eval_variable(cl->class_name, 0, 0, NULL, NULL,
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3732 EVAL_VAR_NOAUTOLOAD \| EVAL_VAR_NO_FUNC) != FAIL)
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3733 defcompile_class(cl);
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3734 }
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3735 }
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3736
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3737 /*
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3738 * Returns TRUE if "name" is the name of a class. The typval for the class is
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3739 * returned in "rettv".
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3740 */
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3741 int
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3742 is_class_name(char_u name, typval_T rettv)
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3743 {
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3744 rettv->v_type = VAR_UNKNOWN;
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3745
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3746 if (eval_variable(name, 0, 0, rettv, NULL, EVAL_VAR_NOAUTOLOAD \|
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3747 EVAL_VAR_NO_FUNC) != FAIL)
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3748 return rettv->v_type == VAR_CLASS;
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3749 return FALSE;
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3750 }
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3751
0f2632b04cde patch 9.1.0020: Vim9: cannot compile all methods in a class Christian Brabandt <cb@256bit.org> parents: 33996 diff changeset	3752 /*
34472 5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3753 * Calls the object builtin method "name" with arguments "argv". The value
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3754 * returned by the builtin method is in "rettv". Returns OK or FAIL.
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3755 */
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3756 static int
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3757 object_call_builtin_method(
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3758 object_T *obj,
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3759 class_builtin_T builtin_method,
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3760 int argc,
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3761 typval_T *argv,
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3762 typval_T *rettv)
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3763 {
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3764 ufunc_T *uf;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3765 int midx;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3766
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3767 if (obj == NULL)
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3768 return FAIL;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3769
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3770 uf = class_get_builtin_method(obj->obj_class, builtin_method, &midx);
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3771 if (uf == NULL)
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3772 return FAIL;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3773
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3774 funccall_T *fc = create_funccal(uf, rettv);
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3775 int r;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3776
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3777 if (fc == NULL)
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3778 return FAIL;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3779
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3780 ++obj->obj_refcount;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3781
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3782 r = call_def_function(uf, argc, argv, 0, NULL, obj, fc, rettv);
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3783
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3784 remove_funccal();
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3785
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3786 return r;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3787 }
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3788
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3789 /*
34678 75f7b311ee25 patch 9.1.0220: Few typos in source and test files Christian Brabandt <cb@256bit.org> parents: 34676 diff changeset	3790 * Calls the object "empty()" method and returns the method return value. In
34472 5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3791 * case of an error, returns TRUE.
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3792 */
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3793 int
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3794 object_empty(object_T *obj)
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3795 {
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3796 typval_T rettv;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3797
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3798 if (object_call_builtin_method(obj, CLASS_BUILTIN_EMPTY, 0, NULL, &rettv)
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3799 == FAIL)
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3800 return TRUE;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3801
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3802 return tv_get_bool(&rettv);
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3803 }
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3804
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3805 /*
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3806 * Use the object "len()" method to get an object length. Returns 0 if the
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3807 * method is not found or there is an error.
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3808 */
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3809 int
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3810 object_len(object_T *obj)
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3811 {
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3812 typval_T rettv;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3813
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3814 if (object_call_builtin_method(obj, CLASS_BUILTIN_LEN, 0, NULL, &rettv)
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3815 == FAIL)
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3816 return 0;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3817
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3818 return tv_to_number(&rettv);
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3819 }
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3820
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3821 /*
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3822 * Return a textual representation of object "obj"
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3823 */
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3824 char_u *
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3825 object_string(
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3826 object_T *obj,
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3827 char_u *numbuf,
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3828 int copyID,
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3829 int echo_style,
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3830 int restore_copyID,
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3831 int composite_val)
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3832 {
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3833 typval_T rettv;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3834
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3835 if (object_call_builtin_method(obj, CLASS_BUILTIN_STRING, 0, NULL, &rettv)
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3836 == OK
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3837 && rettv.vval.v_string != NULL)
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3838 return rettv.vval.v_string;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3839 else
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3840 {
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3841 garray_T ga;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3842 ga_init2(&ga, 1, 50);
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3843
34676 5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	3844 class_T *cl = obj == NULL ? NULL : obj->obj_class;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	3845 if (cl != NULL && IS_ENUM(cl))
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	3846 {
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	3847 ga_concat(&ga, cl->class_name);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	3848 char_u name = ((typval_T )(obj + 1))->vval.v_string;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	3849 ga_concat(&ga, (char_u *)".");
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	3850 ga_concat(&ga, name);
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	3851 return ga.ga_data;
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	3852 }
5b25ec43f208 patch 9.1.0219: Vim9: No enum support Christian Brabandt <cb@256bit.org> parents: 34508 diff changeset	3853
34472 5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3854 ga_concat(&ga, (char_u *)"object of ");
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3855 ga_concat(&ga, cl == NULL ? (char_u *)"[unknown]"
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3856 : cl->class_name);
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3857 if (cl != NULL)
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3858 {
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3859 ga_concat(&ga, (char_u *)" {");
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3860 for (int i = 0; i < cl->class_obj_member_count; ++i)
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3861 {
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3862 if (i > 0)
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3863 ga_concat(&ga, (char_u *)", ");
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3864 ocmember_T *m = &cl->class_obj_members[i];
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3865 ga_concat(&ga, m->ocm_name);
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3866 ga_concat(&ga, (char_u *)": ");
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3867 char_u *tf = NULL;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3868 ga_concat(&ga, echo_string_core(
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3869 (typval_T *)(obj + 1) + i,
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3870 &tf, numbuf, copyID, echo_style,
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3871 restore_copyID, composite_val));
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3872 vim_free(tf);
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3873 }
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3874 ga_concat(&ga, (char_u *)"}");
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3875 }
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3876 return ga.ga_data;
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3877 }
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3878 }
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3879
5c1a025192ed patch 9.1.0148: Vim9: can't call internal methods with objects Christian Brabandt <cb@256bit.org> parents: 34112 diff changeset	3880 /*
33006 29b2193466e0 patch 9.0.1795: Indentation issues Christian Brabandt <cb@256bit.org> parents: 32972 diff changeset	3881 * Return TRUE when the class "cl", its base class or one of the implemented
29b2193466e0 patch 9.0.1795: Indentation issues Christian Brabandt <cb@256bit.org> parents: 32972 diff changeset	3882 * interfaces matches the class "other_cl".
32972 e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3883 */
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3884 int
33432 97ceabebaeaf patch 9.0.1974: vim9: using contra-variant type-checks Christian Brabandt <cb@256bit.org> parents: 33401 diff changeset	3885 class_instance_of(class_T cl, class_T other_cl)
32972 e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3886 {
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3887 if (cl == other_cl)
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3888 return TRUE;
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3889
33432 97ceabebaeaf patch 9.0.1974: vim9: using contra-variant type-checks Christian Brabandt <cb@256bit.org> parents: 33401 diff changeset	3890 // Recursively check the base classes.
97ceabebaeaf patch 9.0.1974: vim9: using contra-variant type-checks Christian Brabandt <cb@256bit.org> parents: 33401 diff changeset	3891 for (; cl != NULL; cl = cl->class_extends)
32972 e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3892 {
33432 97ceabebaeaf patch 9.0.1974: vim9: using contra-variant type-checks Christian Brabandt <cb@256bit.org> parents: 33401 diff changeset	3893 if (cl == other_cl)
97ceabebaeaf patch 9.0.1974: vim9: using contra-variant type-checks Christian Brabandt <cb@256bit.org> parents: 33401 diff changeset	3894 return TRUE;
97ceabebaeaf patch 9.0.1974: vim9: using contra-variant type-checks Christian Brabandt <cb@256bit.org> parents: 33401 diff changeset	3895 // Check the implemented interfaces and the super interfaces
97ceabebaeaf patch 9.0.1974: vim9: using contra-variant type-checks Christian Brabandt <cb@256bit.org> parents: 33401 diff changeset	3896 for (int i = cl->class_interface_count - 1; i >= 0; --i)
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	3897 {
33432 97ceabebaeaf patch 9.0.1974: vim9: using contra-variant type-checks Christian Brabandt <cb@256bit.org> parents: 33401 diff changeset	3898 class_T *intf = cl->class_interfaces_cl[i];
97ceabebaeaf patch 9.0.1974: vim9: using contra-variant type-checks Christian Brabandt <cb@256bit.org> parents: 33401 diff changeset	3899 while (intf != NULL)
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	3900 {
33432 97ceabebaeaf patch 9.0.1974: vim9: using contra-variant type-checks Christian Brabandt <cb@256bit.org> parents: 33401 diff changeset	3901 if (intf == other_cl)
97ceabebaeaf patch 9.0.1974: vim9: using contra-variant type-checks Christian Brabandt <cb@256bit.org> parents: 33401 diff changeset	3902 return TRUE;
97ceabebaeaf patch 9.0.1974: vim9: using contra-variant type-checks Christian Brabandt <cb@256bit.org> parents: 33401 diff changeset	3903 // check the super interfaces
97ceabebaeaf patch 9.0.1974: vim9: using contra-variant type-checks Christian Brabandt <cb@256bit.org> parents: 33401 diff changeset	3904 intf = intf->class_extends;
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	3905 }
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	3906 }
32972 e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3907 }
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3908
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3909 return FALSE;
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3910 }
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3911
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3912 /*
33924 ccdb948c7273 patch 9.0.2160: instanceof() should use varargs as second arg Christian Brabandt <cb@256bit.org> parents: 33806 diff changeset	3913 * "instanceof(object, classinfo, ...)" function
32972 e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3914 */
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3915 void
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3916 f_instanceof(typval_T argvars, typval_T rettv)
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3917 {
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3918 typval_T *object_tv = &argvars[0];
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3919 typval_T *classinfo_tv = &argvars[1];
33682 f126ffc85f7c patch 9.0.2078: several problems with type aliases Christian Brabandt <cb@256bit.org> parents: 33678 diff changeset	3920 class_T *c;
32972 e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3921
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3922 rettv->vval.v_number = VVAL_FALSE;
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3923
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3924 if (check_for_object_arg(argvars, 0) == FAIL
33924 ccdb948c7273 patch 9.0.2160: instanceof() should use varargs as second arg Christian Brabandt <cb@256bit.org> parents: 33806 diff changeset	3925 \|\| check_for_class_or_typealias_args(argvars, 1) == FAIL)
32972 e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3926 return;
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3927
33291 4cb421ba3385 patch 9.0.1911: Vim9: segfault with null object and instanceof() Christian Brabandt <cb@256bit.org> parents: 33286 diff changeset	3928 if (object_tv->vval.v_object == NULL)
4cb421ba3385 patch 9.0.1911: Vim9: segfault with null object and instanceof() Christian Brabandt <cb@256bit.org> parents: 33286 diff changeset	3929 return;
4cb421ba3385 patch 9.0.1911: Vim9: segfault with null object and instanceof() Christian Brabandt <cb@256bit.org> parents: 33286 diff changeset	3930
33924 ccdb948c7273 patch 9.0.2160: instanceof() should use varargs as second arg Christian Brabandt <cb@256bit.org> parents: 33806 diff changeset	3931 for (; classinfo_tv->v_type != VAR_UNKNOWN; ++classinfo_tv)
32972 e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3932 {
33924 ccdb948c7273 patch 9.0.2160: instanceof() should use varargs as second arg Christian Brabandt <cb@256bit.org> parents: 33806 diff changeset	3933 if (classinfo_tv->v_type == VAR_TYPEALIAS)
ccdb948c7273 patch 9.0.2160: instanceof() should use varargs as second arg Christian Brabandt <cb@256bit.org> parents: 33806 diff changeset	3934 c = classinfo_tv->vval.v_typealias->ta_type->tt_class;
ccdb948c7273 patch 9.0.2160: instanceof() should use varargs as second arg Christian Brabandt <cb@256bit.org> parents: 33806 diff changeset	3935 else
ccdb948c7273 patch 9.0.2160: instanceof() should use varargs as second arg Christian Brabandt <cb@256bit.org> parents: 33806 diff changeset	3936 c = classinfo_tv->vval.v_class;
ccdb948c7273 patch 9.0.2160: instanceof() should use varargs as second arg Christian Brabandt <cb@256bit.org> parents: 33806 diff changeset	3937
ccdb948c7273 patch 9.0.2160: instanceof() should use varargs as second arg Christian Brabandt <cb@256bit.org> parents: 33806 diff changeset	3938 if (class_instance_of(object_tv->vval.v_object->obj_class, c))
32972 e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3939 {
33924 ccdb948c7273 patch 9.0.2160: instanceof() should use varargs as second arg Christian Brabandt <cb@256bit.org> parents: 33806 diff changeset	3940 rettv->vval.v_number = VVAL_TRUE;
ccdb948c7273 patch 9.0.2160: instanceof() should use varargs as second arg Christian Brabandt <cb@256bit.org> parents: 33806 diff changeset	3941 return;
32972 e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3942 }
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3943 }
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3944 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3945
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3946 #endif // FEAT_EVAL

Mercurial > vim

annotate src/vim9class.c @ 34690:ad86d59d7510 v9.1.0226