aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 9.0.1837: Vim9: class_member_type() can be optimized

Browse Source 
Problem:  Vim9: class_member_type() can be optimized
Solution: class_member_type() provides more information;
          safe an additional alloc()/free()

closes: #12989

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Ernie Rael <errael@raelity.com>
This commit is contained in:
Ernie Rael 2023-09-01 18:54:54 +02:00 committed by Christian Brabandt
parent c41b7a26fc
commit 456ae556b4
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
4 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/proto/vim9class.pro
View File

@ -1,7 +1,7 @@
/* vim9class.c */ /* vim9class.c */
int object_index_from_itf_index(class_T *itf, int is_method, int idx, class_T *cl); int object_index_from_itf_index(class_T *itf, int is_method, int idx, class_T *cl);
void ex_class(exarg_T *eap); void ex_class(exarg_T *eap);
type_T *class_member_type(class_T *cl, char_u *name, char_u *name_end, int *member_idx, omacc_T *access); type_T *class_member_type(class_T *cl, char_u *name, char_u *name_end, int *member_idx, ocmember_T **m);
void ex_enum(exarg_T *eap); void ex_enum(exarg_T *eap);
void ex_type(exarg_T *eap); void ex_type(exarg_T *eap);
int class_object_index(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int verbose); int class_object_index(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int verbose);

2
src/version.c
View File

@ -699,6 +699,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1837,
/**/ /**/
1836, 1836,
/**/ /**/

6
src/vim9class.c
View File

@ -1554,6 +1554,7 @@ cleanup:
* Find member "name" in class "cl", set "member_idx" to the member index and * Find member "name" in class "cl", set "member_idx" to the member index and
* return its type. * return its type.
* When not found "member_idx" is set to -1 and t_any is returned. * When not found "member_idx" is set to -1 and t_any is returned.
* Set *p_m ocmmember_T if not NULL
*/ */
type_T * type_T *
class_member_type( class_member_type(
@ -1561,7 +1562,7 @@ class_member_type(
char_u *name, char_u *name,
char_u *name_end, char_u *name_end,
int *member_idx, int *member_idx,
omacc_T *access) ocmember_T **p_m)
{ {
*member_idx = -1; // not found (yet) *member_idx = -1; // not found (yet)
size_t len = name_end - name; size_t len = name_end - name;
@ -1572,7 +1573,8 @@ class_member_type(
if (STRNCMP(m->ocm_name, name, len) == 0 && m->ocm_name[len] == NUL) if (STRNCMP(m->ocm_name, name, len) == 0 && m->ocm_name[len] == NUL)
{ {
*member_idx = i; *member_idx = i;
*access = m->ocm_access; if (p_m != NULL)
*p_m = m;
return m->ocm_type; return m->ocm_type;
} }
} }

19
src/vim9compile.c
View File

@ -1866,27 +1866,21 @@ compile_lhs(
{ {
// for an object or class member get the type of the member // for an object or class member get the type of the member
class_T *cl = lhs->lhs_type->tt_class; class_T *cl = lhs->lhs_type->tt_class;
omacc_T access; ocmember_T *m;
lhs->lhs_member_type = class_member_type(cl, after + 1, lhs->lhs_member_type = class_member_type(cl, after + 1,
lhs->lhs_end, &lhs->lhs_member_idx, lhs->lhs_end, &lhs->lhs_member_idx, &m);
&access);
if (lhs->lhs_member_idx < 0) if (lhs->lhs_member_idx < 0)
return FAIL; return FAIL;
// If it is private member variable, then accessing it outside the // If it is private member variable, then accessing it outside the
// class is not allowed. // class is not allowed.
if ((access != VIM_ACCESS_ALL) && !inside_class(cctx, cl)) if ((m->ocm_access != VIM_ACCESS_ALL) && !inside_class(cctx, cl))
{ {
char_u *m_name; char *msg = (m->ocm_access == VIM_ACCESS_PRIVATE)
char *msg;
m_name = vim_strnsave(after + 1, lhs->lhs_end - after - 1);
msg = (access == VIM_ACCESS_PRIVATE)
? e_cannot_access_private_member_str ? e_cannot_access_private_member_str
: e_cannot_change_readonly_variable_str; : e_cannot_change_readonly_variable_str;
semsg(_(msg), m_name); semsg(_(msg), m->ocm_name);
vim_free(m_name);
return FAIL; return FAIL;
} }
} }
@ -2097,10 +2091,9 @@ compile_load_lhs_with_index(lhs_T *lhs, char_u *var_start, cctx_T *cctx)
return FAIL; return FAIL;
class_T *cl = lhs->lhs_type->tt_class; class_T *cl = lhs->lhs_type->tt_class;
omacc_T access;
type_T *type = class_member_type(cl, dot + 1, type_T *type = class_member_type(cl, dot + 1,
lhs->lhs_end, &lhs->lhs_member_idx, lhs->lhs_end, &lhs->lhs_member_idx,
&access); NULL);
if (lhs->lhs_member_idx < 0) if (lhs->lhs_member_idx < 0)
return FAIL; return FAIL;