aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 9.0.1999: Vim9: some error messages can be improved

Browse Source 
Problem:  Vim9: some error messages can be improved
Solution: Mention the defining class for variable access error message

closes: #13272

Signed-off-by: Christian Brabandt <cb@256bit.org>
Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Co-authored-by: Ernie Rael <errael@raelity.com>
This commit is contained in:
Ernie Rael
2023-10-06 19:55:52 +02:00
committed by Christian Brabandt
parent 85f4521808
commit e6c9aa5e6a
8 changed files with 204 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/vim9class.c
View File

@@ -2167,8 +2167,8 @@ get_member_tv(
if (*name == '_')
{
semsg(_(e_cannot_access_private_variable_str), m->ocm_name,
cl->class_name);
emsg_var_cl_define(e_cannot_access_private_variable_str,
m->ocm_name, 0, cl);
return FAIL;
}
@@ -2329,8 +2329,8 @@ class_object_index(
if (*name == '_')
{
semsg(_(e_cannot_access_private_variable_str), m->ocm_name,
cl->class_name);
emsg_var_cl_define(e_cannot_access_private_variable_str,
m->ocm_name, 0, cl);
return FAIL;
}
@@ -2580,6 +2580,57 @@ member_lookup(
return object_member_lookup(cl, name, namelen, idx);
}
/*
* Find the class that defines the named member. Look up the hierarchy
* starting at "cl".
*
* Return the class that defines the member "name", else NULL.
* Fill in "p_m", if specified, for ocmember_T in found class.
*/
// NOTE: if useful for something could also indirectly return vartype and idx.
static class_T *
class_defining_member(class_T *cl, char_u *name, size_t len, ocmember_T **p_m)
{
class_T *cl_found = NULL;
vartype_T vartype = VAR_UNKNOWN;
ocmember_T *m_found = NULL;
len = len != 0 ? len : STRLEN(name);
// Loop assumes if member is not defined in "cl", then it is not
// defined in any super class; the last class where it's found is the
// class where it is defined. Once the vartype is found, the other
// type is no longer checked.
for (class_T *super = cl; super != NULL; super = super->class_extends)
{
class_T *cl_tmp = NULL;
ocmember_T *m = NULL;
if (vartype == VAR_UNKNOWN || vartype == VAR_OBJECT)
{
if ((m = object_member_lookup(super, name, len, NULL)) != NULL)
{
cl_tmp = super;
vartype = VAR_OBJECT;
}
}
if (vartype == VAR_UNKNOWN || vartype == VAR_CLASS)
{
if (( m = class_member_lookup(super, name, len, NULL)) != NULL)
{
cl_tmp = super;
vartype = VAR_OBJECT;
}
}
if (cl_tmp == NULL)
break; // member is not in this or any super class.
cl_found = cl_tmp;
m_found = m;
}
if (p_m != NULL)
*p_m = m_found;
return cl_found;
}
/*
* Lookup a class or object method by name. If v_type is VAR_CLASS, then
* lookup a class method and if it is VAR_OBJECT, then lookup a object method.
@@ -2853,6 +2904,22 @@ object_free_nonref(int copyID)
return did_free;
}
/*
* Output message which takes a variable name and the class that defines it.
* "cl" is that class where the name was found. Search "cl"'s hierarchy to
* find the defining class.
*/
void
emsg_var_cl_define(char *msg, char_u *name, size_t len, class_T *cl)
{
ocmember_T *m;
class_T *cl_def = class_defining_member(cl, name, len, &m);
if (cl_def != NULL)
semsg(_(msg), m->ocm_name, cl_def->class_name);
else
emsg(_(e_internal_error_please_report_a_bug));
}
/*
* Echo a class or object method not found message.
*/