vim: src/vim9class.c annotate

annotate src/vim9class.c @ 33227:3672d3d13524 v9.0.1888

patch 9.0.1888: Vim9: Problem trying to invoke class method Commit: https://github.com/vim/vim/commit/342f4f626ed56921b1ef145ccaa05ba0a4b8ac01 Author: Yegappan Lakshmanan <yegappan@yahoo.com> Date: Sat Sep 9 11:37:23 2023 +0200 patch 9.0.1888: Vim9: Problem trying to invoke class method Problem: Vim9: Problem trying to invoke class method Solution: Lookup the class method insider other classes closes: #13055 Signed-off-by: Christian Brabandt <cb@256bit.org> Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>

author	Christian Brabandt <cb@256bit.org>
date	Sat, 09 Sep 2023 11:45:08 +0200
parents	52b121d4feb5
children	108d890d887f

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,
33109 2b5cc29b0a0e patch 9.0.1838: Vim9: Cannot modify class member vars from def function Christian Brabandt <cb@256bit.org> parents: 33106 diff changeset	75 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	76 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	77 char_u **init_expr)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	78 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	79 *varname_end = to_name_end(varname, FALSE);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	80 if (*varname == '_' && has_public)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	81 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	82 semsg(_(e_public_member_name_cannot_start_with_underscore_str), line);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	83 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	84 }
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 char_u colon = skipwhite(varname_end);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	87 char_u *type_arg = colon;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	88 type_T *type = NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	89 if (*colon == ':')
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	90 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	91 if (VIM_ISWHITE(**varname_end))
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 semsg(_(e_no_white_space_allowed_before_colon_str), varname);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	94 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	95 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	96 if (!VIM_ISWHITE(colon[1]))
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 semsg(_(e_white_space_required_after_str_str), ":", varname);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	99 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	100 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	101 type_arg = skipwhite(colon + 1);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	102 type = parse_type(&type_arg, type_list, TRUE);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	103 if (type == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	104 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	105 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	106
32960 d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	107 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	108 if (type == NULL && *init_arg != '=')
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	109 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	110 emsg(_(e_type_or_initialization_required));
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	111 return FAIL;
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
32960 d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	114 if (init_expr == NULL && *init_arg == '=')
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	115 {
32960 d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	116 emsg(_(e_cannot_initialize_member_in_interface));
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	117 return FAIL;
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	118 }
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	119
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	120 if (*init_arg == '=')
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 evalarg_T evalarg;
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	123 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	124
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	125 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	126 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	127 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	128 "=", type_arg);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	129 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	130 }
32960 d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	131 init_arg = skipwhite(init_arg + 1);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	132
32960 d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	133 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	134 (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	135
33006 29b2193466e0 patch 9.0.1795: Indentation issues Christian Brabandt <cb@256bit.org> parents: 32972 diff changeset	136 // 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	137 // 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	138 if (type == NULL)
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	139 type = &t_any;
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	140
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	141 *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	142 // Free the memory pointed by expr_start.
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	143 clear_evalarg(&evalarg, NULL);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	144 }
32960 d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	145 else if (!valid_declaration_type(type))
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	146 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	147
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	148 *type_ret = type;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	149 return OK;
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
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	152 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	153 * Add a member to an object or a class.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	154 * Returns OK when successful, "init_expr" will be consumed then.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	155 * Returns FAIL otherwise, caller might need to free "init_expr".
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	156 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	157 static int
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	158 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	159 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	160 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	161 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	162 int has_public,
2b5cc29b0a0e patch 9.0.1838: Vim9: Cannot modify class member vars from def function Christian Brabandt <cb@256bit.org> parents: 33106 diff changeset	163 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	164 char_u *init_expr)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	165 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	166 if (ga_grow(gap, 1) == FAIL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	167 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	168 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	169 m->ocm_name = vim_strnsave(varname, varname_end - varname);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	170 m->ocm_access = has_public ? VIM_ACCESS_ALL
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	171 : *varname == '_' ? VIM_ACCESS_PRIVATE : VIM_ACCESS_READ;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	172 m->ocm_type = type;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	173 if (init_expr != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	174 m->ocm_init = init_expr;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	175 ++gap->ga_len;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	176 return OK;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	177 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	178
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	179 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	180 * 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	181 * "gap" contains the found members.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	182 * "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	183 * "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	184 * "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	185 * "member_count" set to the number of members.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	186 * Returns OK or FAIL.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	187 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	188 static int
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	189 add_members_to_class(
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	190 garray_T *gap,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	191 ocmember_T *parent_members,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	192 int parent_count,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	193 ocmember_T **members,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	194 int *member_count)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	195 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	196 *member_count = parent_count + gap->ga_len;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	197 members = member_count == 0 ? NULL
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	198 : ALLOC_MULT(ocmember_T, *member_count);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	199 if (member_count > 0 && members == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	200 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	201 for (int i = 0; i < parent_count; ++i)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	202 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	203 // parent members need to be copied
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	204 ocmember_T m = members + i;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	205 *m = parent_members[i];
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	206 m->ocm_name = vim_strsave(m->ocm_name);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	207 if (m->ocm_init != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	208 m->ocm_init = vim_strsave(m->ocm_init);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	209 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	210 if (gap->ga_len > 0)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	211 // new members are moved
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	212 mch_memmove(*members + parent_count,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	213 gap->ga_data, sizeof(ocmember_T) * gap->ga_len);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	214 VIM_CLEAR(gap->ga_data);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	215 return OK;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	216 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	217
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	218 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	219 * 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	220 * "cl" implementing that interface.
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 int
33173 9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	223 object_index_from_itf_index(class_T itf, int is_method, int idx, class_T cl,
9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	224 int is_static)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	225 {
33173 9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	226 if (idx >= (is_method ? itf->class_obj_method_count
9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	227 : is_static ? itf->class_class_member_count
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	228 : itf->class_obj_member_count))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	229 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	230 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	231 return 0;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	232 }
32772 0dc750a24875 patch 9.0.1703: Vim9 Calling a method in an extended class fails Christian Brabandt <cb@256bit.org> parents: 32764 diff changeset	233
0dc750a24875 patch 9.0.1703: Vim9 Calling a method in an extended class fails Christian Brabandt <cb@256bit.org> parents: 32764 diff changeset	234 // 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	235 // 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	236 // 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	237 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	238 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	239
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	240 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	241 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	242 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	243
33204 36aebbf8389f patch 9.0.1880: Vim9: Need more tests for inheritance Christian Brabandt <cb@256bit.org> parents: 33201 diff changeset	244 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	245 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	246 {
33204 36aebbf8389f patch 9.0.1880: Vim9: Need more tests for inheritance Christian Brabandt <cb@256bit.org> parents: 33201 diff changeset	247 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	248 {
33204 36aebbf8389f patch 9.0.1880: Vim9: Need more tests for inheritance Christian Brabandt <cb@256bit.org> parents: 33201 diff changeset	249 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	250 {
36aebbf8389f patch 9.0.1880: Vim9: Need more tests for inheritance Christian Brabandt <cb@256bit.org> parents: 33201 diff changeset	251 searching = FALSE;
36aebbf8389f patch 9.0.1880: Vim9: Need more tests for inheritance Christian Brabandt <cb@256bit.org> parents: 33201 diff changeset	252 break;
36aebbf8389f patch 9.0.1880: Vim9: Need more tests for inheritance Christian Brabandt <cb@256bit.org> parents: 33201 diff changeset	253 }
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	254 }
71a097aab64d patch 9.0.1883: Vim9: Calling an interface method using a child object fails Christian Brabandt <cb@256bit.org> parents: 33204 diff changeset	255 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	256 // 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	257 // methods.
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 method_offset += is_static
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 ? super->class_class_function_count_child
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 : super->class_obj_method_count_child;
71a097aab64d patch 9.0.1883: Vim9: Calling an interface method using a child object fails Christian Brabandt <cb@256bit.org> parents: 33204 diff changeset	261 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	262 if (i2c == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	263 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	264 siemsg("class %s not found on interface %s",
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	265 cl->class_name, itf->class_name);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	266 return 0;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	267 }
33173 9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	268 if (is_static)
9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	269 {
9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	270 // TODO: Need a table for fast lookup?
9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	271 char_u *name = itf->class_class_members[idx].ocm_name;
9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	272 for (int i = 0; i < i2c->i2c_class->class_class_member_count; ++i)
9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	273 {
9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	274 ocmember_T *m = &i2c->i2c_class->class_class_members[i];
9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	275 if (STRCMP(name, m->ocm_name) == 0)
9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	276 {
9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	277 return i;
9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	278 }
9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	279 }
9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	280 siemsg("class %s, interface %s, static %s not found",
9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	281 cl->class_name, itf->class_name, name);
9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	282 return 0;
9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	283 }
9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	284 else
9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	285 {
9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	286 // A table follows the i2c for the class
9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	287 int table = (int )(i2c + 1);
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	288 // "method_offset" is 0, if method is in the current class. If 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	289 // is in a parent class, then it is non-zero.
71a097aab64d patch 9.0.1883: Vim9: Calling an interface method using a child object fails Christian Brabandt <cb@256bit.org> parents: 33204 diff changeset	290 return table[idx] + method_offset;
33173 9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	291 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	292 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	293
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	294 /*
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	295 * 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	296 * 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	297 * 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	298 */
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	299 static int
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	300 validate_extends_class(char_u extends_name, class_T *extends_clp)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	301 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	302 typval_T tv;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	303 int success = FALSE;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	304
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	305 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	306 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	307 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	308 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	309 return success;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	310 }
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	311
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	312 if (tv.v_type != VAR_CLASS
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	313 \|\| tv.vval.v_class == NULL
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	314 \|\| (tv.vval.v_class->class_flags & CLASS_INTERFACE) != 0)
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	315 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	316 else
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	317 {
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	318 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	319 ++extends_cl->class_refcount;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	320 *extends_clp = extends_cl;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	321 success = TRUE;
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	322 }
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	323 clear_tv(&tv);
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	324
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	325 return success;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	326 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	327
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	328 /*
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	329 * Check whether a class/object member variable in "classmembers_gap" /
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	330 * "objmembers_gap" is a duplicate of a member in any of the extended parent
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	331 * class lineage. Returns TRUE if there are no duplicates.
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	332 */
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	333 static int
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	334 validate_extends_members(
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	335 garray_T *classmembers_gap,
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	336 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	337 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	338 {
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	339 for (int loop = 1; loop <= 2; ++loop)
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	340 {
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	341 // loop == 1: check class members
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	342 // loop == 2: check object members
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	343 int member_count = loop == 1 ? classmembers_gap->ga_len
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	344 : objmembers_gap->ga_len;
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	345 if (member_count == 0)
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	346 continue;
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	347 ocmember_T members = (ocmember_T )(loop == 1
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	348 ? classmembers_gap->ga_data
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	349 : objmembers_gap->ga_data);
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	350
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	351 // Validate each member variable
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	352 for (int c_i = 0; c_i < member_count; c_i++)
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	353 {
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	354 class_T *p_cl = 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	355 ocmember_T *c_m = members + c_i;
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	356 char_u pstr = (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	357 ? 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	358
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	359 // Check in all the parent classes in the lineage
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	360 while (p_cl != NULL)
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	361 {
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	362 int p_member_count = loop == 1
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	363 ? p_cl->class_class_member_count
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	364 : p_cl->class_obj_member_count;
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	365 if (p_member_count == 0)
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	366 continue;
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	367 ocmember_T *p_members = (loop == 1
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	368 ? p_cl->class_class_members
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	369 : p_cl->class_obj_members);
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	370
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	371 // Compare against all the members in the parent class
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	372 for (int p_i = 0; p_i < p_member_count; p_i++)
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	373 {
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	374 ocmember_T *p_m = p_members + p_i;
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	375 char_u qstr = (p_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	376 ? p_m->ocm_name + 1 : p_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	377 if (STRCMP(pstr, qstr) == 0)
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	378 {
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	379 semsg(_(e_duplicate_member_str), 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	380 return FALSE;
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	381 }
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	382 }
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	383
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	384 p_cl = p_cl->class_extends;
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	385 }
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	386 }
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	387 }
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	388
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	389 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	390 }
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	391
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	392 /*
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	393 * 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	394 * 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	395 * implemented.
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	396 */
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	397 static int
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	398 validate_extends_methods(
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	399 garray_T *classmethods_gap,
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	400 garray_T *objmethods_gap,
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	401 class_T *extends_cl)
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	402 {
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	403 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	404 {
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	405 // 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	406 // 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	407 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	408 ? 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	409 : 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	410 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	411 continue;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	412
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	413 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	414 ? 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	415 : 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	416
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	417 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	418 : objmethods_gap->ga_len;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	419 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	420 ? classmethods_gap->ga_data
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	421 : objmethods_gap->ga_data);
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	422
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	423 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	424 {
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	425 ufunc_T *uf = extends_methods[i];
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	426 if ((uf->uf_flags & FC_ABSTRACT) == 0)
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	427 continue;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	428
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	429 int method_found = FALSE;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	430
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	431 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	432 {
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	433 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	434 {
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	435 method_found = TRUE;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	436 break;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	437 }
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	438 }
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	439
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	440 if (!method_found)
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	441 {
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	442 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	443 return FALSE;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	444 }
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	445 }
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	446 }
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	447
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	448 return TRUE;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	449 }
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	450
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	451 /*
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	452 * Check the members of the interface class "ifcl" match the class members
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	453 * ("classmembers_gap") and object members ("objmembers_gap") of a class.
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	454 * Returns TRUE if the class and object member names are valid.
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	455 */
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	456 static int
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	457 validate_interface_members(
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	458 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	459 class_T *ifcl,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	460 garray_T *classmembers_gap,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	461 garray_T *objmembers_gap)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	462 {
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	463 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	464 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	465 // loop == 1: check class members
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	466 // loop == 2: check object members
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	467 int if_count = loop == 1 ? ifcl->class_class_member_count
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	468 : ifcl->class_obj_member_count;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	469 if (if_count == 0)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	470 continue;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	471 ocmember_T *if_ms = loop == 1 ? ifcl->class_class_members
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	472 : ifcl->class_obj_members;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	473 ocmember_T cl_ms = (ocmember_T )(loop == 1
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	474 ? classmembers_gap->ga_data
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	475 : objmembers_gap->ga_data);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	476 int cl_count = loop == 1 ? classmembers_gap->ga_len
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	477 : objmembers_gap->ga_len;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	478 for (int if_i = 0; if_i < if_count; ++if_i)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	479 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	480 int cl_i;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	481 for (cl_i = 0; cl_i < cl_count; ++cl_i)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	482 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	483 ocmember_T *m = &cl_ms[cl_i];
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	484 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	485
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	486 if (STRCMP(if_ms[if_i].ocm_name, m->ocm_name) != 0)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	487 continue;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	488
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	489 // Ensure the type is matching.
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	490 where.wt_func_name = (char *)m->ocm_name;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	491 where.wt_kind = WT_MEMBER;
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	492 if (check_type(if_ms[if_i].ocm_type, m->ocm_type, TRUE,
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	493 where) == FAIL)
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	494 return FALSE;
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	495
33088 667a17904f64 patch 9.0.1829: Vim9 missing access-checks for private vars Christian Brabandt <cb@256bit.org> parents: 33070 diff changeset	496 if (if_ms[if_i].ocm_access != m->ocm_access)
667a17904f64 patch 9.0.1829: Vim9 missing access-checks for private vars Christian Brabandt <cb@256bit.org> parents: 33070 diff changeset	497 {
667a17904f64 patch 9.0.1829: Vim9 missing access-checks for private vars Christian Brabandt <cb@256bit.org> parents: 33070 diff changeset	498 semsg(_(e_member_str_of_interface_str_has_different_access),
667a17904f64 patch 9.0.1829: Vim9 missing access-checks for private vars Christian Brabandt <cb@256bit.org> parents: 33070 diff changeset	499 if_ms[if_i].ocm_name, intf_class_name);
667a17904f64 patch 9.0.1829: Vim9 missing access-checks for private vars Christian Brabandt <cb@256bit.org> parents: 33070 diff changeset	500 return FALSE;
667a17904f64 patch 9.0.1829: Vim9 missing access-checks for private vars Christian Brabandt <cb@256bit.org> parents: 33070 diff changeset	501 }
667a17904f64 patch 9.0.1829: Vim9 missing access-checks for private vars Christian Brabandt <cb@256bit.org> parents: 33070 diff changeset	502
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	503 break;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	504 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	505 if (cl_i == cl_count)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	506 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	507 semsg(_(e_member_str_of_interface_str_not_implemented),
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	508 if_ms[if_i].ocm_name, intf_class_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	509 return FALSE;
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	510 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	511 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	512 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	513
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	514 return TRUE;
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	515 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	516
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	517 /*
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	518 * Check the functions/methods of the interface class "ifcl" match the class
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	519 * methods ("classfunctions_gap") and object functions ("objmemthods_gap") of a
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	520 * class.
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	521 * Returns TRUE if the class and object member names are valid.
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	522 */
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	523 static int
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	524 validate_interface_methods(
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	525 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	526 class_T *ifcl,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	527 garray_T *classfunctions_gap,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	528 garray_T *objmethods_gap)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	529 {
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	530 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	531 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	532 // loop == 1: check class functions
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	533 // loop == 2: check object methods
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	534 int if_count = loop == 1 ? ifcl->class_class_function_count
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	535 : ifcl->class_obj_method_count;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	536 if (if_count == 0)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	537 continue;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	538 ufunc_T **if_fp = loop == 1 ? ifcl->class_class_functions
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	539 : ifcl->class_obj_methods;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	540 ufunc_T cl_fp = (ufunc_T )(loop == 1
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	541 ? classfunctions_gap->ga_data
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	542 : objmethods_gap->ga_data);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	543 int cl_count = loop == 1 ? classfunctions_gap->ga_len
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	544 : objmethods_gap->ga_len;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	545 for (int if_i = 0; if_i < if_count; ++if_i)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	546 {
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	547 char_u *if_name = if_fp[if_i]->uf_name;
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	548 int cl_i;
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	549 for (cl_i = 0; cl_i < cl_count; ++cl_i)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	550 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	551 char_u *cl_name = cl_fp[cl_i]->uf_name;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	552 if (STRCMP(if_name, cl_name) == 0)
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 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	555
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	556 // Ensure the type is matching.
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	557 where.wt_func_name = (char *)if_name;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	558 where.wt_kind = WT_METHOD;
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	559 if (check_type(if_fp[if_i]->uf_func_type,
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	560 cl_fp[cl_i]->uf_func_type, TRUE, where) == FAIL)
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	561 return FALSE;
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	562 break;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	563 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	564 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	565 if (cl_i == cl_count)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	566 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	567 semsg(_(e_function_str_of_interface_str_not_implemented),
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	568 if_name, intf_class_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	569 return FALSE;
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	570 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	571 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	572 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	573
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	574 return TRUE;
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	575 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	576
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	577 /*
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	578 * 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	579 * 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	580 * 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	581 * "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	582 * "objmembers_gap" respectively.
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	583 */
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	584 static int
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	585 validate_implements_classes(
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	586 garray_T *impl_gap,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	587 class_T **intf_classes,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	588 garray_T *classfunctions_gap,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	589 garray_T *classmembers_gap,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	590 garray_T *objmethods_gap,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	591 garray_T *objmembers_gap)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	592 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	593 int success = TRUE;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	594
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	595 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	596 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	597 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	598 typval_T tv;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	599 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	600 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	601 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	602 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	603 success = FALSE;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	604 break;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	605 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	606
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	607 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	608 \|\| 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	609 \|\| (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	610 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	611 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	612 success = FALSE;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	613 clear_tv(&tv);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	614 break;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	615 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	616
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	617 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	618 intf_classes[i] = ifcl;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	619 ++ifcl->class_refcount;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	620
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	621 // check the members of the interface match the members of the class
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	622 success = validate_interface_members(impl, ifcl, classmembers_gap,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	623 objmembers_gap);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	624
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	625 // 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	626 // 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	627 if (success)
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	628 success = validate_interface_methods(impl, ifcl,
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	629 classfunctions_gap, objmethods_gap);
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	630 clear_tv(&tv);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	631 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	632
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	633 return success;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	634 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	635
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	636 /*
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	637 * 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	638 * (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	639 * to check them.)
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 static int
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	642 check_func_arg_names(
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	643 garray_T *classfunctions_gap,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	644 garray_T *objmethods_gap,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	645 garray_T *classmembers_gap)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	646 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	647 // 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	648 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	649 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	650 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	651
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	652 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	653 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	654 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	655
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	656 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	657 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	658 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	659 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	660
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	661 // 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	662 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	663 {
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	664 char_u *mname =
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	665 ((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	666 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	667 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	668 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	669 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	670
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	671 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	672 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	673
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	674 return FALSE;
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	675 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	676 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	677 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	678 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	679 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	680
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	681 return TRUE;
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	682 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	683
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	684 /*
33047 9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	685 * Returns TRUE if the member "varname" 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	686 */
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	687 static int
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	688 is_duplicate_member(garray_T mgap, char_u varname, char_u *varname_end)
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	689 {
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	690 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	691 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	692 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	693
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	694 for (int i = 0; i < mgap->ga_len; ++i)
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	695 {
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	696 ocmember_T m = ((ocmember_T )mgap->ga_data) + i;
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	697 char_u qstr = m->ocm_name == '_' ? m->ocm_name + 1 : m->ocm_name;
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	698 if (STRCMP(pstr, qstr) == 0)
33047 9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	699 {
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	700 semsg(_(e_duplicate_member_str), name);
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	701 dup = TRUE;
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	702 break;
33047 9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	703 }
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	704 }
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	705
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	706 vim_free(name);
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	707 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	708 }
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	709
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	710 /*
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	711 * 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	712 */
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	713 static int
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	714 is_duplicate_method(garray_T fgap, char_u name)
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	715 {
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	716 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	717
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	718 for (int i = 0; i < fgap->ga_len; ++i)
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	719 {
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	720 char_u n = ((ufunc_T *)fgap->ga_data)[i]->uf_name;
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	721 char_u qstr = n == '_' ? n + 1 : n;
33047 9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	722 if (STRCMP(pstr, qstr) == 0)
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	723 {
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	724 semsg(_(e_duplicate_function_str), name);
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	725 return TRUE;
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	726 }
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	727 }
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	728
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	729 return FALSE;
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	730 }
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	731
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	732 /*
33068 d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	733 * 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	734 */
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	735 static int
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	736 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	737 {
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	738 // 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	739 if (is_abstract)
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	740 {
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	741 emsg(_(e_cannot_define_new_function_in_abstract_class));
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	742 return FALSE;
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	743 }
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	744 // 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	745 if (has_static)
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	746 {
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	747 emsg(_(e_cannot_define_new_function_as_static));
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	748 return FALSE;
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	749 }
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	750 // 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	751 // constructor method.
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	752 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	753 {
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	754 emsg(_(e_cannot_use_a_return_type_with_new));
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	755 return FALSE;
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	756 }
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	757 return TRUE;
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	758 }
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	759
d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	760 /*
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	761 * 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	762 * 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	763 * 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	764 * 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	765 * 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	766 * 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	767 */
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	768 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	769 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	770 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	771 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	772 garray_T *objmethods,
667a17904f64 patch 9.0.1829: Vim9 missing access-checks for private vars Christian Brabandt <cb@256bit.org> parents: 33070 diff changeset	773 int pobj_method_offset,
667a17904f64 patch 9.0.1829: Vim9 missing access-checks for private vars Christian Brabandt <cb@256bit.org> parents: 33070 diff changeset	774 int is_interface)
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	775 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	776 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	777 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	778
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	779 // 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	780 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	781 + 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	782 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	783 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	784 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	785 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	786 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	787 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	788
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	789 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	790 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	791 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	792 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	793 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	794 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	795 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	796 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	797 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	798 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	799 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	800
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	801 // 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	802 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	803 + 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	804 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	805 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	806 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	807 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	808 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	809 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	810
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	811 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	812 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	813 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	814 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	815 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	816 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	817 ((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	818 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	819 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	820 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	821 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	822 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	823 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	824 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	825
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	826 // 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	827 // 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	828 // lineage.
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	829 if (!done && !is_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	830 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	831 // 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	832 // 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	833 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	834 {
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	835 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	836 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	837
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	838 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	839 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	840
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	841 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	842 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	843 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	844 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	845 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	846 == 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	847 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	848 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	849 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	850 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	851 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	852 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	853 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	854 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	855 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	856 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	857 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	858
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	859 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	860 {
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	861 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	862 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	863 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	864 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	865 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	866
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	867 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	868 }
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	869
5fd9fe58c791 patch 9.0.1737: Calling a base class method through an extended class fails Christian Brabandt <cb@256bit.org> parents: 32812 diff changeset	870 /*
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	871 * 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	872 * interface class.
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	873 * 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	874 * 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	875 * 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	876 */
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	877 static int
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	878 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	879 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	880 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	881 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	882 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	883
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	884 if (update_member_method_lookup_table(ifcl, cl, objmethods_gap,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	885 0, TRUE) == FAIL)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	886 return FAIL;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	887 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	888
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	889 // Update the lookup table for the extended class, if nay
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	890 if (extends_cl != NULL)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	891 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	892 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	893 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	894
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	895 // 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	896 while (pclass != NULL)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	897 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	898 if (update_member_method_lookup_table(pclass, cl,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	899 objmethods_gap, pobj_method_offset, FALSE) == FAIL)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	900 return FAIL;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	901
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	902 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	903 pclass = pclass->class_extends;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	904 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	905 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	906
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	907 return OK;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	908 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	909
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	910 /*
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	911 * 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	912 * and initialize it.
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	913 */
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	914 static void
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	915 add_class_members(class_T cl, exarg_T eap)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	916 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	917 // 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	918 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	919 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	920 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	921 return;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	922
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	923 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	924 {
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	925 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	926 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	927 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	928 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	929 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	930 if (etv != NULL)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	931 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	932 tv = etv;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	933 vim_free(etv);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	934 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	935 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	936 else
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	937 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	938 // TODO: proper default value
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	939 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	940 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	941 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	942 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	943 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	944
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	945 /*
32903 54c01bb98b8e patch 9.0.1760: vim9 class problem with new() constructor Christian Brabandt <cb@256bit.org> parents: 32896 diff changeset	946 * 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	947 */
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	948 static void
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	949 add_default_constructor(
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	950 class_T *cl,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	951 garray_T *classfunctions_gap,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	952 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	953 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	954 garray_T fga;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	955
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	956 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	957 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	958 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	959 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	960 if (i > 0)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	961 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	962 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	963 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	964 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	965 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	966 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	967 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	968 ga_append(&fga, NUL);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	969
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	970 exarg_T fea;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	971 CLEAR_FIELD(fea);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	972 fea.cmdidx = CMD_def;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	973 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	974
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	975 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	976 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	977
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	978 ufunc_T *nf = define_function(&fea, NULL, &lines_to_free, CF_CLASS);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	979
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	980 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	981 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	982
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	983 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	984 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	985 ((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	986 = nf;
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	987 ++classfunctions_gap->ga_len;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	988
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	989 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	990 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	991 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	992 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	993 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	994 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	995 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	996 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	997 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	998 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	999 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1000
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1001 /*
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1002 * Add the class functions and object methods to the new class "cl".
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1003 * When extending a class, add the functions and methods from the parent class
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1004 * also.
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1005 */
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1006 static int
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1007 add_classfuncs_objmethods(
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1008 class_T *cl,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1009 class_T *extends_cl,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1010 garray_T *classfunctions_gap,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1011 garray_T *objmethods_gap)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1012 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1013 // 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	1014 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	1015 {
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1016 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	1017 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	1018 : &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	1019 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	1020 : &cl->class_obj_methods;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1021
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1022 int parent_count = 0;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1023 if (extends_cl != NULL)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1024 // Include functions from the parent.
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1025 parent_count = loop == 1
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1026 ? extends_cl->class_class_function_count
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1027 : 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	1028
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1029 *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	1030 if (*fcount == 0)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1031 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1032 *fup = NULL;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1033 continue;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1034 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1035 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	1036 if (*fup == NULL)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1037 return FAIL;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1038
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1039 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	1040 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	1041 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	1042 if (loop == 1)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1043 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	1044 else
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1045 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	1046
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1047 int skipped = 0;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1048 for (int i = 0; i < parent_count; ++i)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1049 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1050 // Copy functions from the parent. Can't use the same
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1051 // function, because "uf_class" is different and compilation
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1052 // will have a different result.
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1053 // Put them after the functions in the current class, object
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1054 // methods may be overruled, then "super.Method()" is used to
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1055 // find a method from the parent.
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1056 // Skip "new" functions. TODO: not all of them.
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1057 if (loop == 1 && STRNCMP(
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1058 extends_cl->class_class_functions[i]->uf_name,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1059 "new", 3) == 0)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1060 ++skipped;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1061 else
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1062 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1063 ufunc_T *pf = (loop == 1
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1064 ? extends_cl->class_class_functions
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1065 : extends_cl->class_obj_methods)[i];
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1066 (*fup)[gap->ga_len + i - skipped] = copy_function(pf);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1067
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1068 // 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	1069 // 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	1070 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	1071 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	1072 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1073 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	1074 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	1075 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	1076 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1077 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	1078 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	1079 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	1080 (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	1081 TRUE, where);
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1082 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1083 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1084 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1085 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1086
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1087 *fcount -= skipped;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1088
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1089 // 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	1090 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	1091 {
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1092 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	1093 fp->uf_class = cl;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1094 if (loop == 2)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1095 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	1096 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1097 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1098
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1099 return OK;
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1100 }
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1101
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1102 /*
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1103 * Handle ":class" and ":abstract class" up to ":endclass".
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1104 * Handle ":interface" up to ":endinterface".
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1105 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1106 void
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1107 ex_class(exarg_T *eap)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1108 {
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1109 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	1110 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	1111 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	1112 int is_abstract = eap->cmdidx == CMD_abstract;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1113
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1114 if (is_abstract)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1115 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1116 if (STRNCMP(arg, "class", 5) != 0 \|\| !VIM_ISWHITE(arg[5]))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1117 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1118 semsg(_(e_invalid_argument_str), arg);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1119 return;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1120 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1121 arg = skipwhite(arg + 5);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1122 is_class = TRUE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1123 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1124
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1125 if (!current_script_is_vim9()
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1126 \|\| (cmdmod.cmod_flags & CMOD_LEGACY)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1127 \|\| !getline_equal(eap->getline, eap->cookie, getsourceline))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1128 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1129 if (is_class)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1130 emsg(_(e_class_can_only_be_defined_in_vim9_script));
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1131 else
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1132 emsg(_(e_interface_can_only_be_defined_in_vim9_script));
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1133 return;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1134 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1135
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1136 if (!ASCII_ISUPPER(*arg))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1137 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1138 if (is_class)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1139 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	1140 else
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1141 semsg(_(e_interface_name_must_start_with_uppercase_letter_str),
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1142 arg);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1143 return;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1144 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1145 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	1146 if (!IS_WHITE_OR_NUL(*name_end))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1147 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1148 semsg(_(e_white_space_required_after_name_str), arg);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1149 return;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1150 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1151 char_u *name_start = arg;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1152
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1153 // "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	1154 // for the items inside the class.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1155 int class_export = is_export;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1156 is_export = FALSE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1157
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1158 // TODO:
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1159 // generics: <Tkey, Tentry>
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1160
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1161 // Name for "extends BaseClass"
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1162 char_u *extends = NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1163
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1164 // Names for "implements SomeInterface"
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1165 garray_T ga_impl;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1166 ga_init2(&ga_impl, sizeof(char_u *), 5);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1167
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1168 arg = skipwhite(name_end);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1169 while (arg != NUL && arg != '#' && *arg != '\n')
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1170 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1171 // TODO:
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1172 // specifies SomeInterface
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1173 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	1174 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1175 if (extends != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1176 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1177 emsg(_(e_duplicate_extends));
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1178 goto early_ret;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1179 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1180 arg = skipwhite(arg + 7);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1181 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	1182 if (!IS_WHITE_OR_NUL(*end))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1183 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1184 semsg(_(e_white_space_required_after_name_str), arg);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1185 goto early_ret;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1186 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1187 extends = vim_strnsave(arg, end - arg);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1188 if (extends == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1189 goto early_ret;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1190
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1191 arg = skipwhite(end + 1);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1192 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1193 else if (STRNCMP(arg, "implements", 10) == 0
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1194 && IS_WHITE_OR_NUL(arg[10]))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1195 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1196 if (ga_impl.ga_len > 0)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1197 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1198 emsg(_(e_duplicate_implements));
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1199 goto early_ret;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1200 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1201 arg = skipwhite(arg + 10);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1202
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1203 for (;;)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1204 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1205 char_u *impl_end = find_name_end(arg, NULL, NULL,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1206 FNE_CHECK_START);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1207 if (!IS_WHITE_OR_NUL(impl_end) && impl_end != ',')
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1208 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1209 semsg(_(e_white_space_required_after_name_str), arg);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1210 goto early_ret;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1211 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1212 char_u *iname = vim_strnsave(arg, impl_end - arg);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1213 if (iname == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1214 goto early_ret;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1215 for (int i = 0; i < ga_impl.ga_len; ++i)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1216 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	1217 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1218 semsg(_(e_duplicate_interface_after_implements_str),
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1219 iname);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1220 vim_free(iname);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1221 goto early_ret;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1222 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1223 if (ga_add_string(&ga_impl, iname) == FAIL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1224 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1225 vim_free(iname);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1226 goto early_ret;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1227 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1228 if (*impl_end != ',')
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1229 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1230 arg = skipwhite(impl_end);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1231 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1232 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1233 arg = skipwhite(impl_end + 1);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1234 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1235 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1236 else
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1237 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1238 semsg(_(e_trailing_characters_str), arg);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1239 early_ret:
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1240 vim_free(extends);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1241 ga_clear_strings(&ga_impl);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1242 return;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1243 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1244 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1245
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1246 garray_T type_list; // list of pointers to allocated types
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1247 ga_init2(&type_list, sizeof(type_T *), 10);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1248
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1249 // Growarray with class members declared in the class.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1250 garray_T classmembers;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1251 ga_init2(&classmembers, sizeof(ocmember_T), 10);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1252
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1253 // Growarray with functions declared in the class.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1254 garray_T classfunctions;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1255 ga_init2(&classfunctions, sizeof(ufunc_T *), 10);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1256
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1257 // Growarray with object members declared in the class.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1258 garray_T objmembers;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1259 ga_init2(&objmembers, sizeof(ocmember_T), 10);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1260
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1261 // Growarray with object methods declared in the class.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1262 garray_T objmethods;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1263 ga_init2(&objmethods, sizeof(ufunc_T *), 10);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1264
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1265 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1266 * 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	1267 * "endinterface" is found.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1268 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1269 char_u *theline = NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1270 int success = FALSE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1271 for (;;)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1272 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1273 vim_free(theline);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1274 theline = eap->getline(':', eap->cookie, 0, GETLINE_CONCAT_ALL);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1275 if (theline == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1276 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1277 char_u *line = skipwhite(theline);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1278
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1279 // Skip empty and comment lines.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1280 if (*line == NUL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1281 continue;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1282 if (*line == '#')
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1283 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1284 if (vim9_bad_comment(line))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1285 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1286 continue;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1287 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1288
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1289 char_u *p = line;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1290 char *end_name = is_class ? "endclass" : "endinterface";
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1291 if (checkforcmd(&p, end_name, is_class ? 4 : 5))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1292 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1293 if (STRNCMP(line, end_name, is_class ? 8 : 12) != 0)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1294 semsg(_(e_command_cannot_be_shortened_str), line);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1295 else if (*p == '\|' \|\| !ends_excmd2(line, p))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1296 semsg(_(e_trailing_characters_str), p);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1297 else
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1298 success = TRUE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1299 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1300 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1301 char *wrong_name = is_class ? "endinterface" : "endclass";
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1302 if (checkforcmd(&p, wrong_name, is_class ? 5 : 4))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1303 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1304 semsg(_(e_invalid_command_str_expected_str), line, end_name);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1305 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1306 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1307
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1308 int has_public = FALSE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1309 if (checkforcmd(&p, "public", 3))
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 if (STRNCMP(line, "public", 6) != 0)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1312 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1313 semsg(_(e_command_cannot_be_shortened_str), line);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1314 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1315 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1316 has_public = TRUE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1317 p = skipwhite(line + 6);
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 (STRNCMP(p, "this", 4) != 0 && STRNCMP(p, "static", 6) != 0)
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 emsg(_(e_public_must_be_followed_by_this_or_static));
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1322 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1323 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1324 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1325
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1326 int abstract_method = FALSE;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1327 char_u *pa = p;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1328 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	1329 {
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1330 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	1331 {
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1332 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	1333 break;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1334 }
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1335
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1336 if (!is_abstract)
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1337 {
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1338 semsg(_(e_abstract_method_in_concrete_class), pa);
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1339 break;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1340 }
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1341
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1342 abstract_method = TRUE;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1343 p = skipwhite(pa + 8);
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1344 if (STRNCMP(p, "def", 3) != 0 && STRNCMP(p, "static", 6) != 0)
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1345 {
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1346 emsg(_(e_abstract_must_be_followed_by_def_or_static));
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1347 break;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1348 }
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1349 }
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1350
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1351 int has_static = FALSE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1352 char_u *ps = p;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1353 if (checkforcmd(&p, "static", 4))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1354 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1355 if (STRNCMP(ps, "static", 6) != 0)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1356 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1357 semsg(_(e_command_cannot_be_shortened_str), ps);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1358 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1359 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1360 has_static = TRUE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1361 p = skipwhite(ps + 6);
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
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1364 // object members (public, read access, private):
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1365 // "this._varname"
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1366 // "this.varname"
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1367 // "public this.varname"
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1368 if (STRNCMP(p, "this", 4) == 0)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1369 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1370 if (p[4] != '.' \|\| !eval_isnamec1(p[5]))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1371 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1372 semsg(_(e_invalid_object_member_declaration_str), p);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1373 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1374 }
33047 9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	1375 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	1376 {
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	1377 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	1378 break;
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	1379 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1380 char_u *varname = p + 5;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1381 char_u *varname_end = NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1382 type_T *type = NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1383 char_u *init_expr = NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1384 if (parse_member(eap, line, varname, has_public,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1385 &varname_end, &type_list, &type,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1386 is_class ? &init_expr: NULL) == FAIL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1387 break;
33047 9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	1388 if (is_duplicate_member(&objmembers, varname, varname_end))
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	1389 {
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	1390 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	1391 break;
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	1392 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1393 if (add_member(&objmembers, varname, varname_end,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1394 has_public, type, init_expr) == FAIL)
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 vim_free(init_expr);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1397 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1398 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1399 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1400
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1401 // constructors:
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1402 // def new()
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1403 // enddef
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1404 // def newOther()
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1405 // enddef
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1406 // object methods and class functions:
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1407 // def SomeMethod()
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1408 // enddef
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1409 // static def ClassFunction()
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1410 // enddef
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1411 // TODO:
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1412 // def <Tval> someMethod()
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1413 // enddef
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1414 else if (checkforcmd(&p, "def", 3))
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 exarg_T ea;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1417 garray_T lines_to_free;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1418
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1419 // TODO: error for "public static def Func()"?
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1420
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1421 CLEAR_FIELD(ea);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1422 ea.cmd = line;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1423 ea.arg = p;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1424 ea.cmdidx = CMD_def;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1425 ea.getline = eap->getline;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1426 ea.cookie = eap->cookie;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1427
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1428 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	1429 int class_flags;
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1430 if (is_class)
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1431 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	1432 else
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1433 class_flags = CF_INTERFACE;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1434 ufunc_T *uf = define_function(&ea, NULL, &lines_to_free,
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1435 class_flags);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1436 ga_clear_strings(&lines_to_free);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1437
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1438 if (uf != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1439 {
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1440 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	1441 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	1442
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1443 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	1444 has_static))
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1445 {
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	1446 func_clear_free(uf, FALSE);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1447 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1448 }
33068 d42927c6e556 patch 9.0.1821: Vim9 constructors are always static Christian Brabandt <cb@256bit.org> parents: 33047 diff changeset	1449
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1450 garray_T *fgap = has_static \|\| is_new
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1451 ? &classfunctions : &objmethods;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1452 // Check the name isn't used already.
33047 9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	1453 if (is_duplicate_method(fgap, 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	1454 {
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	1455 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	1456 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	1457 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	1458 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1459
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1460 if (ga_grow(fgap, 1) == OK)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1461 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1462 if (is_new)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1463 uf->uf_flags \|= FC_NEW;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1464
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1465 if (abstract_method)
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1466 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	1467
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1468 ((ufunc_T **)fgap->ga_data)[fgap->ga_len] = uf;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1469 ++fgap->ga_len;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1470 }
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 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1473
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1474 // class members
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1475 else if (has_static)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1476 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1477 // class members (public, read access, private):
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1478 // "static _varname"
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1479 // "static varname"
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1480 // "public static varname"
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1481 char_u *varname = p;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1482 char_u *varname_end = NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1483 type_T *type = NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1484 char_u *init_expr = NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1485 if (parse_member(eap, line, varname, has_public,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1486 &varname_end, &type_list, &type,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1487 is_class ? &init_expr : NULL) == FAIL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1488 break;
33047 9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	1489 if (is_duplicate_member(&classmembers, varname, varname_end))
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	1490 {
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	1491 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	1492 break;
9ef43d02dd8f patch 9.0.1814: Vim9 no error on duplicate object member var Christian Brabandt <cb@256bit.org> parents: 33025 diff changeset	1493 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1494 if (add_member(&classmembers, varname, varname_end,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1495 has_public, type, init_expr) == FAIL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1496 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1497 vim_free(init_expr);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1498 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1499 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1500 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1501
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1502 else
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1503 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1504 if (is_class)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1505 semsg(_(e_not_valid_command_in_class_str), line);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1506 else
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1507 semsg(_(e_not_valid_command_in_interface_str), line);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1508 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1509 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1510 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1511 vim_free(theline);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1512
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1513 class_T *extends_cl = NULL; // class from "extends" argument
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1514
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1515 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1516 * Check a few things before defining the class.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1517 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1518
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1519 // Check the "extends" class is valid.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1520 if (success && extends != NULL)
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1521 success = validate_extends_class(extends, &extends_cl);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1522 VIM_CLEAR(extends);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1523
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1524 // Check the new class members and object members are not duplicates of 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	1525 // members in the extended class lineage.
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	1526 if (success && extends_cl != NULL)
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	1527 success = validate_extends_members(&classmembers, &objmembers,
8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	1528 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	1529
33217 499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1530 // 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	1531 // 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	1532 // 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	1533 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	1534 && (extends_cl->class_flags & CLASS_ABSTRACT))
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1535 success = validate_extends_methods(&classfunctions, &objmethods,
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1536 extends_cl);
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1537
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1538 class_T **intf_classes = NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1539
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1540 // Check all "implements" entries are valid.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1541 if (success && ga_impl.ga_len > 0)
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 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	1544
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1545 success = validate_implements_classes(&ga_impl, intf_classes,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1546 &classfunctions, &classmembers,
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1547 &objmethods, &objmembers);
32670 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
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1550 // 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	1551 if (success)
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1552 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	1553 &classmembers);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1554
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1555 class_T *cl = NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1556 if (success)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1557 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1558 // "endclass" encountered without failures: Create the class.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1559
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1560 cl = ALLOC_CLEAR_ONE(class_T);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1561 if (cl == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1562 goto cleanup;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1563 if (!is_class)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1564 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	1565 else if (is_abstract)
499ba27ba0f6 patch 9.0.1885: Vim9: no support for abstract methods Christian Brabandt <cb@256bit.org> parents: 33211 diff changeset	1566 cl->class_flags = CLASS_ABSTRACT;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1567
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1568 cl->class_refcount = 1;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1569 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	1570 if (cl->class_name == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1571 goto cleanup;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1572
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1573 if (extends_cl != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1574 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1575 cl->class_extends = extends_cl;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1576 extends_cl->class_flags \|= CLASS_EXTENDED;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1577 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1578
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1579 // Add class and object members to "cl".
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1580 if (add_members_to_class(&classmembers,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1581 extends_cl == NULL ? NULL
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1582 : extends_cl->class_class_members,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1583 extends_cl == NULL ? 0
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1584 : extends_cl->class_class_member_count,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1585 &cl->class_class_members,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1586 &cl->class_class_member_count) == FAIL
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1587 \|\| add_members_to_class(&objmembers,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1588 extends_cl == NULL ? NULL
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1589 : extends_cl->class_obj_members,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1590 extends_cl == NULL ? 0
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1591 : extends_cl->class_obj_member_count,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1592 &cl->class_obj_members,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1593 &cl->class_obj_member_count) == FAIL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1594 goto cleanup;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1595
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1596 if (ga_impl.ga_len > 0)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1597 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1598 // Move the "implements" names into the class.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1599 cl->class_interface_count = ga_impl.ga_len;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1600 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	1601 if (cl->class_interfaces == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1602 goto cleanup;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1603 for (int i = 0; i < ga_impl.ga_len; ++i)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1604 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	1605 VIM_CLEAR(ga_impl.ga_data);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1606 ga_impl.ga_len = 0;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1607
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1608 cl->class_interfaces_cl = intf_classes;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1609 intf_classes = NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1610 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1611
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1612 if (cl->class_interface_count > 0 \|\| extends_cl != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1613 {
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1614 // 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	1615 // classes.
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1616 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	1617 goto cleanup;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1618 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1619
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1620 // 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	1621 if (is_class && cl->class_class_member_count > 0)
32896 223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1622 add_class_members(cl, eap);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1623
32903 54c01bb98b8e patch 9.0.1760: vim9 class problem with new() constructor Christian Brabandt <cb@256bit.org> parents: 32896 diff changeset	1624 int have_new = FALSE;
54c01bb98b8e patch 9.0.1760: vim9 class problem with new() constructor Christian Brabandt <cb@256bit.org> parents: 32896 diff changeset	1625 ufunc_T *class_func = NULL;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1626 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	1627 {
54c01bb98b8e patch 9.0.1760: vim9 class problem with new() constructor Christian Brabandt <cb@256bit.org> parents: 32896 diff changeset	1628 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	1629 if (STRCMP(class_func->uf_name, "new") == 0)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1630 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1631 have_new = TRUE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1632 break;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1633 }
32903 54c01bb98b8e patch 9.0.1760: vim9 class problem with new() constructor Christian Brabandt <cb@256bit.org> parents: 32896 diff changeset	1634 }
54c01bb98b8e patch 9.0.1760: vim9 class problem with new() constructor Christian Brabandt <cb@256bit.org> parents: 32896 diff changeset	1635
54c01bb98b8e patch 9.0.1760: vim9 class problem with new() constructor Christian Brabandt <cb@256bit.org> parents: 32896 diff changeset	1636 if (have_new)
54c01bb98b8e patch 9.0.1760: vim9 class problem with new() constructor Christian Brabandt <cb@256bit.org> parents: 32896 diff changeset	1637 // 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	1638 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	1639 else if (is_class && !is_abstract && !have_new)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1640 // 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	1641 add_default_constructor(cl, &classfunctions, &type_list);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1642
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1643 // 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	1644 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	1645 &objmethods) == FAIL)
223765c87ea9 patch 9.0.1757: ex_class() function is too long Christian Brabandt <cb@256bit.org> parents: 32874 diff changeset	1646 goto cleanup;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1647
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1648 cl->class_type.tt_type = VAR_CLASS;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1649 cl->class_type.tt_class = cl;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1650 cl->class_object_type.tt_type = VAR_OBJECT;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1651 cl->class_object_type.tt_class = cl;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1652 cl->class_type_list = type_list;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1653
33160 4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	1654 class_created(cl);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	1655
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1656 // TODO:
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1657 // - Fill hashtab with object members and methods ?
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1658
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1659 // Add the class to the script-local variables.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1660 // 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	1661 // TODO: does uf_hash need to be cleared?
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1662 typval_T tv;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1663 tv.v_type = VAR_CLASS;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1664 tv.vval.v_class = cl;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1665 is_export = class_export;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1666 SOURCING_LNUM = start_lnum;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1667 set_var_const(cl->class_name, current_sctx.sc_sid,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1668 NULL, &tv, FALSE, 0, 0);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1669 return;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1670 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1671
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1672 cleanup:
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1673 if (cl != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1674 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1675 vim_free(cl->class_name);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1676 vim_free(cl->class_class_functions);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1677 if (cl->class_interfaces != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1678 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1679 for (int i = 0; i < cl->class_interface_count; ++i)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1680 vim_free(cl->class_interfaces[i]);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1681 vim_free(cl->class_interfaces);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1682 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1683 if (cl->class_interfaces_cl != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1684 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1685 for (int i = 0; i < cl->class_interface_count; ++i)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1686 class_unref(cl->class_interfaces_cl[i]);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1687 vim_free(cl->class_interfaces_cl);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1688 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1689 vim_free(cl->class_obj_members);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1690 vim_free(cl->class_obj_methods);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1691 vim_free(cl);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1692 }
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 vim_free(extends);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1695 class_unref(extends_cl);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1696
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1697 if (intf_classes != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1698 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1699 for (int i = 0; i < ga_impl.ga_len; ++i)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1700 class_unref(intf_classes[i]);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1701 vim_free(intf_classes);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1702 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1703 ga_clear_strings(&ga_impl);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1704
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1705 for (int round = 1; round <= 2; ++round)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1706 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1707 garray_T *gap = round == 1 ? &classmembers : &objmembers;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1708 if (gap->ga_len == 0 \|\| gap->ga_data == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1709 continue;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1710
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1711 for (int i = 0; i < gap->ga_len; ++i)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1712 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1713 ocmember_T m = ((ocmember_T )gap->ga_data) + i;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1714 vim_free(m->ocm_name);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1715 vim_free(m->ocm_init);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1716 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1717 ga_clear(gap);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1718 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1719
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1720 for (int i = 0; i < objmethods.ga_len; ++i)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1721 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1722 ufunc_T uf = ((ufunc_T *)objmethods.ga_data)[i];
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1723 func_clear_free(uf, FALSE);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1724 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1725 ga_clear(&objmethods);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1726
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1727 for (int i = 0; i < classfunctions.ga_len; ++i)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1728 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1729 ufunc_T uf = ((ufunc_T *)classfunctions.ga_data)[i];
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1730 func_clear_free(uf, FALSE);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1731 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1732 ga_clear(&classfunctions);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1733
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1734 clear_type_list(&type_list);
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
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1737 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1738 * 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	1739 * 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	1740 * 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	1741 * class members.
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1742 * 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	1743 * Set *p_m ocmmember_T if not NULL
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1744 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1745 type_T *
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1746 class_member_type(
33088 667a17904f64 patch 9.0.1829: Vim9 missing access-checks for private vars Christian Brabandt <cb@256bit.org> parents: 33070 diff changeset	1747 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	1748 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	1749 char_u *name,
667a17904f64 patch 9.0.1829: Vim9 missing access-checks for private vars Christian Brabandt <cb@256bit.org> parents: 33070 diff changeset	1750 char_u *name_end,
667a17904f64 patch 9.0.1829: Vim9 missing access-checks for private vars Christian Brabandt <cb@256bit.org> parents: 33070 diff changeset	1751 int *member_idx,
33106 d994ba4bd9ca patch 9.0.1837: Vim9: class_member_type() can be optimized Christian Brabandt <cb@256bit.org> parents: 33088 diff changeset	1752 ocmember_T **p_m)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1753 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1754 *member_idx = -1; // not found (yet)
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1755 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	1756 int member_count = is_object ? cl->class_obj_member_count
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1757 : cl->class_class_member_count;
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1758 ocmember_T *members = is_object ? cl->class_obj_members
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1759 : cl->class_class_members;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1760
33109 2b5cc29b0a0e patch 9.0.1838: Vim9: Cannot modify class member vars from def function Christian Brabandt <cb@256bit.org> parents: 33106 diff changeset	1761 for (int i = 0; i < member_count; ++i)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1762 {
33109 2b5cc29b0a0e patch 9.0.1838: Vim9: Cannot modify class member vars from def function Christian Brabandt <cb@256bit.org> parents: 33106 diff changeset	1763 ocmember_T *m = members + i;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1764 if (STRNCMP(m->ocm_name, name, len) == 0 && m->ocm_name[len] == NUL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1765 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1766 *member_idx = i;
33106 d994ba4bd9ca patch 9.0.1837: Vim9: class_member_type() can be optimized Christian Brabandt <cb@256bit.org> parents: 33088 diff changeset	1767 if (p_m != NULL)
d994ba4bd9ca patch 9.0.1837: Vim9: class_member_type() can be optimized Christian Brabandt <cb@256bit.org> parents: 33088 diff changeset	1768 *p_m = m;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1769 return m->ocm_type;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1770 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1771 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1772
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1773 semsg(_(e_unknown_variable_str), name);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1774 return &t_any;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1775 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1776
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1777 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1778 * Handle ":enum" up to ":endenum".
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1779 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1780 void
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1781 ex_enum(exarg_T *eap UNUSED)
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 // TODO
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1784 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1785
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1786 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1787 * Handle ":type".
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1788 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1789 void
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1790 ex_type(exarg_T *eap UNUSED)
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 // TODO
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1793 }
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 /*
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1796 * 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	1797 * 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	1798 * "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	1799 * 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	1800 */
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1801 static int
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1802 get_member_tv(
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1803 class_T *cl,
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1804 int is_object,
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1805 char_u *name,
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1806 size_t namelen,
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1807 typval_T *rettv)
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1808 {
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1809 int member_count = is_object ? cl->class_obj_member_count
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1810 : cl->class_class_member_count;
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1811 ocmember_T *members = is_object ? cl->class_obj_members
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1812 : cl->class_class_members;
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1813
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1814 for (int i = 0; i < member_count; ++i)
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1815 {
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1816 ocmember_T *m = &members[i];
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1817 if (STRNCMP(name, m->ocm_name, namelen) == 0
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1818 && m->ocm_name[namelen] == NUL)
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1819 {
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1820 if (*name == '_')
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1821 {
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1822 semsg(_(e_cannot_access_private_member_str), m->ocm_name);
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1823 return FAIL;
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1824 }
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1825
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1826 // The object only contains a pointer to the class, the member
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1827 // values array follows right after that.
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1828 object_T *obj = rettv->vval.v_object;
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1829 if (is_object)
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1830 {
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1831 typval_T tv = (typval_T )(obj + 1) + i;
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1832 copy_tv(tv, rettv);
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1833 }
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1834 else
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1835 copy_tv(&cl->class_members_tv[i], rettv);
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1836
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1837 object_unref(obj);
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1838
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1839 return OK;
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1840 }
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1841 }
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1842
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1843 return FAIL;
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1844 }
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1845
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1846 /*
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1847 * Evaluate what comes after a class:
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1848 * - class member: SomeClass.varname
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1849 * - class function: SomeClass.SomeMethod()
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1850 * - class constructor: SomeClass.new()
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1851 * - object member: someObject.varname
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1852 * - object method: someObject.SomeMethod()
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1853 *
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1854 * "*arg" points to the '.'.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1855 * "*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	1856 *
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1857 * Returns FAIL or OK.
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 int
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1860 class_object_index(
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1861 char_u **arg,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1862 typval_T *rettv,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1863 evalarg_T *evalarg,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1864 int verbose UNUSED) // give error messages
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 if (VIM_ISWHITE((*arg)[1]))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1867 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1868 semsg(_(e_no_white_space_allowed_after_str_str), ".", *arg);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1869 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1870 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1871
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1872 ++*arg;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1873 char_u name = arg;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1874 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	1875 if (name_end == name)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1876 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1877 size_t len = name_end - name;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1878
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1879 class_T *cl;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1880 if (rettv->v_type == VAR_CLASS)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1881 cl = rettv->vval.v_class;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1882 else // VAR_OBJECT
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1883 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1884 if (rettv->vval.v_object == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1885 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1886 emsg(_(e_using_null_object));
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1887 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1888 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1889 cl = rettv->vval.v_object->obj_class;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1890 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1891
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1892 if (cl == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1893 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1894 emsg(_(e_incomplete_type));
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1895 return FAIL;
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
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1898 if (*name_end == '(')
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 int on_class = rettv->v_type == VAR_CLASS;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1901 int count = on_class ? cl->class_class_function_count
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1902 : cl->class_obj_method_count;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1903 for (int i = 0; i < count; ++i)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1904 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1905 ufunc_T *fp = on_class ? cl->class_class_functions[i]
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1906 : cl->class_obj_methods[i];
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1907 // Use a separate pointer to avoid that ASAN complains about
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1908 // uf_name[] only being 4 characters.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1909 char_u ufname = (char_u )fp->uf_name;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1910 if (STRNCMP(name, ufname, len) == 0 && ufname[len] == NUL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1911 {
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1912 typval_T argvars[MAX_FUNC_ARGS + 1];
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1913 int argcount = 0;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1914
33070 8362975375a4 patch 9.0.1822: Vim9: no check for duplicate members in extended classes Christian Brabandt <cb@256bit.org> parents: 33068 diff changeset	1915 if (*ufname == '_')
33025 1d18c7fe609f patch 9.0.1804: Vim9: no support for private object methods Christian Brabandt <cb@256bit.org> parents: 33006 diff changeset	1916 {
1d18c7fe609f patch 9.0.1804: Vim9: no support for private object methods Christian Brabandt <cb@256bit.org> parents: 33006 diff changeset	1917 // Cannot access a private method outside of a class
1d18c7fe609f patch 9.0.1804: Vim9: no support for private object methods Christian Brabandt <cb@256bit.org> parents: 33006 diff changeset	1918 semsg(_(e_cannot_access_private_method_str), name);
1d18c7fe609f patch 9.0.1804: Vim9: no support for private object methods Christian Brabandt <cb@256bit.org> parents: 33006 diff changeset	1919 return FAIL;
1d18c7fe609f patch 9.0.1804: Vim9: no support for private object methods Christian Brabandt <cb@256bit.org> parents: 33006 diff changeset	1920 }
1d18c7fe609f patch 9.0.1804: Vim9: no support for private object methods Christian Brabandt <cb@256bit.org> parents: 33006 diff changeset	1921
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1922 char_u *argp = name_end;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1923 int ret = get_func_arguments(&argp, evalarg, 0,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1924 argvars, &argcount);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1925 if (ret == FAIL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1926 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1927
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1928 funcexe_T funcexe;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1929 CLEAR_FIELD(funcexe);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1930 funcexe.fe_evaluate = TRUE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1931 if (rettv->v_type == VAR_OBJECT)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1932 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1933 funcexe.fe_object = rettv->vval.v_object;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1934 ++funcexe.fe_object->obj_refcount;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1935 }
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 // Clear the class or object after calling the function, in
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1938 // case the refcount is one.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1939 typval_T tv_tofree = *rettv;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1940 rettv->v_type = VAR_UNKNOWN;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1941
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1942 // Call the user function. Result goes into rettv;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1943 int error = call_user_func_check(fp, argcount, argvars,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1944 rettv, &funcexe, NULL);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1945
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1946 // Clear the previous rettv and the arguments.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1947 clear_tv(&tv_tofree);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1948 for (int idx = 0; idx < argcount; ++idx)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1949 clear_tv(&argvars[idx]);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1950
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1951 if (error != FCERR_NONE)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1952 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1953 user_func_error(error, printable_func_name(fp),
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1954 funcexe.fe_found_var);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1955 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1956 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1957 *arg = argp;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1958 return OK;
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
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1962 semsg(_(e_method_not_found_on_class_str_str), cl->class_name, name);
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
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1965 else if (rettv->v_type == VAR_OBJECT)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1966 {
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1967 // 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	1968 // variable table.
33225 52b121d4feb5 patch 9.0.1887: Vim9: class members are accessible via object Christian Brabandt <cb@256bit.org> parents: 33217 diff changeset	1969 if (get_member_tv(cl, TRUE, name, len, rettv) == OK)
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1970 {
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1971 *arg = name_end;
36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	1972 return OK;
32670 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
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1975 semsg(_(e_member_not_found_on_object_str_str), cl->class_name, name);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1976 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1977
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1978 else if (rettv->v_type == VAR_CLASS)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1979 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1980 // class member
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1981 for (int i = 0; i < cl->class_class_member_count; ++i)
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 ocmember_T *m = &cl->class_class_members[i];
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1984 if (STRNCMP(name, m->ocm_name, len) == 0 && m->ocm_name[len] == NUL)
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 (*name == '_')
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 semsg(_(e_cannot_access_private_member_str), m->ocm_name);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1989 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1990 }
33173 9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	1991 if ((cl->class_flags & CLASS_INTERFACE) != 0)
9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	1992 {
9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	1993 semsg(_(e_interface_static_direct_access_str),
9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	1994 cl->class_name, m->ocm_name);
9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	1995 return FAIL;
9efd99a717c1 patch 9.0.1867: Vim9: access to interface statics possible Christian Brabandt <cb@256bit.org> parents: 33160 diff changeset	1996 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1997
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1998 typval_T *tv = &cl->class_members_tv[i];
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	1999 copy_tv(tv, rettv);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2000 class_unref(cl);
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 *arg = name_end;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2003 return OK;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2004 }
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
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2007 semsg(_(e_member_not_found_on_class_str_str), cl->class_name, name);
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
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2010 return FAIL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2011 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2012
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 * 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	2015 * Otherwise return NULL.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2016 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2017 ufunc_T *
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2018 find_class_func(char_u **arg)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2019 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2020 char_u name = arg;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2021 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	2022 if (name_end == name \|\| *name_end != '.')
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2023 return NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2024
33201 36c13b964eb3 patch 9.0.1879: Vim9: incorrect duplicate class member detection Christian Brabandt <cb@256bit.org> parents: 33173 diff changeset	2025 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	2026 typval_T tv;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2027 tv.v_type = VAR_UNKNOWN;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2028 if (eval_variable(name, (int)len,
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2029 0, &tv, NULL, EVAL_VAR_NOAUTOLOAD) == FAIL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2030 return NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2031 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	2032 goto fail_after_eval;
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 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	2035 : tv.vval.v_object->obj_class;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2036 if (cl == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2037 goto fail_after_eval;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2038 char_u *fname = name_end + 1;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2039 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	2040 if (fname_end == fname)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2041 goto fail_after_eval;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2042 len = fname_end - fname;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2043
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2044 int count = tv.v_type == VAR_CLASS ? cl->class_class_function_count
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2045 : cl->class_obj_method_count;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2046 ufunc_T **funcs = tv.v_type == VAR_CLASS ? cl->class_class_functions
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2047 : cl->class_obj_methods;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2048 for (int i = 0; i < count; ++i)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2049 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2050 ufunc_T *fp = funcs[i];
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2051 // Use a separate pointer to avoid that ASAN complains about
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2052 // uf_name[] only being 4 characters.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2053 char_u ufname = (char_u )fp->uf_name;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2054 if (STRNCMP(fname, ufname, len) == 0 && ufname[len] == NUL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2055 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2056 clear_tv(&tv);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2057 return fp;
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 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2060
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2061 fail_after_eval:
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2062 clear_tv(&tv);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2063 return NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2064 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2065
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2066 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2067 * If "name[len]" is a class member in cctx->ctx_ufunc->uf_class return the
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2068 * index in class.class_class_members[].
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2069 * If "cl_ret" is not NULL set it to the class.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2070 * Otherwise return -1;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2071 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2072 int
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2073 class_member_index(char_u name, size_t len, class_T cl_ret, cctx_T cctx)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2074 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2075 if (cctx == NULL \|\| cctx->ctx_ufunc == NULL
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2076 \|\| cctx->ctx_ufunc->uf_class == NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2077 return -1;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2078 class_T *cl = cctx->ctx_ufunc->uf_class;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2079
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2080 for (int i = 0; i < cl->class_class_member_count; ++i)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2081 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2082 ocmember_T *m = &cl->class_class_members[i];
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2083 if (STRNCMP(name, m->ocm_name, len) == 0 && m->ocm_name[len] == NUL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2084 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2085 if (cl_ret != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2086 *cl_ret = cl;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2087 return i;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2088 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2089 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2090 return -1;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2091 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2092
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2093 /*
33227 3672d3d13524 patch 9.0.1888: Vim9: Problem trying to invoke class method Christian Brabandt <cb@256bit.org> parents: 33225 diff changeset	2094 * If "name[len]" is a class method in cctx->ctx_ufunc->uf_class return the
3672d3d13524 patch 9.0.1888: Vim9: Problem trying to invoke class method Christian Brabandt <cb@256bit.org> parents: 33225 diff changeset	2095 * index in class.class_class_functions[].
3672d3d13524 patch 9.0.1888: Vim9: Problem trying to invoke class method Christian Brabandt <cb@256bit.org> parents: 33225 diff changeset	2096 * If "cl_ret" is not NULL set it to the class.
3672d3d13524 patch 9.0.1888: Vim9: Problem trying to invoke class method Christian Brabandt <cb@256bit.org> parents: 33225 diff changeset	2097 * Otherwise return -1.
3672d3d13524 patch 9.0.1888: Vim9: Problem trying to invoke class method Christian Brabandt <cb@256bit.org> parents: 33225 diff changeset	2098 */
3672d3d13524 patch 9.0.1888: Vim9: Problem trying to invoke class method Christian Brabandt <cb@256bit.org> parents: 33225 diff changeset	2099 int
3672d3d13524 patch 9.0.1888: Vim9: Problem trying to invoke class method Christian Brabandt <cb@256bit.org> parents: 33225 diff changeset	2100 class_method_index(char_u name, size_t len, class_T cl_ret, cctx_T cctx)
3672d3d13524 patch 9.0.1888: Vim9: Problem trying to invoke class method Christian Brabandt <cb@256bit.org> parents: 33225 diff changeset	2101 {
3672d3d13524 patch 9.0.1888: Vim9: Problem trying to invoke class method Christian Brabandt <cb@256bit.org> parents: 33225 diff changeset	2102 if (cctx == NULL \|\| cctx->ctx_ufunc == NULL
3672d3d13524 patch 9.0.1888: Vim9: Problem trying to invoke class method Christian Brabandt <cb@256bit.org> parents: 33225 diff changeset	2103 \|\| cctx->ctx_ufunc->uf_class == NULL)
3672d3d13524 patch 9.0.1888: Vim9: Problem trying to invoke class method Christian Brabandt <cb@256bit.org> parents: 33225 diff changeset	2104 return -1;
3672d3d13524 patch 9.0.1888: Vim9: Problem trying to invoke class method Christian Brabandt <cb@256bit.org> parents: 33225 diff changeset	2105 class_T *cl = cctx->ctx_ufunc->uf_class;
3672d3d13524 patch 9.0.1888: Vim9: Problem trying to invoke class method Christian Brabandt <cb@256bit.org> parents: 33225 diff changeset	2106
3672d3d13524 patch 9.0.1888: Vim9: Problem trying to invoke class method Christian Brabandt <cb@256bit.org> parents: 33225 diff changeset	2107 for (int i = 0; i < cl->class_class_function_count; ++i)
3672d3d13524 patch 9.0.1888: Vim9: Problem trying to invoke class method Christian Brabandt <cb@256bit.org> parents: 33225 diff changeset	2108 {
3672d3d13524 patch 9.0.1888: Vim9: Problem trying to invoke class method Christian Brabandt <cb@256bit.org> parents: 33225 diff changeset	2109 ufunc_T *fp = cl->class_class_functions[i];
3672d3d13524 patch 9.0.1888: Vim9: Problem trying to invoke class method Christian Brabandt <cb@256bit.org> parents: 33225 diff changeset	2110 if (STRNCMP(name, fp->uf_name, len) == 0 && fp->uf_name[len] == NUL)
3672d3d13524 patch 9.0.1888: Vim9: Problem trying to invoke class method Christian Brabandt <cb@256bit.org> parents: 33225 diff changeset	2111 {
3672d3d13524 patch 9.0.1888: Vim9: Problem trying to invoke class method Christian Brabandt <cb@256bit.org> parents: 33225 diff changeset	2112 if (cl_ret != NULL)
3672d3d13524 patch 9.0.1888: Vim9: Problem trying to invoke class method Christian Brabandt <cb@256bit.org> parents: 33225 diff changeset	2113 *cl_ret = cl;
3672d3d13524 patch 9.0.1888: Vim9: Problem trying to invoke class method Christian Brabandt <cb@256bit.org> parents: 33225 diff changeset	2114 return i;
3672d3d13524 patch 9.0.1888: Vim9: Problem trying to invoke class method Christian Brabandt <cb@256bit.org> parents: 33225 diff changeset	2115 }
3672d3d13524 patch 9.0.1888: Vim9: Problem trying to invoke class method Christian Brabandt <cb@256bit.org> parents: 33225 diff changeset	2116 }
3672d3d13524 patch 9.0.1888: Vim9: Problem trying to invoke class method Christian Brabandt <cb@256bit.org> parents: 33225 diff changeset	2117 return -1;
3672d3d13524 patch 9.0.1888: Vim9: Problem trying to invoke class method Christian Brabandt <cb@256bit.org> parents: 33225 diff changeset	2118 }
3672d3d13524 patch 9.0.1888: Vim9: Problem trying to invoke class method Christian Brabandt <cb@256bit.org> parents: 33225 diff changeset	2119
3672d3d13524 patch 9.0.1888: Vim9: Problem trying to invoke class method Christian Brabandt <cb@256bit.org> parents: 33225 diff changeset	2120 /*
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2121 * 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	2122 * Return FALSE if not.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2123 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2124 int
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2125 inside_class(cctx_T cctx_arg, class_T cl)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2126 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2127 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	2128 if (cctx->ctx_ufunc != NULL
36aebbf8389f patch 9.0.1880: Vim9: Need more tests for inheritance Christian Brabandt <cb@256bit.org> parents: 33201 diff changeset	2129 && class_instance_of(cctx->ctx_ufunc->uf_class, cl))
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2130 return TRUE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2131 return FALSE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2132 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2133
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2134 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2135 * Make a copy of an object.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2136 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2137 void
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2138 copy_object(typval_T from, typval_T to)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2139 {
32960 d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	2140 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	2141 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	2142 else
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	2143 {
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	2144 to->vval.v_object = from->vval.v_object;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2145 ++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	2146 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2147 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2148
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2149 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2150 * Free an object.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2151 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2152 static void
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2153 object_clear(object_T *obj)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2154 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2155 // Avoid a recursive call, it can happen if "obj" has a circular reference.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2156 obj->obj_refcount = INT_MAX;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2157
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2158 class_T *cl = obj->obj_class;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2159
32792 ba5a67216596 patch 9.0.1712: missing null check in object_clear() Christian Brabandt <cb@256bit.org> parents: 32772 diff changeset	2160 if (!cl)
33006 29b2193466e0 patch 9.0.1795: Indentation issues Christian Brabandt <cb@256bit.org> parents: 32972 diff changeset	2161 return;
32792 ba5a67216596 patch 9.0.1712: missing null check in object_clear() Christian Brabandt <cb@256bit.org> parents: 32772 diff changeset	2162
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2163 // the member values are just after the object structure
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2164 typval_T tv = (typval_T )(obj + 1);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2165 for (int i = 0; i < cl->class_obj_member_count; ++i)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2166 clear_tv(tv + i);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2167
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2168 // Remove from the list headed by "first_object".
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2169 object_cleared(obj);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2170
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2171 vim_free(obj);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2172 class_unref(cl);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2173 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2174
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2175 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2176 * Unreference an object.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2177 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2178 void
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2179 object_unref(object_T *obj)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2180 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2181 if (obj != NULL && --obj->obj_refcount <= 0)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2182 object_clear(obj);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2183 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2184
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2185 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2186 * Make a copy of a class.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2187 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2188 void
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2189 copy_class(typval_T from, typval_T to)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2190 {
32960 d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	2191 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	2192 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	2193 else
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	2194 {
d5c05e15cf81 patch 9.0.1780: Vim9 type not defined during object creation Christian Brabandt <cb@256bit.org> parents: 32903 diff changeset	2195 to->vval.v_class = from->vval.v_class;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2196 ++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	2197 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2198 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2199
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2200 /*
33160 4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2201 * 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	2202 */
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2203 static void
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2204 class_free(class_T *cl)
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2205 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2206 // 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	2207 // 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	2208 // be freed.
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2209 VIM_CLEAR(cl->class_name);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2210
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2211 class_unref(cl->class_extends);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2212
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2213 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	2214 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2215 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	2216 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	2217 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	2218 }
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2219 vim_free(cl->class_interfaces);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2220 vim_free(cl->class_interfaces_cl);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2221
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2222 itf2class_T *next;
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2223 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	2224 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2225 next = i2c->i2c_next;
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2226 vim_free(i2c);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2227 }
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2228
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2229 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	2230 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2231 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	2232 vim_free(m->ocm_name);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2233 vim_free(m->ocm_init);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2234 if (cl->class_members_tv != NULL)
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2235 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	2236 }
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2237 vim_free(cl->class_class_members);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2238 vim_free(cl->class_members_tv);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2239
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2240 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	2241 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2242 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	2243 vim_free(m->ocm_name);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2244 vim_free(m->ocm_init);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2245 }
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2246 vim_free(cl->class_obj_members);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2247
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2248 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	2249 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2250 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	2251 func_clear_free(uf, FALSE);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2252 }
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2253 vim_free(cl->class_class_functions);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2254
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2255 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	2256 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2257 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	2258 func_clear_free(uf, FALSE);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2259 }
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2260 vim_free(cl->class_obj_methods);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2261
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2262 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	2263
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2264 class_cleared(cl);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2265
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2266 vim_free(cl);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2267 }
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2268
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2269 /*
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2270 * 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	2271 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2272 void
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2273 class_unref(class_T *cl)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2274 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2275 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	2276 class_free(cl);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2277 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2278
33160 4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2279 /*
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2280 * 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	2281 */
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2282 int
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2283 class_free_nonref(int copyID)
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2284 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2285 int did_free = FALSE;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2286
33160 4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2287 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	2288 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2289 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	2290 if ((cl->class_copyID & COPYID_MASK) != (copyID & COPYID_MASK))
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2291 {
33160 4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2292 // 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	2293 class_free(cl);
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2294 did_free = TRUE;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2295 }
33160 4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2296 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2297
33160 4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2298 next_nonref_class = NULL;
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2299 return did_free;
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2300 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2301
33160 4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2302 int
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2303 set_ref_in_classes(int copyID)
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2304 {
4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2305 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	2306 set_ref_in_item_class(cl, copyID, NULL, NULL);
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2307
33160 4ecf54d709b3 patch 9.0.1862: Vim9 Garbage Collection issues Christian Brabandt <cb@256bit.org> parents: 33119 diff changeset	2308 return FALSE;
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2309 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2310
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2311 static object_T *first_object = NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2312
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2313 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2314 * 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	2315 * list headed by "first_object".
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2316 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2317 void
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2318 object_created(object_T *obj)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2319 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2320 if (first_object != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2321 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2322 obj->obj_next_used = first_object;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2323 first_object->obj_prev_used = obj;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2324 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2325 first_object = obj;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2326 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2327
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2328 static object_T *next_nonref_obj = NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2329
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2330 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2331 * 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	2332 * It is removed from the list headed by "first_object".
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2333 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2334 void
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2335 object_cleared(object_T *obj)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2336 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2337 if (obj->obj_next_used != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2338 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	2339 if (obj->obj_prev_used != NULL)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2340 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	2341 else if (first_object == obj)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2342 first_object = obj->obj_next_used;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2343
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2344 // update the next object to check if needed
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2345 if (obj == next_nonref_obj)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2346 next_nonref_obj = obj->obj_next_used;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2347 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2348
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2349 /*
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2350 * 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	2351 */
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2352 int
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2353 object_free_nonref(int copyID)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2354 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2355 int did_free = FALSE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2356
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2357 for (object_T *obj = first_object; obj != NULL; obj = next_nonref_obj)
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2358 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2359 next_nonref_obj = obj->obj_next_used;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2360 if ((obj->obj_copyID & COPYID_MASK) != (copyID & COPYID_MASK))
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2361 {
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2362 // Free the object and items it contains.
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2363 object_clear(obj);
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2364 did_free = TRUE;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2365 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2366 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2367
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2368 next_nonref_obj = NULL;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2369 return did_free;
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2370 }
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2371
32972 e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2372 /*
33006 29b2193466e0 patch 9.0.1795: Indentation issues Christian Brabandt <cb@256bit.org> parents: 32972 diff changeset	2373 * 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	2374 * 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	2375 */
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2376 int
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2377 class_instance_of(class_T cl, class_T other_cl)
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2378 {
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2379 if (cl == other_cl)
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2380 return TRUE;
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2381
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2382 // Recursively check the base classes.
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2383 for (; cl != NULL; cl = cl->class_extends)
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2384 {
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2385 if (cl == other_cl)
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2386 return TRUE;
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2387 // Check the implemented interfaces.
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2388 for (int i = cl->class_interface_count - 1; i >= 0; --i)
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2389 if (cl->class_interfaces_cl[i] == other_cl)
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2390 return TRUE;
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2391 }
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2392
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2393 return FALSE;
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2394 }
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2395
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2396 /*
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2397 * "instanceof(object, classinfo)" function
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2398 */
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2399 void
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2400 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	2401 {
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2402 typval_T *object_tv = &argvars[0];
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2403 typval_T *classinfo_tv = &argvars[1];
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2404 listitem_T *li;
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2405
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2406 rettv->vval.v_number = VVAL_FALSE;
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2407
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2408 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	2409 \|\| 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	2410 return;
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2411
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2412 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	2413 {
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2414 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	2415 {
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2416 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	2417 {
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2418 emsg(_(e_class_required));
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2419 return;
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2420 }
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2421
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2422 if (class_instance_of(object_tv->vval.v_object->obj_class,
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2423 li->li_tv.vval.v_class) == TRUE)
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2424 {
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2425 rettv->vval.v_number = VVAL_TRUE;
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2426 return;
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2427 }
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2428 }
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2429 }
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2430 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	2431 {
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2432 rettv->vval.v_number = class_instance_of(object_tv->vval.v_object->obj_class,
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2433 classinfo_tv->vval.v_class);
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2434 }
e4851934751a patch 9.0.1786: Vim9: need instanceof() function Christian Brabandt <cb@256bit.org> parents: 32960 diff changeset	2435 }
32670 695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2436
695b50472e85 Fix line endings issue Christian Brabandt <cb@256bit.org> parents: 32669 diff changeset	2437 #endif // FEAT_EVAL

Mercurial > vim

annotate src/vim9class.c @ 33227:3672d3d13524 v9.0.1888