vim: src/vim9class.c annotate

annotate src/vim9class.c @ 33678:7d9d2404a3d4 v9.0.2076

patch 9.0.2076: Vim9: No support for type aliases Commit: https://github.com/vim/vim/commit/ec3cebbd2b6b7583d2f683f5e66345163ec122aa Author: Yegappan Lakshmanan <yegappan@yahoo.com> Date: Fri Oct 27 19:35:26 2023 +0200 patch 9.0.2076: Vim9: No support for type aliases Problem: Vim9: No support for type aliases Solution: Implement :type command A type definition is giving a name to a type specification. This also known type alias. :type ListOfStrings = list<string> The type alias can be used wherever a built-in type can be used. The type alias name must start with an upper case character. closes: #13407 Signed-off-by: Christian Brabandt <cb@256bit.org> Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>

author	Christian Brabandt <cb@256bit.org>
date	Fri, 27 Oct 2023 19:45:05 +0200
parents	53416c49a7ab
children	f126ffc85f7c

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
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	155 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	156 * Add a member to an object or a class.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	157 * Returns OK when successful, "init_expr" will be consumed then.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	158 * Returns FAIL otherwise, caller might need to free "init_expr".
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	159 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	160 static int
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	161 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	162 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	163 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	164 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	165 int has_public,
33446 508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	166 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	167 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	168 char_u *init_expr)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	169 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	170 if (ga_grow(gap, 1) == FAIL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	171 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	172 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	173 m->ocm_name = vim_strnsave(varname, varname_end - varname);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	174 m->ocm_access = has_public ? VIM_ACCESS_ALL
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	175 : *varname == '_' ? VIM_ACCESS_PRIVATE : VIM_ACCESS_READ;
33446 508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	176 m->ocm_has_type = has_type;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	177 m->ocm_type = type;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	178 if (init_expr != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	179 m->ocm_init = init_expr;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	180 ++gap->ga_len;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	181 return OK;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	182 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	183
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	184 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	185 * 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	186 * "gap" contains the found members.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	187 * "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	188 * "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	189 * "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	190 * "member_count" set to the number of members.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	191 * Returns OK or FAIL.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	192 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	193 static int
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	194 add_members_to_class(
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	195 garray_T *gap,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	196 ocmember_T *parent_members,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	197 int parent_count,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	198 ocmember_T **members,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	199 int *member_count)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	200 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	201 *member_count = parent_count + gap->ga_len;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	202 members = member_count == 0 ? NULL
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	203 : ALLOC_MULT(ocmember_T, *member_count);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	204 if (member_count > 0 && members == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	205 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	206 for (int i = 0; i < parent_count; ++i)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	207 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	208 // parent members need to be copied
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	209 ocmember_T m = members + i;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	210 *m = parent_members[i];
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	211 m->ocm_name = vim_strsave(m->ocm_name);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	212 if (m->ocm_init != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	213 m->ocm_init = vim_strsave(m->ocm_init);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	214 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	215 if (gap->ga_len > 0)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	216 // new members are moved
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	217 mch_memmove(*members + parent_count,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	218 gap->ga_data, sizeof(ocmember_T) * gap->ga_len);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	219 VIM_CLEAR(gap->ga_data);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	220 return OK;
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
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	223 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	224 * 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	225 * "cl" implementing that interface.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	226 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	227 int
33387 577ef266309d patch 9.0.1952: Vim9: unused static field Christian Brabandt <cb@256bit.org> parents: 33385 diff changeset	228 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	229 {
33173 9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	230 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	231 : itf->class_obj_member_count))
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	232 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	233 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	234 return 0;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	235 }
32772 0dc750a24875 patch 9.0.1703: Vim9 Calling a method in an extended class fails Christian Brabandt <cb@256bit.org> parents: 32764 diff changeset	236
0dc750a24875 patch 9.0.1703: Vim9 Calling a method in an extended class fails Christian Brabandt <cb@256bit.org> parents: 32764 diff changeset	237 // 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	238 // 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	239 // 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	240 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	241 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	242
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	243 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	244 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	245 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	246
33204 36aebbf8389f patch 9.0.1880: Vim9: Need more tests for inheritance Christian Brabandt <cb@256bit.org> parents: 33201 diff changeset	247 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	248 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	249 {
33204 36aebbf8389f patch 9.0.1880: Vim9: Need more tests for inheritance Christian Brabandt <cb@256bit.org> parents: 33201 diff changeset	250 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	251 {
33204 36aebbf8389f patch 9.0.1880: Vim9: Need more tests for inheritance Christian Brabandt <cb@256bit.org> parents: 33201 diff changeset	252 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	253 {
36aebbf8389f patch 9.0.1880: Vim9: Need more tests for inheritance Christian Brabandt <cb@256bit.org> parents: 33201 diff changeset	254 searching = FALSE;
36aebbf8389f patch 9.0.1880: Vim9: Need more tests for inheritance Christian Brabandt <cb@256bit.org> parents: 33201 diff changeset	255 break;
36aebbf8389f patch 9.0.1880: Vim9: Need more tests for inheritance Christian Brabandt <cb@256bit.org> parents: 33201 diff changeset	256 }
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	257 }
71a097aab64d patch 9.0.1883: Vim9: Calling an interface method using a child object fails Christian Brabandt <cb@256bit.org> parents: 33204 diff changeset	258 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	259 // 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	260 // methods.
33387 577ef266309d patch 9.0.1952: Vim9: unused static field Christian Brabandt <cb@256bit.org> parents: 33385 diff changeset	261 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	262 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	263 if (i2c == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	264 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	265 siemsg("class %s not found on interface %s",
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	266 cl->class_name, itf->class_name);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	267 return 0;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	268 }
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	269
33387 577ef266309d patch 9.0.1952: Vim9: unused static field Christian Brabandt <cb@256bit.org> parents: 33385 diff changeset	270 // 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	271 int table = (int )(i2c + 1);
577ef266309d patch 9.0.1952: Vim9: unused static field Christian Brabandt <cb@256bit.org> parents: 33385 diff changeset	272 // "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	273 // 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	274 return table[idx] + method_offset;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	275 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	276
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	277 /*
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	278 * 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	279 * 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	280 * 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	281 */
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	282 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	283 validate_extends_class(
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	284 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	285 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	286 int is_class)
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	287 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	288 typval_T tv;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	289 int success = FALSE;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	290
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	291 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	292 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	293 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	294 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	295 return success;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	296 }
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	297
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	298 if (tv.v_type != VAR_CLASS \|\| tv.vval.v_class == NULL
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	299 \|\| (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	300 && (tv.vval.v_class->class_flags & CLASS_INTERFACE) != 0)
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	301 \|\| (!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	302 && (tv.vval.v_class->class_flags & CLASS_INTERFACE) == 0))
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	303 // a interface cannot extend a class and a class cannot extend an
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	304 // interface.
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	305 semsg(_(e_cannot_extend_str), extends_name);
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	306 else
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	307 {
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	308 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	309 ++extends_cl->class_refcount;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	310 *extends_clp = extends_cl;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	311 success = TRUE;
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	312 }
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	313 clear_tv(&tv);
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	314
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	315 return success;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	316 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	317
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	318 /*
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	319 * 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	320 * 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	321 */
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	322 static int
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	323 validate_extends_methods(
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	324 garray_T *objmethods_gap,
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	325 class_T *extends_cl)
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	326 {
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	327 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	328 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	329 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	330
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	331 while (super != NULL)
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	332 {
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	333 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	334 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	335 {
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	336 super = super->class_extends;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	337 continue;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	338 }
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	339
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	340 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	341
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	342 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	343 {
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	344 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	345 int extends_private = (*pstr == '_');
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	346 if (extends_private)
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	347 pstr++;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	348
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	349 // 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	350 // 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	351 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	352 {
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	353 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	354 int priv_method = (*qstr == '_');
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	355 if (priv_method)
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	356 qstr++;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	357 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	358 {
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	359 // 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	360 // the subclass
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	361 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	362 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	363 return FALSE;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	364 }
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 }
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	367 super = super->class_extends;
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 return TRUE;
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
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 * 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	375 * 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	376 * 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	377 */
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	378 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	379 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	380 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	381 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	382 {
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	383 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	384 if (member_count == 0)
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	385 return TRUE;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	386
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	387 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	388
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	389 // Validate each member variable
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	390 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	391 {
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	392 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	393 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	394 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	395 ? 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	396
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	397 // 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	398 while (p_cl != NULL)
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 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	401 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	402 {
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	403 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	404 continue;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	405 }
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	406 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	407
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	408 // 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	409 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	410 {
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	411 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	412 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	413 ? 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	414 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	415 {
33343 41b50abddeea patch 9.0.1935: Vim9: not consistent error messages Christian Brabandt <cb@256bit.org> parents: 33326 diff changeset	416 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	417 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	418 }
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	419 }
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	420
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	421 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	422 }
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	423 }
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	424
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	425 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	426 }
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	427
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	428 /*
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	429 * 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	430 * 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	431 * 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	432 * 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	433 */
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	434 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	435 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	436 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	437 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	438 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	439 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	440 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	441 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	442
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	443 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	444
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	445 // 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	446 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	447 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	448 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	449 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	450 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	451
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	452 // 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	453 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	454 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	455 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	456 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	457 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	458 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	459 continue;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	460 }
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	461 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	462
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	463 // 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	464 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	465 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	466 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	467 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	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 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	470 continue;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	471
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	472 // 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	473 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	474 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	475
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	476 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	477 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	478 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	479
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	480 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	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
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	483 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	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 }
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	486
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	487 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	488 }
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	489
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	490 /*
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	491 * 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	492 * 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	493 * implemented.
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	494 */
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	495 static int
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	496 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	497 garray_T *classmethods_gap,
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	498 garray_T *objmethods_gap,
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	499 class_T *extends_cl)
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	500 {
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	501 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	502 {
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	503 // 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	504 // 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	505 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	506 ? 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	507 : 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	508 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	509 continue;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	510
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	511 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	512 ? 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	513 : 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	514
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	515 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	516 : objmethods_gap->ga_len;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	517 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	518 ? classmethods_gap->ga_data
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	519 : objmethods_gap->ga_data);
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	520
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	521 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	522 {
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	523 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	524 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	525 continue;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	526
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	527 int method_found = FALSE;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	528
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	529 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	530 {
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	531 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	532 {
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	533 method_found = TRUE;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	534 break;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	535 }
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	536 }
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	537
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	538 if (!method_found)
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	539 {
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	540 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	541 return FALSE;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	542 }
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	543 }
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
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	546 return TRUE;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	547 }
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	548
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	549 /*
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	550 * 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	551 * 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	552 * 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	553 */
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	554 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	555 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	556 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	557 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	558 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	559 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	560 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	561 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	562 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	563
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	564 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	565 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	566 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	567 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	568
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	569 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	570 continue;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	571
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	572 // 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	573 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	574 {
33343 41b50abddeea patch 9.0.1935: Vim9: not consistent error messages Christian Brabandt <cb@256bit.org> parents: 33326 diff changeset	575 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	576 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	577 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	578 }
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	579
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	580 // 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	581 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	582 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	583 // 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	584 // interface.
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	585 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	586 }
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	587 else
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	588 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	589 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	590 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	591 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	592 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	593 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	594 }
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 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	597 break;
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
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	600 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	601 {
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	602 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	603 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	604 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	605 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	606 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	607 }
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 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	610 }
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	611
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	612 /*
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	613 * 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	614 * ("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	615 * 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	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 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	618 validate_interface_variables(
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	619 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	620 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	621 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	622 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	623 {
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	624 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	625 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	626 return TRUE;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	627
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	628 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	629 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	630 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	631 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	632 {
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	633 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	634 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	635 {
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	636 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	637 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	638 return FALSE;
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	639 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	640 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	641
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	642 return TRUE;
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	643 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	644
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	645 /*
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 * 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	647 */
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	648 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	649 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	650 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	651 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	652
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	653 // 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	654 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	655 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	656 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	657 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	658 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	659
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	660 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	661 }
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	662
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	663 /*
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	664 * 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	665 * 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	666 * 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	667 */
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	668 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	669 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	670 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	671 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	672 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	673 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	674 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	675 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	676
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	677 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	678 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	679 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	680 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	681 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	682 // 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	683 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	684 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	685 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	686 break;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	687 }
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	688 }
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 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	691 {
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	692 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	693 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	694 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	695 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	696 }
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 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	699 }
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	700
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	701 /*
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	702 * 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	703 * 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	704 * 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	705 * types.
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	706 * 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	707 * the new class.
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	708 */
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	709 static int
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	710 validate_interface_methods(
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	711 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	712 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	713 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	714 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	715 {
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	716 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	717 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	718 return TRUE;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	719
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	720 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	721 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	722 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	723 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	724 {
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	725 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	726
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	727 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	728 {
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	729 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	730 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	731 return FALSE;
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	732 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	733 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	734
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	735 return TRUE;
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	736 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	737
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 * 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	740 * 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	741 * 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	742 * "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	743 * "objmembers_gap" respectively.
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	744 */
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	745 static int
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	746 validate_implements_classes(
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	747 garray_T *impl_gap,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	748 class_T **intf_classes,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	749 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	750 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	751 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	752 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	753 int success = TRUE;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	754
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	755 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	756 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	757 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	758 typval_T tv;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	759 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	760 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	761 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	762 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	763 success = FALSE;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	764 break;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	765 }
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 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	768 \|\| tv.vval.v_class == NULL
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	769 \|\| (tv.vval.v_class->class_flags & CLASS_INTERFACE) == 0)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	770 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	771 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	772 success = FALSE;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	773 clear_tv(&tv);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	774 break;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	775 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	776
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	777 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	778 intf_classes[i] = ifcl;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	779 ++ifcl->class_refcount;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	780
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	781 // 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	782 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	783 extends_cl);
32896 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 // 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	786 // 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	787 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	788 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	789 extends_cl);
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	790 clear_tv(&tv);
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
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	793 return success;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	794 }
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 * 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	798 * (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	799 * to check them.)
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 static int
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	802 check_func_arg_names(
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	803 garray_T *classfunctions_gap,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	804 garray_T *objmethods_gap,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	805 garray_T *classmembers_gap)
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 // 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	808 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	809 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	810 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	811
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	812 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	813 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	814 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	815
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	816 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	817 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	818 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	819 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	820
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	821 // 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	822 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	823 {
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	824 char_u *mname =
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	825 ((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	826 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	827 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	828 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	829 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	830
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	831 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	832 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	833
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	834 return FALSE;
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	835 }
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 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	838 }
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
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	841 return TRUE;
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	842 }
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 /*
33381 17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	845 * 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	846 */
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	847 static int
33381 17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	848 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	849 {
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	850 int reserved = FALSE;
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	851 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	852 *varname_end = NUL;
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	853
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	854 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	855
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	856 *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	857
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	858 return reserved;
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	859 }
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	860
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	861 /*
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	862 * 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	863 * 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	864 */
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	865 static int
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	866 is_duplicate_variable(
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	867 garray_T *class_members,
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	868 garray_T *obj_members,
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	869 char_u *varname,
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	870 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	871 {
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	872 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	873 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	874 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	875
33381 17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	876 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	877 {
33381 17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	878 // 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	879 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	880 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	881 {
33381 17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	882 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	883 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	884 : m->ocm_name;
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	885 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	886 {
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	887 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	888 dup = TRUE;
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	889 break;
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	890 }
33047 9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	891 }
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	892 }
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	893
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	894 vim_free(name);
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	895 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	896 }
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	897
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	898 /*
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	899 * 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	900 */
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	901 static int
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	902 is_duplicate_method(
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	903 garray_T *classmethods_gap,
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	904 garray_T *objmethods_gap,
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	905 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	906 {
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	907 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	908
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	909 // 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	910 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	911 {
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	912 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	913 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	914 {
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	915 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	916 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	917 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	918 {
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	919 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	920 return TRUE;
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	921 }
33047 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 }
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	924
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	925 return FALSE;
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 /*
33068 d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	929 * 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	930 */
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	931 static int
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	932 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	933 {
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	934 // 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	935 if (is_abstract)
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	936 {
33343 41b50abddeea patch 9.0.1935: Vim9: not consistent error messages Christian Brabandt <cb@256bit.org> parents: 33326 diff changeset	937 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	938 return FALSE;
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	939 }
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	940 // 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	941 if (has_static)
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	942 {
33343 41b50abddeea patch 9.0.1935: Vim9: not consistent error messages Christian Brabandt <cb@256bit.org> parents: 33326 diff changeset	943 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	944 return FALSE;
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	945 }
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	946 // 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	947 // constructor method.
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	948 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	949 {
33343 41b50abddeea patch 9.0.1935: Vim9: not consistent error messages Christian Brabandt <cb@256bit.org> parents: 33326 diff changeset	950 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	951 return FALSE;
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	952 }
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	953 return TRUE;
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	954 }
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	955
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	956 /*
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	957 * 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	958 * 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	959 * 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	960 * 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	961 * 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	962 * 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	963 */
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	964 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	965 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	966 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	967 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	968 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	969 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	970 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	971 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	972 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	973
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	974 // 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	975 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	976 + 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	977 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	978 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	979 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	980 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	981 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	982 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	983
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	984 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	985 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	986 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	987 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	988 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	989 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	990 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	991 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	992 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	993 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	994 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	995
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	996 // 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	997 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	998 + 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	999 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	1000 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	1001 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	1002 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	1003 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	1004 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	1005
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1006 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	1007 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1008 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	1009 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	1010 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1011 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	1012 ((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	1013 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1014 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	1015 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	1016 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	1017 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	1018 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1019 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1020
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1021 // 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	1022 // 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	1023 // 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	1024 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	1025 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1026 // 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	1027 // 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	1028 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	1029 {
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1030 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	1031 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	1032
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1033 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	1034 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1035
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1036 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	1037 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	1038 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1039 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	1040 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	1041 == 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	1042 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1043 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	1044 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	1045 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	1046 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	1047 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1048 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1049 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	1050 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	1051 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1052 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1053
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1054 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	1055 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1056 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	1057 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	1058 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1059 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1060 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1061
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1062 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	1063 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1064
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	1065 /*
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1066 * 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	1067 * interface class.
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1068 * 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	1069 * 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	1070 * 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	1071 */
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1072 static int
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1073 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	1074 {
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1075 // 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	1076 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	1077 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1078 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	1079
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1080 // 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	1081 // interfaces.
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1082 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	1083 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1084 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	1085 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	1086 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	1087 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	1088 }
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1089 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1090
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	1091 // 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	1092 if (extends_cl != NULL)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1093 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1094 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	1095 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	1096
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1097 // 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	1098 while (pclass != NULL)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1099 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1100 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	1101 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	1102 return FAIL;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1103
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1104 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	1105 pclass = pclass->class_extends;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1106 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1107 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1108
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1109 return OK;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1110 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1111
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1112 /*
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1113 * 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	1114 * and initialize it.
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1115 */
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1116 static void
33471 baa62f464436 patch 9.0.1988: Vim9: potential use-after-free for class members Christian Brabandt <cb@256bit.org> parents: 33456 diff changeset	1117 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	1118 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1119 // 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	1120 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	1121 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	1122 if (cl->class_members_tv == NULL)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1123 return;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1124
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1125 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	1126 {
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1127 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	1128 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	1129 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	1130 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1131 typval_T *etv = eval_expr(m->ocm_init, eap);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1132 if (etv != NULL)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1133 {
33446 508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	1134 if (m->ocm_type->tt_type == VAR_ANY
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	1135 && !m->ocm_has_type
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	1136 && etv->v_type != VAR_SPECIAL)
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	1137 // If the member variable type is not yet set, then use
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	1138 // the initialization expression type.
33471 baa62f464436 patch 9.0.1988: Vim9: potential use-after-free for class members Christian Brabandt <cb@256bit.org> parents: 33456 diff changeset	1139 m->ocm_type = typval2type(etv, get_copyID(),
baa62f464436 patch 9.0.1988: Vim9: potential use-after-free for class members Christian Brabandt <cb@256bit.org> parents: 33456 diff changeset	1140 type_list_gap,
baa62f464436 patch 9.0.1988: Vim9: potential use-after-free for class members Christian Brabandt <cb@256bit.org> parents: 33456 diff changeset	1141 TVTT_DO_MEMBER\|TVTT_MORE_SPECIFIC);
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1142 tv = etv;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1143 vim_free(etv);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1144 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1145 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1146 else
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1147 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1148 // TODO: proper default value
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1149 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	1150 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	1151 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1152 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1153 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1154
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1155 /*
32903 54c01bb98b8e patch 9.0.1760: vim9 class problem with new() constructor Christian Brabandt <cb@256bit.org> parents: 32896 diff changeset	1156 * 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	1157 */
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1158 static void
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1159 add_default_constructor(
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1160 class_T *cl,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1161 garray_T *classfunctions_gap,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1162 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	1163 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1164 garray_T fga;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1165
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1166 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	1167 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	1168 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	1169 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1170 if (i > 0)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1171 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	1172 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	1173 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	1174 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	1175 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	1176 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1177 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	1178 ga_append(&fga, NUL);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1179
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1180 exarg_T fea;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1181 CLEAR_FIELD(fea);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1182 fea.cmdidx = CMD_def;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1183 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	1184
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1185 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	1186 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	1187
33326 4e531adb3fac patch 9.0.1928: Vim9: constructor type checking bug Christian Brabandt <cb@256bit.org> parents: 33297 diff changeset	1188 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	1189 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	1190
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1191 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	1192 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	1193
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1194 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	1195 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1196 ((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	1197 = nf;
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1198 ++classfunctions_gap->ga_len;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1199
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1200 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	1201 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	1202 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	1203 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1204 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	1205 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	1206 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	1207 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	1208 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1209 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1210 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1211
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1212 /*
33268 e231b9af0f44 patch 9.0.1902: Vim9: Coverity complains about dead code Christian Brabandt <cb@256bit.org> parents: 33260 diff changeset	1213 * 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	1214 * 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	1215 * parent class also.
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1216 */
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1217 static int
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1218 add_classfuncs_objmethods(
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1219 class_T *cl,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1220 class_T *extends_cl,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1221 garray_T *classfunctions_gap,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1222 garray_T *objmethods_gap)
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 // 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	1225 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	1226 {
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1227 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	1228 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	1229 : &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	1230 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	1231 : &cl->class_obj_methods;
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 int parent_count = 0;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1234 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	1235 // 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	1236 // 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	1237 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	1238 ? 0
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1239 : 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	1240
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1241 *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	1242 if (*fcount == 0)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1243 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1244 *fup = NULL;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1245 continue;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1246 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1247 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	1248 if (*fup == NULL)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1249 return FAIL;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1250
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1251 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	1252 mch_memmove(fup, gap->ga_data, sizeof(ufunc_T ) * gap->ga_len);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1253 vim_free(gap->ga_data);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1254 if (loop == 1)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1255 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	1256 else
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1257 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	1258
33268 e231b9af0f44 patch 9.0.1902: Vim9: Coverity complains about dead code Christian Brabandt <cb@256bit.org> parents: 33260 diff changeset	1259 if (loop == 2)
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1260 {
33268 e231b9af0f44 patch 9.0.1902: Vim9: Coverity complains about dead code Christian Brabandt <cb@256bit.org> parents: 33260 diff changeset	1261 // 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	1262
e231b9af0f44 patch 9.0.1902: Vim9: Coverity complains about dead code Christian Brabandt <cb@256bit.org> parents: 33260 diff changeset	1263 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	1264 {
33268 e231b9af0f44 patch 9.0.1902: Vim9: Coverity complains about dead code Christian Brabandt <cb@256bit.org> parents: 33260 diff changeset	1265 // 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	1266 // 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	1267 // 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	1268 // 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	1269 // 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	1270 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	1271 (*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	1272
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1273 // 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	1274 // 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	1275 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	1276 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	1277 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1278 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	1279 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	1280 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	1281 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1282 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	1283 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	1284 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	1285 (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	1286 TRUE, where);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1287 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1288 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1289 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1290 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1291
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1292 // 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	1293 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	1294 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1295 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	1296 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	1297 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	1298 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	1299 if (loop == 2)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1300 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	1301 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1302 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1303
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1304 return OK;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1305 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1306
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1307 /*
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1308 * Handle ":class" and ":abstract class" up to ":endclass".
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1309 * Handle ":interface" up to ":endinterface".
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1310 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1311 void
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1312 ex_class(exarg_T *eap)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1313 {
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1314 int is_class = eap->cmdidx == CMD_class; // FALSE for :interface
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1315 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	1316 char_u *arg = eap->arg;
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1317 int is_abstract = eap->cmdidx == CMD_abstract;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1318
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1319 if (is_abstract)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1320 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1321 if (STRNCMP(arg, "class", 5) != 0 \|\| !VIM_ISWHITE(arg[5]))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1322 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1323 semsg(_(e_invalid_argument_str), arg);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1324 return;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1325 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1326 arg = skipwhite(arg + 5);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1327 is_class = TRUE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1328 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1329
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1330 if (!current_script_is_vim9()
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1331 \|\| (cmdmod.cmod_flags & CMOD_LEGACY)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1332 \|\| !getline_equal(eap->getline, eap->cookie, getsourceline))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1333 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1334 if (is_class)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1335 emsg(_(e_class_can_only_be_defined_in_vim9_script));
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1336 else
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1337 emsg(_(e_interface_can_only_be_defined_in_vim9_script));
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1338 return;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1339 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1340
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1341 if (!ASCII_ISUPPER(*arg))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1342 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1343 if (is_class)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1344 semsg(_(e_class_name_must_start_with_uppercase_letter_str), arg);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1345 else
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1346 semsg(_(e_interface_name_must_start_with_uppercase_letter_str),
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1347 arg);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1348 return;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1349 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1350 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	1351 if (!IS_WHITE_OR_NUL(*name_end))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1352 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1353 semsg(_(e_white_space_required_after_name_str), arg);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1354 return;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1355 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1356 char_u *name_start = arg;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1357
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1358 // "export class" gets used when creating the class, don't use "is_export"
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1359 // for the items inside the class.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1360 int class_export = is_export;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1361 is_export = FALSE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1362
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1363 // TODO:
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1364 // generics: <Tkey, Tentry>
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1365
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1366 // Name for "extends BaseClass"
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1367 char_u *extends = NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1368
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1369 // Names for "implements SomeInterface"
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1370 garray_T ga_impl;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1371 ga_init2(&ga_impl, sizeof(char_u *), 5);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1372
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1373 arg = skipwhite(name_end);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1374 while (arg != NUL && arg != '#' && *arg != '\n')
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1375 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1376 // TODO:
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1377 // specifies SomeInterface
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1378 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	1379 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1380 if (extends != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1381 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1382 emsg(_(e_duplicate_extends));
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1383 goto early_ret;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1384 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1385 arg = skipwhite(arg + 7);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1386 char_u *end = find_name_end(arg, NULL, NULL, FNE_CHECK_START);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1387 if (!IS_WHITE_OR_NUL(*end))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1388 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1389 semsg(_(e_white_space_required_after_name_str), arg);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1390 goto early_ret;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1391 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1392 extends = vim_strnsave(arg, end - arg);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1393 if (extends == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1394 goto early_ret;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1395
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1396 arg = skipwhite(end + 1);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1397 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1398 else if (STRNCMP(arg, "implements", 10) == 0
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1399 && IS_WHITE_OR_NUL(arg[10]))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1400 {
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1401 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	1402 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1403 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	1404 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	1405 }
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1406
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1407 if (ga_impl.ga_len > 0)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1408 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1409 emsg(_(e_duplicate_implements));
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1410 goto early_ret;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1411 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1412 arg = skipwhite(arg + 10);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1413
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1414 for (;;)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1415 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1416 char_u *impl_end = find_name_end(arg, NULL, NULL,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1417 FNE_CHECK_START);
33372 3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	1418 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	1419 \|\| (*impl_end == ','
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	1420 && !IS_WHITE_OR_NUL(*(impl_end + 1))))
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1421 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1422 semsg(_(e_white_space_required_after_name_str), arg);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1423 goto early_ret;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1424 }
33372 3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	1425 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	1426 {
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	1427 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	1428 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	1429 }
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	1430
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1431 char_u *iname = vim_strnsave(arg, impl_end - arg);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1432 if (iname == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1433 goto early_ret;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1434 for (int i = 0; i < ga_impl.ga_len; ++i)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1435 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	1436 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1437 semsg(_(e_duplicate_interface_after_implements_str),
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1438 iname);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1439 vim_free(iname);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1440 goto early_ret;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1441 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1442 if (ga_add_string(&ga_impl, iname) == FAIL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1443 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1444 vim_free(iname);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1445 goto early_ret;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1446 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1447 if (*impl_end != ',')
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1448 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1449 arg = skipwhite(impl_end);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1450 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1451 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1452 arg = skipwhite(impl_end + 1);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1453 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1454 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1455 else
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1456 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1457 semsg(_(e_trailing_characters_str), arg);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1458 early_ret:
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1459 vim_free(extends);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1460 ga_clear_strings(&ga_impl);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1461 return;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1462 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1463 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1464
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1465 garray_T type_list; // list of pointers to allocated types
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1466 ga_init2(&type_list, sizeof(type_T *), 10);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1467
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1468 // Growarray with class members declared in the class.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1469 garray_T classmembers;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1470 ga_init2(&classmembers, sizeof(ocmember_T), 10);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1471
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1472 // Growarray with functions declared in the class.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1473 garray_T classfunctions;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1474 ga_init2(&classfunctions, sizeof(ufunc_T *), 10);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1475
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1476 // Growarray with object members declared in the class.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1477 garray_T objmembers;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1478 ga_init2(&objmembers, sizeof(ocmember_T), 10);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1479
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1480 // Growarray with object methods declared in the class.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1481 garray_T objmethods;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1482 ga_init2(&objmethods, sizeof(ufunc_T *), 10);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1483
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1484 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1485 * Go over the body of the class/interface until "endclass" or
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1486 * "endinterface" is found.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1487 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1488 char_u *theline = NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1489 int success = FALSE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1490 for (;;)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1491 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1492 vim_free(theline);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1493 theline = eap->getline(':', eap->cookie, 0, GETLINE_CONCAT_ALL);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1494 if (theline == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1495 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1496 char_u *line = skipwhite(theline);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1497
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1498 // Skip empty and comment lines.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1499 if (*line == NUL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1500 continue;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1501 if (*line == '#')
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1502 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1503 if (vim9_bad_comment(line))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1504 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1505 continue;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1506 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1507
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1508 char_u *p = line;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1509 char *end_name = is_class ? "endclass" : "endinterface";
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1510 if (checkforcmd(&p, end_name, is_class ? 4 : 5))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1511 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1512 if (STRNCMP(line, end_name, is_class ? 8 : 12) != 0)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1513 semsg(_(e_command_cannot_be_shortened_str), line);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1514 else if (*p == '\|' \|\| !ends_excmd2(line, p))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1515 semsg(_(e_trailing_characters_str), p);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1516 else
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1517 success = TRUE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1518 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1519 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1520 char *wrong_name = is_class ? "endinterface" : "endclass";
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1521 if (checkforcmd(&p, wrong_name, is_class ? 5 : 4))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1522 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1523 semsg(_(e_invalid_command_str_expected_str), line, end_name);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1524 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1525 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1526
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1527 int has_public = FALSE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1528 if (checkforcmd(&p, "public", 3))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1529 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1530 if (STRNCMP(line, "public", 6) != 0)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1531 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1532 semsg(_(e_command_cannot_be_shortened_str), line);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1533 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1534 }
33372 3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	1535 if (!is_class)
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	1536 {
33385 b5ad84fdc702 patch 9.0.1951: Vim9: hard to debug vim9_class errors from CI Christian Brabandt <cb@256bit.org> parents: 33381 diff changeset	1537 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	1538 break;
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	1539 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1540 has_public = TRUE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1541 p = skipwhite(line + 6);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1542
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1543 if (STRNCMP(p, "this", 4) != 0 && STRNCMP(p, "static", 6) != 0)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1544 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1545 emsg(_(e_public_must_be_followed_by_this_or_static));
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1546 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1547 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1548 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1549
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1550 int abstract_method = FALSE;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1551 char_u *pa = p;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1552 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	1553 {
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1554 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	1555 {
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1556 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	1557 break;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1558 }
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1559
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1560 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	1561 // ignore "abstract" in an interface (as all the methods in an
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1562 // interface are abstract.
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1563 p = skipwhite(pa + 8);
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1564 else
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1565 {
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1566 if (!is_abstract)
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1567 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1568 semsg(_(e_abstract_method_in_concrete_class), pa);
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1569 break;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1570 }
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1571
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1572 abstract_method = TRUE;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1573 p = skipwhite(pa + 8);
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1574 if (STRNCMP(p, "def", 3) != 0 && STRNCMP(p, "static", 6) != 0)
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1575 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1576 emsg(_(e_abstract_must_be_followed_by_def_or_static));
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1577 break;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1578 }
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1579 }
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1580 }
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1581
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1582 int has_static = FALSE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1583 char_u *ps = p;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1584 if (checkforcmd(&p, "static", 4))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1585 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1586 if (STRNCMP(ps, "static", 6) != 0)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1587 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1588 semsg(_(e_command_cannot_be_shortened_str), ps);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1589 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1590 }
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1591
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1592 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	1593 {
33286 0c3553cfe22e patch 9.0.1909: Vim9: problem calling class method from other class Christian Brabandt <cb@256bit.org> parents: 33278 diff changeset	1594 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	1595 break;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1596 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1597 has_static = TRUE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1598 p = skipwhite(ps + 6);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1599 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1600
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1601 // object members (public, read access, private):
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1602 // "this._varname"
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1603 // "this.varname"
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1604 // "public this.varname"
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1605 if (STRNCMP(p, "this", 4) == 0)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1606 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1607 if (p[4] != '.' \|\| !eval_isnamec1(p[5]))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1608 {
33343 41b50abddeea patch 9.0.1935: Vim9: not consistent error messages Christian Brabandt <cb@256bit.org> parents: 33326 diff changeset	1609 semsg(_(e_invalid_object_variable_declaration_str), p);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1610 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1611 }
33047 9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	1612 if (has_static)
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	1613 {
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	1614 emsg(_(e_static_cannot_be_followed_by_this));
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	1615 break;
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	1616 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1617 char_u *varname = p + 5;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1618 char_u *varname_end = NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1619 type_T *type = NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1620 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	1621 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	1622
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1623 if (!is_class && *varname == '_')
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1624 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1625 // private variables are not supported in an interface
33286 0c3553cfe22e patch 9.0.1909: Vim9: problem calling class method from other class Christian Brabandt <cb@256bit.org> parents: 33278 diff changeset	1626 semsg(_(e_private_variable_not_supported_in_interface),
0c3553cfe22e patch 9.0.1909: Vim9: problem calling class method from other class Christian Brabandt <cb@256bit.org> parents: 33278 diff changeset	1627 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	1628 break;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1629 }
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1630
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1631 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	1632 &varname_end, &has_type, &type_list, &type,
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1633 is_class ? &init_expr: NULL) == FAIL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1634 break;
33381 17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	1635 if (is_reserved_varname(varname, varname_end))
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	1636 {
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	1637 vim_free(init_expr);
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	1638 break;
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	1639 }
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	1640 if (is_duplicate_variable(&classmembers, &objmembers, varname,
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	1641 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	1642 {
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	1643 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	1644 break;
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	1645 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1646 if (add_member(&objmembers, varname, varname_end,
33446 508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	1647 has_public, has_type, type, init_expr) == FAIL)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1648 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1649 vim_free(init_expr);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1650 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1651 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1652 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1653
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1654 // constructors:
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1655 // def new()
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1656 // enddef
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1657 // def newOther()
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1658 // enddef
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1659 // object methods and class functions:
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1660 // def SomeMethod()
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1661 // enddef
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1662 // static def ClassFunction()
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1663 // enddef
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1664 // TODO:
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1665 // def <Tval> someMethod()
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1666 // enddef
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1667 else if (checkforcmd(&p, "def", 3))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1668 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1669 exarg_T ea;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1670 garray_T lines_to_free;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1671
33372 3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	1672 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	1673 {
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	1674 // "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	1675 // class method
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	1676 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	1677 break;
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	1678 }
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	1679
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	1680 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	1681 {
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	1682 // 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	1683 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	1684 break;
3e9a91624b40 patch 9.0.1945: Vim9: missing support for ro-vars in interface Christian Brabandt <cb@256bit.org> parents: 33343 diff changeset	1685 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1686
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1687 CLEAR_FIELD(ea);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1688 ea.cmd = line;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1689 ea.arg = p;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1690 ea.cmdidx = CMD_def;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1691 ea.getline = eap->getline;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1692 ea.cookie = eap->cookie;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1693
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1694 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	1695 int class_flags;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1696 if (is_class)
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1697 class_flags = abstract_method ? CF_ABSTRACT_METHOD : CF_CLASS;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1698 else
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1699 class_flags = CF_INTERFACE;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1700 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	1701 class_flags, objmembers.ga_data, objmembers.ga_len);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1702 ga_clear_strings(&lines_to_free);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1703
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1704 if (uf != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1705 {
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1706 char_u *name = uf->uf_name;
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1707 int is_new = STRNCMP(name, "new", 3) == 0;
33068 d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	1708
33278 b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1709 if (!is_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	1710 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1711 // private variables are not supported in an interface
33286 0c3553cfe22e patch 9.0.1909: Vim9: problem calling class method from other class Christian Brabandt <cb@256bit.org> parents: 33278 diff changeset	1712 semsg(_(e_private_method_not_supported_in_interface),
0c3553cfe22e patch 9.0.1909: Vim9: problem calling class method from other class Christian Brabandt <cb@256bit.org> parents: 33278 diff changeset	1713 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	1714 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	1715 break;
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1716 }
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1717 if (is_new && !is_valid_constructor(uf, is_abstract,
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1718 has_static))
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1719 {
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	1720 func_clear_free(uf, FALSE);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1721 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1722 }
33068 d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	1723
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1724 // 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	1725 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	1726 {
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	1727 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	1728 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	1729 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	1730 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1731
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	1732 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	1733 ? &classfunctions : &objmethods;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1734 if (ga_grow(fgap, 1) == OK)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1735 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1736 if (is_new)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1737 uf->uf_flags \|= FC_NEW;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1738
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1739 if (abstract_method)
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1740 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	1741
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1742 ((ufunc_T **)fgap->ga_data)[fgap->ga_len] = uf;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1743 ++fgap->ga_len;
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 }
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
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1748 // class members
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1749 else if (has_static)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1750 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1751 // class members (public, read access, private):
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1752 // "static _varname"
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1753 // "static varname"
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1754 // "public static varname"
33446 508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	1755 char_u *varname = p;
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	1756 char_u *varname_end = NULL;
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	1757 int has_type = FALSE;
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	1758 type_T *type = NULL;
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	1759 char_u *init_expr = NULL;
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	1760
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1761 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	1762 &varname_end, &has_type, &type_list, &type,
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1763 is_class ? &init_expr : NULL) == FAIL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1764 break;
33381 17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	1765 if (is_reserved_varname(varname, varname_end))
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	1766 {
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	1767 vim_free(init_expr);
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	1768 break;
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	1769 }
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	1770 if (is_duplicate_variable(&classmembers, &objmembers, varname,
17301c641749 patch 9.0.1949: Vim9: allows reserved keywords as members Christian Brabandt <cb@256bit.org> parents: 33372 diff changeset	1771 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	1772 {
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	1773 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	1774 break;
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	1775 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1776 if (add_member(&classmembers, varname, varname_end,
33446 508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	1777 has_public, has_type, type, init_expr) == FAIL)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1778 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1779 vim_free(init_expr);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1780 break;
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 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1783
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1784 else
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1785 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1786 if (is_class)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1787 semsg(_(e_not_valid_command_in_class_str), line);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1788 else
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1789 semsg(_(e_not_valid_command_in_interface_str), line);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1790 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1791 }
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 vim_free(theline);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1794
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1795 class_T *extends_cl = NULL; // class from "extends" argument
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1796
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1797 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1798 * Check a few things before defining the class.
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
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1801 // Check the "extends" class is valid.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1802 if (success && extends != 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	1803 success = validate_extends_class(extends, &extends_cl, is_class);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1804 VIM_CLEAR(extends);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1805
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	1806 // 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	1807 // 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	1808 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	1809 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	1810
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	1811 // 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	1812 // 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	1813 // 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	1814 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	1815 {
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1816 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	1817 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	1818 else
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	1819 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	1820 }
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	1821
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1822 // 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	1823 // 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	1824 // 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	1825 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	1826 && (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	1827 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	1828 &objmethods, extends_cl);
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1829
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1830 class_T **intf_classes = NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1831
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1832 // Check all "implements" entries are valid.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1833 if (success && ga_impl.ga_len > 0)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1834 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1835 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	1836
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1837 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	1838 &objmethods, &objmembers, extends_cl);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1839 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1840
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1841 // 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	1842 if (success)
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1843 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	1844 &classmembers);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1845
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1846 class_T *cl = NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1847 if (success)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1848 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1849 // "endclass" encountered without failures: Create the class.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1850
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1851 cl = ALLOC_CLEAR_ONE(class_T);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1852 if (cl == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1853 goto cleanup;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1854 if (!is_class)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1855 cl->class_flags = CLASS_INTERFACE;
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1856 else if (is_abstract)
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1857 cl->class_flags = CLASS_ABSTRACT;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1858
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1859 cl->class_refcount = 1;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1860 cl->class_name = vim_strnsave(name_start, name_end - name_start);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1861 if (cl->class_name == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1862 goto cleanup;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1863
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1864 if (extends_cl != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1865 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1866 cl->class_extends = extends_cl;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1867 extends_cl->class_flags \|= CLASS_EXTENDED;
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
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	1870 // Add class and object variables to "cl".
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1871 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	1872 NULL,
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	1873 0,
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1874 &cl->class_class_members,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1875 &cl->class_class_member_count) == FAIL
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1876 \|\| add_members_to_class(&objmembers,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1877 extends_cl == NULL ? NULL
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1878 : extends_cl->class_obj_members,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1879 extends_cl == NULL ? 0
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1880 : extends_cl->class_obj_member_count,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1881 &cl->class_obj_members,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1882 &cl->class_obj_member_count) == FAIL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1883 goto cleanup;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1884
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1885 if (ga_impl.ga_len > 0)
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 // Move the "implements" names into the class.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1888 cl->class_interface_count = ga_impl.ga_len;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1889 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	1890 if (cl->class_interfaces == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1891 goto cleanup;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1892 for (int i = 0; i < ga_impl.ga_len; ++i)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1893 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	1894 VIM_CLEAR(ga_impl.ga_data);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1895 ga_impl.ga_len = 0;
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 cl->class_interfaces_cl = intf_classes;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1898 intf_classes = NULL;
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
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1901 if (cl->class_interface_count > 0 \|\| extends_cl != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1902 {
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1903 // 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	1904 // classes.
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1905 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	1906 goto cleanup;
32670 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
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1909 // Allocate a typval for each class member and initialize it.
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1910 if (is_class && cl->class_class_member_count > 0)
33471 baa62f464436 patch 9.0.1988: Vim9: potential use-after-free for class members Christian Brabandt <cb@256bit.org> parents: 33456 diff changeset	1911 add_class_members(cl, eap, &type_list);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1912
32903 54c01bb98b8e patch 9.0.1760: vim9 class problem with new() constructor Christian Brabandt <cb@256bit.org> parents: 32896 diff changeset	1913 int have_new = FALSE;
54c01bb98b8e patch 9.0.1760: vim9 class problem with new() constructor Christian Brabandt <cb@256bit.org> parents: 32896 diff changeset	1914 ufunc_T *class_func = NULL;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1915 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	1916 {
54c01bb98b8e patch 9.0.1760: vim9 class problem with new() constructor Christian Brabandt <cb@256bit.org> parents: 32896 diff changeset	1917 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	1918 if (STRCMP(class_func->uf_name, "new") == 0)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1919 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1920 have_new = TRUE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1921 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1922 }
32903 54c01bb98b8e patch 9.0.1760: vim9 class problem with new() constructor Christian Brabandt <cb@256bit.org> parents: 32896 diff changeset	1923 }
54c01bb98b8e patch 9.0.1760: vim9 class problem with new() constructor Christian Brabandt <cb@256bit.org> parents: 32896 diff changeset	1924
54c01bb98b8e patch 9.0.1760: vim9 class problem with new() constructor Christian Brabandt <cb@256bit.org> parents: 32896 diff changeset	1925 if (have_new)
54c01bb98b8e patch 9.0.1760: vim9 class problem with new() constructor Christian Brabandt <cb@256bit.org> parents: 32896 diff changeset	1926 // 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	1927 class_func->uf_ret_type->tt_class = cl;
54c01bb98b8e patch 9.0.1760: vim9 class problem with new() constructor Christian Brabandt <cb@256bit.org> parents: 32896 diff changeset	1928 else if (is_class && !is_abstract && !have_new)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1929 // 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	1930 add_default_constructor(cl, &classfunctions, &type_list);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1931
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1932 // 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	1933 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	1934 &objmethods) == FAIL)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1935 goto cleanup;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1936
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1937 cl->class_type.tt_type = VAR_CLASS;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1938 cl->class_type.tt_class = cl;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1939 cl->class_object_type.tt_type = VAR_OBJECT;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1940 cl->class_object_type.tt_class = cl;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1941 cl->class_type_list = type_list;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1942
33160 4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	1943 class_created(cl);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	1944
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1945 // TODO:
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1946 // - Fill hashtab with object members and methods ?
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1947
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1948 // Add the class to the script-local variables.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1949 // TODO: handle other context, e.g. in a function
33119 bede81965821 patch 9.0.1842: Need more accurate profiling Christian Brabandt <cb@256bit.org> parents: 33109 diff changeset	1950 // TODO: does uf_hash need to be cleared?
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1951 typval_T tv;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1952 tv.v_type = VAR_CLASS;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1953 tv.vval.v_class = cl;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1954 is_export = class_export;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1955 SOURCING_LNUM = start_lnum;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1956 set_var_const(cl->class_name, current_sctx.sc_sid,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1957 NULL, &tv, FALSE, 0, 0);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1958 return;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1959 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1960
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1961 cleanup:
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1962 if (cl != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1963 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1964 vim_free(cl->class_name);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1965 vim_free(cl->class_class_functions);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1966 if (cl->class_interfaces != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1967 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1968 for (int i = 0; i < cl->class_interface_count; ++i)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1969 vim_free(cl->class_interfaces[i]);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1970 vim_free(cl->class_interfaces);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1971 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1972 if (cl->class_interfaces_cl != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1973 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1974 for (int i = 0; i < cl->class_interface_count; ++i)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1975 class_unref(cl->class_interfaces_cl[i]);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1976 vim_free(cl->class_interfaces_cl);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1977 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1978 vim_free(cl->class_obj_members);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1979 vim_free(cl->class_obj_methods);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1980 vim_free(cl);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1981 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1982
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1983 vim_free(extends);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1984 class_unref(extends_cl);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1985
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1986 if (intf_classes != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1987 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1988 for (int i = 0; i < ga_impl.ga_len; ++i)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1989 class_unref(intf_classes[i]);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1990 vim_free(intf_classes);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1991 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1992 ga_clear_strings(&ga_impl);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1993
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1994 for (int round = 1; round <= 2; ++round)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1995 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1996 garray_T *gap = round == 1 ? &classmembers : &objmembers;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1997 if (gap->ga_len == 0 \|\| gap->ga_data == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1998 continue;
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 for (int i = 0; i < gap->ga_len; ++i)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2001 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2002 ocmember_T m = ((ocmember_T )gap->ga_data) + i;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2003 vim_free(m->ocm_name);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2004 vim_free(m->ocm_init);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2005 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2006 ga_clear(gap);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2007 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2008
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2009 for (int i = 0; i < objmethods.ga_len; ++i)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2010 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2011 ufunc_T uf = ((ufunc_T *)objmethods.ga_data)[i];
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2012 func_clear_free(uf, FALSE);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2013 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2014 ga_clear(&objmethods);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2015
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2016 for (int i = 0; i < classfunctions.ga_len; ++i)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2017 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2018 ufunc_T uf = ((ufunc_T *)classfunctions.ga_data)[i];
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2019 func_clear_free(uf, FALSE);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2020 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2021 ga_clear(&classfunctions);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2022
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2023 clear_type_list(&type_list);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2024 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2025
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2026 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2027 * 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	2028 * 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	2029 * 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	2030 * class members.
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2031 * 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	2032 * Set *p_m ocmmember_T if not NULL
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2033 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2034 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	2035 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	2036 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	2037 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	2038 char_u *name,
667a17904f64 patch 9.0.1829: Vim9 missing access-checks for private vars Christian Brabandt <cb@256bit.org> parents: 33070 diff changeset	2039 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	2040 int *member_idx)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2041 {
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2042 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	2043 ocmember_T *m;
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2044
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2045 *member_idx = -1; // not found (yet)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2046
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2047 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	2048 member_idx);
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2049 if (m == NULL)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2050 {
33286 0c3553cfe22e patch 9.0.1909: Vim9: problem calling class method from other class Christian Brabandt <cb@256bit.org> parents: 33278 diff changeset	2051 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	2052 len);
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2053 return &t_any;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2054 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2055
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2056 return m->ocm_type;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2057 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2058
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2059 /*
33446 508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2060 * 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	2061 */
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2062 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	2063 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	2064 class_T *cl,
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2065 int is_object,
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2066 int member_idx)
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2067 {
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2068 ocmember_T *m;
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2069 int member_count;
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2070
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2071 if (is_object)
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2072 {
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2073 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	2074 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	2075 }
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2076 else
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2077 {
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2078 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	2079 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	2080 }
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2081
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2082 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	2083 return NULL;
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2084
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2085 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	2086 }
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2087
508dfc0c261c patch 9.0.1977: Vim9: object members can change type Christian Brabandt <cb@256bit.org> parents: 33432 diff changeset	2088 /*
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2089 * Handle ":enum" up to ":endenum".
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2090 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2091 void
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2092 ex_enum(exarg_T *eap UNUSED)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2093 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2094 // TODO
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2095 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2096
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2097 /*
33678 7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2098 * Type aliases (:type)
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2099 */
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2100
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2101 void
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2102 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	2103 {
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2104 // 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	2105 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	2106 vim_free(ta);
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2107 }
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2108
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2109 void
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2110 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	2111 {
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2112 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	2113 typealias_free(ta);
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2114 }
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2115
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2116 /*
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2117 * Handle ":type". Create an alias for a type specification.
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2118 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2119 void
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2120 ex_type(exarg_T *eap UNUSED)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2121 {
33678 7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2122 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	2123
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2124 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	2125 \|\| (cmdmod.cmod_flags & CMOD_LEGACY)
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2126 \|\| !getline_equal(eap->getline, eap->cookie, getsourceline))
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2127 {
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2128 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	2129 return;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2130 }
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2131
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2132 if (*arg == NUL)
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2133 {
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2134 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	2135 return;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2136 }
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2137
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2138 if (!ASCII_ISUPPER(*arg))
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2139 {
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2140 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	2141 return;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2142 }
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2143
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2144 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	2145 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	2146 {
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2147 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	2148 return;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2149 }
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2150 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	2151
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2152 arg = skipwhite(name_end);
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2153 if (*arg != '=')
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2154 {
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2155 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	2156 return;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2157 }
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2158 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	2159 {
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2160 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	2161 return;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2162 }
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2163 arg++;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2164 arg = skipwhite(arg);
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2165
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2166 if (*arg == NUL)
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2167 {
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2168 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	2169 return;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2170 }
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2171
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2172 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	2173 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	2174 if (type == NULL)
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2175 return;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2176
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2177 if (*arg != NUL)
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2178 {
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2179 // 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	2180 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	2181 return;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2182 }
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2183
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2184 int cc = *name_end;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2185 *name_end = NUL;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2186
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2187 typval_T tv;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2188 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	2189 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	2190 {
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2191 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	2192 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	2193 else
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2194 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	2195 clear_tv(&tv);
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2196 goto done;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2197 }
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2198
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2199 // Add the user-defined type to the script-local variables.
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2200 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	2201 tv.v_lock = 0;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2202 tv.vval.v_typealias = ALLOC_CLEAR_ONE(typealias_T);
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2203 ++tv.vval.v_typealias->ta_refcount;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2204 tv.vval.v_typealias->ta_name = vim_strsave(name_start);
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2205 tv.vval.v_typealias->ta_type = type;
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2206 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	2207 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	2208
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2209 done:
7d9d2404a3d4 patch 9.0.2076: Vim9: No support for type aliases Christian Brabandt <cb@256bit.org> parents: 33636 diff changeset	2210 *name_end = cc;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2211 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2212
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2213 /*
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2214 * 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	2215 * 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	2216 * "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	2217 * 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	2218 */
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2219 static int
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2220 get_member_tv(
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2221 class_T *cl,
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2222 int is_object,
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2223 char_u *name,
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2224 size_t namelen,
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2225 typval_T *rettv)
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2226 {
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2227 ocmember_T *m;
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2228 int m_idx;
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2229
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2230 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	2231 &m_idx);
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2232 if (m == NULL)
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2233 return FAIL;
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2234
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2235 if (*name == '_')
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2236 {
33498 bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	2237 emsg_var_cl_define(e_cannot_access_private_variable_str,
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	2238 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	2239 return FAIL;
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2240 }
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2241
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2242 if (is_object)
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2243 {
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2244 // 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	2245 // 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	2246 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	2247 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	2248 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	2249 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	2250 }
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2251 else
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2252 {
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2253 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	2254 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	2255 }
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2256
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2257 return OK;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2258 }
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2259
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2260 /*
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2261 * 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	2262 * 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	2263 */
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2264 static int
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2265 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	2266 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	2267 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	2268 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	2269 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	2270 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	2271 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	2272 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	2273 {
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2274 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	2275 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	2276 int argcount = 0;
33540 86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2277 ocmember_T *ocm = NULL;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2278 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	2279
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2280 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	2281 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	2282 {
33540 86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2283 // 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	2284 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	2285 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	2286 {
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2287 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	2288 return FAIL;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2289 }
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2290
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2291 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	2292 {
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2293 // funcref object variable
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2294 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	2295 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	2296 copy_tv(tv, rettv);
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2297 }
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2298 else
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2299 // funcref class variable
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2300 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	2301 *arg = name_end;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2302 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	2303 }
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2304
33540 86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2305 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	2306 {
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2307 // Cannot access a private method outside 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	2308 semsg(_(e_cannot_access_private_method_str), fp->uf_name);
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2309 return FAIL;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2310 }
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2311
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2312 char_u *argp = name_end;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2313 int ret = get_func_arguments(&argp, evalarg, 0, argvars, &argcount);
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2314 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	2315 return FAIL;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2316
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2317 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	2318 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	2319 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	2320 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	2321 {
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2322 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	2323 ++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	2324 }
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2325
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2326 // 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	2327 // 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	2328 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	2329 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	2330
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2331 // 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	2332 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	2333 NULL);
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2334
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2335 // 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	2336 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	2337 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	2338 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	2339
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2340 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	2341 {
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2342 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	2343 return FAIL;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2344 }
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2345 *arg = argp;
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2346
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2347 return OK;
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2348 }
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2349
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2350 /*
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2351 * Evaluate what comes after a class:
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2352 * - class member: SomeClass.varname
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2353 * - class function: SomeClass.SomeMethod()
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2354 * - class constructor: SomeClass.new()
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2355 * - object member: someObject.varname
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2356 * - object method: someObject.SomeMethod()
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 * "*arg" points to the '.'.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2359 * "*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	2360 *
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2361 * Returns FAIL or OK.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2362 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2363 int
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2364 class_object_index(
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2365 char_u **arg,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2366 typval_T *rettv,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2367 evalarg_T *evalarg,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2368 int verbose UNUSED) // give error messages
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2369 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2370 if (VIM_ISWHITE((*arg)[1]))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2371 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2372 semsg(_(e_no_white_space_allowed_after_str_str), ".", *arg);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2373 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2374 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2375
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2376 ++*arg;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2377 char_u name = arg;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2378 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	2379 if (name_end == name)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2380 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2381 size_t len = name_end - name;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2382
33473 156d07bea2ac patch 9.0.1989: Vim9: double error message given Christian Brabandt <cb@256bit.org> parents: 33471 diff changeset	2383 int did_emsg_save = did_emsg;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2384 class_T *cl;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2385 if (rettv->v_type == VAR_CLASS)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2386 cl = rettv->vval.v_class;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2387 else // VAR_OBJECT
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2388 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2389 if (rettv->vval.v_object == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2390 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2391 emsg(_(e_using_null_object));
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2392 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2393 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2394 cl = rettv->vval.v_object->obj_class;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2395 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2396
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2397 if (cl == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2398 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2399 emsg(_(e_incomplete_type));
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2400 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2401 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2402
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2403 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	2404 // 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	2405 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	2406
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2407 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	2408 {
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2409 // 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	2410 // 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	2411 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	2412 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	2413 {
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2414 *arg = name_end;
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2415 return OK;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2416 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2417
33540 86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2418 // 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	2419 int fidx;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2420 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	2421 if (fp != NULL)
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2422 {
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2423 // 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	2424 if (*name == '_')
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2425 {
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2426 semsg(_(e_cannot_access_private_method_str), fp->uf_name);
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2427 return FAIL;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2428 }
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2429
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2430 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	2431 if (pt == NULL)
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2432 return FAIL;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2433
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2434 pt->pt_refcount = 1;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2435 if (is_object)
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2436 {
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2437 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	2438 ++pt->pt_obj->obj_refcount;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2439 }
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2440 pt->pt_auto = TRUE;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2441 pt->pt_func = fp;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2442 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	2443 rettv->v_type = VAR_PARTIAL;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2444 rettv->vval.v_partial = pt;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2445 *arg = name_end;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2446 return OK;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2447 }
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2448
33473 156d07bea2ac patch 9.0.1989: Vim9: double error message given Christian Brabandt <cb@256bit.org> parents: 33471 diff changeset	2449 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	2450 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	2451 }
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 return FAIL;
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
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2456 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2457 * 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	2458 * Otherwise return NULL.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2459 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2460 ufunc_T *
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2461 find_class_func(char_u **arg)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2462 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2463 char_u name = arg;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2464 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	2465 if (name_end == name \|\| *name_end != '.')
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2466 return NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2467
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2468 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	2469 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	2470 typval_T tv;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2471 tv.v_type = VAR_UNKNOWN;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2472 if (eval_variable(name, (int)len,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2473 0, &tv, NULL, EVAL_VAR_NOAUTOLOAD) == FAIL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2474 return NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2475 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	2476 goto fail_after_eval;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2477
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2478 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	2479 : tv.vval.v_object->obj_class;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2480 if (cl == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2481 goto fail_after_eval;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2482 char_u *fname = name_end + 1;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2483 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	2484 if (fname_end == fname)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2485 goto fail_after_eval;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2486 len = fname_end - fname;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2487
33246 877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2488 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	2489
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2490 fail_after_eval:
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2491 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	2492 return fp;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2493 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2494
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2495 /*
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	2496 * 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	2497 * 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	2498 * 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	2499 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2500 int
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2501 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	2502 {
33246 877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2503 int idx;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2504 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	2505 return idx;
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2506 }
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2507
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2508 /*
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2509 * 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	2510 * 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	2511 * 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	2512 */
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2513 ocmember_T *
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2514 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	2515 {
33246 877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2516 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	2517 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	2518 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	2519 {
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2520 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	2521 if (namelen)
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2522 {
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2523 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	2524 && 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	2525 {
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2526 ret_m = m;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2527 ret_idx = i;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2528 break;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2529 }
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2530 }
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2531 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	2532 {
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2533 ret_m = m;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2534 ret_idx = i;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2535 break;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2536 }
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2537 }
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2538 if (idx != NULL)
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2539 *idx = ret_idx;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2540 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	2541 }
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2542
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2543 /*
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2544 * 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	2545 * 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	2546 * 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	2547 */
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2548 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	2549 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	2550 {
33246 877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2551 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	2552 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	2553 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	2554 {
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2555 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	2556 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	2557 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	2558 {
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2559 ret_fp = fp;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2560 ret_idx = i;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2561 break;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2562 }
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2563 }
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2564 if (idx != NULL)
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2565 *idx = ret_idx;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2566 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	2567 }
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2568
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2569 /*
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2570 * 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	2571 * 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	2572 */
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2573 int
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2574 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	2575 {
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2576 int idx;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2577 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	2578 return idx;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2579 }
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2580
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2581 /*
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2582 * 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	2583 * 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	2584 * 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	2585 */
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2586 static int
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2587 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	2588 {
33246 877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2589 int idx;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2590 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	2591 return idx;
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2592 }
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2593
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2594 /*
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2595 * 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	2596 * 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	2597 * 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	2598 */
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2599 ocmember_T *
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2600 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	2601 {
33246 877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2602 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	2603 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	2604 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	2605 {
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2606 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	2607 if (namelen)
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2608 {
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2609 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	2610 && 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	2611 {
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2612 ret_m = m;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2613 ret_idx = i;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2614 break;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2615 }
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2616 }
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2617 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	2618 {
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2619 ret_m = m;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2620 ret_idx = i;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2621 break;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2622 }
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2623 }
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2624 if (idx != NULL)
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2625 *idx = ret_idx;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2626 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	2627 }
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2628
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2629 /*
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2630 * 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	2631 * 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	2632 * 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	2633 */
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2634 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	2635 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	2636 {
33246 877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2637 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	2638 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	2639 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	2640 {
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2641 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	2642 // 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	2643 // 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	2644 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	2645 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	2646 {
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2647 ret_fp = fp;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2648 ret_idx = i;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2649 break;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2650 }
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2651 }
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2652 if (idx != NULL)
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2653 *idx = ret_idx;
877dddec681f patch 9.0.1895: Vim9: finding object method/member is inefficient Christian Brabandt <cb@256bit.org> parents: 33233 diff changeset	2654 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	2655 }
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2656
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2657 /*
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2658 * 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	2659 * 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	2660 */
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2661 int
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2662 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	2663 {
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2664 int idx;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2665 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	2666 return idx;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2667 }
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2668
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2669 /*
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2670 * 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	2671 * 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	2672 * object member variable.
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2673 *
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2674 * 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	2675 * 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	2676 */
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2677 ocmember_T *
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2678 member_lookup(
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2679 class_T *cl,
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2680 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	2681 char_u *name,
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2682 size_t namelen,
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2683 int *idx)
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2684 {
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2685 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	2686 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	2687 else
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2688 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	2689 }
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2690
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2691 /*
33498 bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	2692 * 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	2693 * starting at "cl".
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	2694 *
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	2695 * 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	2696 * 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	2697 */
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	2698 // 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	2699 static class_T *
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	2700 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	2701 {
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	2702 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	2703 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	2704 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	2705
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	2706 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	2707
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	2708 // 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	2709 // 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	2710 // 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	2711 // 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	2712 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	2713 {
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	2714 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	2715 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	2716 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	2717 {
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	2718 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	2719 {
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	2720 cl_tmp = super;
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	2721 vartype = VAR_OBJECT;
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	2722 }
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	2723 }
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	2724 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	2725 {
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	2726 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	2727 {
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	2728 cl_tmp = super;
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	2729 vartype = VAR_OBJECT;
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	2730 }
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	2731 }
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	2732 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	2733 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	2734 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	2735 m_found = m;
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	2736 }
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	2737 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	2738 *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	2739 return cl_found;
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	2740 }
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	2741
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	2742 /*
33233 108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2743 * 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	2744 * 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	2745 *
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2746 * 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	2747 * 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	2748 */
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2749 ufunc_T *
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2750 method_lookup(
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2751 class_T *cl,
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2752 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	2753 char_u *name,
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2754 size_t namelen,
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2755 int *idx)
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2756 {
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2757 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	2758 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	2759 else
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2760 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	2761 }
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2762
108d890d887f patch 9.0.1890: Vim9: lookup code for class/object repaeated Christian Brabandt <cb@256bit.org> parents: 33227 diff changeset	2763 /*
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2764 * 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	2765 * Return FALSE if not.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2766 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2767 int
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2768 inside_class(cctx_T cctx_arg, class_T cl)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2769 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2770 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	2771 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	2772 && class_instance_of(cctx->ctx_ufunc->uf_class, cl))
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2773 return TRUE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2774 return FALSE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2775 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2776
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2777 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2778 * Make a copy of an object.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2779 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2780 void
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2781 copy_object(typval_T from, typval_T to)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2782 {
32960 d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	2783 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	2784 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	2785 else
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	2786 {
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	2787 to->vval.v_object = from->vval.v_object;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2788 ++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	2789 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2790 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2791
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2792 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2793 * Make a copy of a class.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2794 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2795 void
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2796 copy_class(typval_T from, typval_T to)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2797 {
32960 d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	2798 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	2799 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	2800 else
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	2801 {
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	2802 to->vval.v_class = from->vval.v_class;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2803 ++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	2804 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2805 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2806
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2807 /*
33160 4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2808 * 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	2809 */
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2810 static void
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2811 class_free(class_T *cl)
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2812 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2813 // 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	2814 // 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	2815 // be freed.
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2816 VIM_CLEAR(cl->class_name);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2817
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2818 class_unref(cl->class_extends);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2819
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2820 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	2821 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2822 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	2823 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	2824 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	2825 }
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2826 vim_free(cl->class_interfaces);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2827 vim_free(cl->class_interfaces_cl);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2828
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2829 itf2class_T *next;
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2830 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	2831 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2832 next = i2c->i2c_next;
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2833 vim_free(i2c);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2834 }
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2835
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2836 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	2837 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2838 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	2839 vim_free(m->ocm_name);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2840 vim_free(m->ocm_init);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2841 if (cl->class_members_tv != NULL)
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2842 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	2843 }
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2844 vim_free(cl->class_class_members);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2845 vim_free(cl->class_members_tv);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2846
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2847 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	2848 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2849 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	2850 vim_free(m->ocm_name);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2851 vim_free(m->ocm_init);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2852 }
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2853 vim_free(cl->class_obj_members);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2854
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2855 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	2856 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2857 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	2858 func_clear_free(uf, FALSE);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2859 }
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2860 vim_free(cl->class_class_functions);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2861
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2862 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	2863 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2864 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	2865 func_clear_free(uf, FALSE);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2866 }
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2867 vim_free(cl->class_obj_methods);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2868
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2869 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	2870
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2871 class_cleared(cl);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2872
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2873 vim_free(cl);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2874 }
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2875
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2876 /*
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2877 * 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	2878 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2879 void
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2880 class_unref(class_T *cl)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2881 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2882 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	2883 class_free(cl);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2884 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2885
33160 4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2886 /*
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2887 * 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	2888 */
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2889 int
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2890 class_free_nonref(int copyID)
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2891 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2892 int did_free = FALSE;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2893
33160 4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2894 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	2895 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2896 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	2897 if ((cl->class_copyID & COPYID_MASK) != (copyID & COPYID_MASK))
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2898 {
33160 4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2899 // 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	2900 class_free(cl);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2901 did_free = TRUE;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2902 }
33160 4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2903 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2904
33160 4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2905 next_nonref_class = NULL;
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2906 return did_free;
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2907 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2908
33160 4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2909 int
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2910 set_ref_in_classes(int copyID)
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2911 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2912 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	2913 set_ref_in_item_class(cl, copyID, NULL, NULL);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2914
33160 4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2915 return FALSE;
32670 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
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2918 static object_T *first_object = NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2919
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2920 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2921 * 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	2922 * list headed by "first_object".
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2923 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2924 void
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2925 object_created(object_T *obj)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2926 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2927 if (first_object != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2928 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2929 obj->obj_next_used = first_object;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2930 first_object->obj_prev_used = obj;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2931 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2932 first_object = obj;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2933 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2934
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 * 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	2937 * It is removed from the list headed by "first_object".
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2938 */
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2939 static void
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2940 object_cleared(object_T *obj)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2941 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2942 if (obj->obj_next_used != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2943 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	2944 if (obj->obj_prev_used != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2945 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	2946 else if (first_object == obj)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2947 first_object = obj->obj_next_used;
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 /*
33540 86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2951 * 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	2952 */
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2953 static void
33540 86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2954 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	2955 {
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2956 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	2957
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2958 if (!cl)
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2959 return;
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2960
33540 86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2961 // 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	2962 obj->obj_refcount = INT_MAX;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2963
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2964 // 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	2965 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	2966 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	2967 clear_tv(tv + i);
33540 86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2968 }
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 static void
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2971 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	2972 {
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2973 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	2974
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2975 if (!cl)
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2976 return;
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2977
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2978 // 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	2979 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	2980
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2981 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	2982 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	2983 }
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2984
33540 86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2985 static void
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2986 object_free(object_T *obj)
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2987 {
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2988 if (in_free_unref_items)
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2989 return;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2990
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2991 object_free_contents(obj);
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2992 object_free_object(obj);
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2993 }
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	2994
33506 f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2995 /*
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2996 * 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	2997 */
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2998 void
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	2999 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	3000 {
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3001 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	3002 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	3003 }
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3004
f61713271934 patch 9.0.2002: Vim9: need cleanup of class related interface code Christian Brabandt <cb@256bit.org> parents: 33498 diff changeset	3005 /*
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3006 * 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	3007 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3008 int
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3009 object_free_nonref(int copyID)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3010 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3011 int did_free = FALSE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3012
33540 86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3013 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	3014 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3015 if ((obj->obj_copyID & COPYID_MASK) != (copyID & COPYID_MASK))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3016 {
33540 86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3017 // 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	3018 object_free_contents(obj);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3019 did_free = TRUE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3020 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3021 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3022
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3023 return did_free;
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
33540 86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3026 void
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3027 object_free_items(int copyID)
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3028 {
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3029 object_T *obj_next;
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3030
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3031 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	3032 {
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3033 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	3034 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	3035 object_free_object(obj);
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3036 }
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3037 }
86dbcbb94fdb patch 9.0.2019: Vim9: no support for funcrefs Christian Brabandt <cb@256bit.org> parents: 33534 diff changeset	3038
32972 e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3039 /*
33498 bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3040 * 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	3041 * "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	3042 * 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	3043 */
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3044 void
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3045 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	3046 {
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3047 ocmember_T *m;
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3048 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	3049 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	3050 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	3051 else
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3052 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	3053 }
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3054
bff8ac203a22 patch 9.0.1999: Vim9: some error messages can be improved Christian Brabandt <cb@256bit.org> parents: 33473 diff changeset	3055 /*
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3056 * 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	3057 */
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3058 void
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3059 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	3060 {
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3061 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	3062 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	3063 && (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	3064 {
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3065 // 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	3066 if (*name == '_')
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3067 semsg(_(e_cannot_access_private_method_str), method_name);
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3068 else
33343 41b50abddeea patch 9.0.1935: Vim9: not consistent error messages Christian Brabandt <cb@256bit.org> parents: 33326 diff changeset	3069 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	3070 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	3071 }
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3072 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	3073 && (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	3074 {
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3075 // 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	3076 if (*name == '_')
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3077 semsg(_(e_cannot_access_private_method_str), method_name);
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3078 else
33343 41b50abddeea patch 9.0.1935: Vim9: not consistent error messages Christian Brabandt <cb@256bit.org> parents: 33326 diff changeset	3079 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	3080 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	3081 }
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3082 else
33627 41c64cb748c1 patch 9.0.2055: Vim9: non-consistent error messages Christian Brabandt <cb@256bit.org> parents: 33618 diff changeset	3083 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	3084 cl->class_name);
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3085 vim_free(method_name);
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3086 }
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3087
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3088 /*
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3089 * 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	3090 */
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3091 void
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3092 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	3093 {
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3094 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	3095
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3096 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	3097 {
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3098 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	3099 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	3100 varname, cl->class_name);
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3101 else
33627 41c64cb748c1 patch 9.0.2055: Vim9: non-consistent error messages Christian Brabandt <cb@256bit.org> parents: 33618 diff changeset	3102 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	3103 cl->class_name);
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3104 }
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3105 else
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3106 {
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3107 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	3108 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	3109 varname, cl->class_name);
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3110 else
33343 41b50abddeea patch 9.0.1935: Vim9: not consistent error messages Christian Brabandt <cb@256bit.org> parents: 33326 diff changeset	3111 semsg(_(e_class_variable_str_not_found_in_class_str),
33260 aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3112 varname, cl->class_name);
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3113 }
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3114 vim_free(varname);
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3115 }
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3116
aba1fa2b7d1e patch 9.0.1898: Vim9: restrict access to static vars Christian Brabandt <cb@256bit.org> parents: 33246 diff changeset	3117 /*
33006 29b2193466e0 patch 9.0.1795: Indentation issues Christian Brabandt <cb@256bit.org> parents: 32972 diff changeset	3118 * 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	3119 * 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	3120 */
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3121 int
33432 97ceabebaeaf patch 9.0.1974: vim9: using contra-variant type-checks Christian Brabandt <cb@256bit.org> parents: 33401 diff changeset	3122 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	3123 {
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3124 if (cl == other_cl)
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3125 return TRUE;
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3126
33432 97ceabebaeaf patch 9.0.1974: vim9: using contra-variant type-checks Christian Brabandt <cb@256bit.org> parents: 33401 diff changeset	3127 // 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	3128 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	3129 {
33432 97ceabebaeaf patch 9.0.1974: vim9: using contra-variant type-checks Christian Brabandt <cb@256bit.org> parents: 33401 diff changeset	3130 if (cl == other_cl)
97ceabebaeaf patch 9.0.1974: vim9: using contra-variant type-checks Christian Brabandt <cb@256bit.org> parents: 33401 diff changeset	3131 return TRUE;
97ceabebaeaf patch 9.0.1974: vim9: using contra-variant type-checks Christian Brabandt <cb@256bit.org> parents: 33401 diff changeset	3132 // 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	3133 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	3134 {
33432 97ceabebaeaf patch 9.0.1974: vim9: using contra-variant type-checks Christian Brabandt <cb@256bit.org> parents: 33401 diff changeset	3135 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	3136 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	3137 {
33432 97ceabebaeaf patch 9.0.1974: vim9: using contra-variant type-checks Christian Brabandt <cb@256bit.org> parents: 33401 diff changeset	3138 if (intf == other_cl)
97ceabebaeaf patch 9.0.1974: vim9: using contra-variant type-checks Christian Brabandt <cb@256bit.org> parents: 33401 diff changeset	3139 return TRUE;
97ceabebaeaf patch 9.0.1974: vim9: using contra-variant type-checks Christian Brabandt <cb@256bit.org> parents: 33401 diff changeset	3140 // check the super interfaces
97ceabebaeaf patch 9.0.1974: vim9: using contra-variant type-checks Christian Brabandt <cb@256bit.org> parents: 33401 diff changeset	3141 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	3142 }
b5ed566262d3 patch 9.0.1906: Vim9: Interfaces should not support class methods and variables Christian Brabandt <cb@256bit.org> parents: 33268 diff changeset	3143 }
32972 e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3144 }
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3145
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3146 return FALSE;
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3147 }
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3148
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3149 /*
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3150 * "instanceof(object, classinfo)" function
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3151 */
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3152 void
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3153 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	3154 {
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3155 typval_T *object_tv = &argvars[0];
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3156 typval_T *classinfo_tv = &argvars[1];
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3157 listitem_T *li;
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3158
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3159 rettv->vval.v_number = VVAL_FALSE;
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3160
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3161 if (check_for_object_arg(argvars, 0) == FAIL
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3162 \|\| check_for_class_or_list_arg(argvars, 1) == FAIL)
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3163 return;
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3164
33291 4cb421ba3385 patch 9.0.1911: Vim9: segfault with null object and instanceof() Christian Brabandt <cb@256bit.org> parents: 33286 diff changeset	3165 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	3166 return;
4cb421ba3385 patch 9.0.1911: Vim9: segfault with null object and instanceof() Christian Brabandt <cb@256bit.org> parents: 33286 diff changeset	3167
32972 e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3168 if (classinfo_tv->v_type == VAR_LIST)
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3169 {
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3170 FOR_ALL_LIST_ITEMS(classinfo_tv->vval.v_list, li)
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3171 {
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3172 if (li->li_tv.v_type != VAR_CLASS)
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3173 {
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3174 emsg(_(e_class_required));
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3175 return;
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3176 }
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3177
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3178 if (class_instance_of(object_tv->vval.v_object->obj_class,
33432 97ceabebaeaf patch 9.0.1974: vim9: using contra-variant type-checks Christian Brabandt <cb@256bit.org> parents: 33401 diff changeset	3179 li->li_tv.vval.v_class) == TRUE)
32972 e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3180 {
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3181 rettv->vval.v_number = VVAL_TRUE;
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3182 return;
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3183 }
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3184 }
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3185 }
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3186 else if (classinfo_tv->v_type == VAR_CLASS)
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3187 {
33432 97ceabebaeaf patch 9.0.1974: vim9: using contra-variant type-checks Christian Brabandt <cb@256bit.org> parents: 33401 diff changeset	3188 rettv->vval.v_number = class_instance_of(object_tv->vval.v_object->obj_class,
97ceabebaeaf patch 9.0.1974: vim9: using contra-variant type-checks Christian Brabandt <cb@256bit.org> parents: 33401 diff changeset	3189 classinfo_tv->vval.v_class);
32972 e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3190 }
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	3191 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3192
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	3193 #endif // FEAT_EVAL

Mercurial > vim

annotate src/vim9class.c @ 33678:7d9d2404a3d4 v9.0.2076