diff options
| author | Bram Moolenaar <Bram@vim.org> | 2023-02-21 19:55:14 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2023-02-21 19:55:14 +0000 |
| commit | 99a7c0d89cf77c0a908b60191e63f41f04f9e793 (patch) | |
| tree | f69745ee2fa5641b0934326c92cdd6920df59e56 /src/eval.c | |
| parent | cfce5cf542db20c7beba5b4211c0ae3305a64a43 (diff) | |
patch 9.0.1338: :defcompile and :disassemble can't find class methodv9.0.1338
Problem: :defcompile and :disassemble can't find class method. (Ernie Rael)
Solution: Make a class name and class.method name work. (closes #11984)
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 94 |
1 files changed, 65 insertions, 29 deletions
diff --git a/src/eval.c b/src/eval.c index a0bbabfe3c..0d32fa046f 100644 --- a/src/eval.c +++ b/src/eval.c @@ -1529,45 +1529,81 @@ get_lval( if (cl != NULL) { lp->ll_valtype = NULL; - int count = v_type == VAR_OBJECT ? cl->class_obj_member_count - : cl->class_class_member_count; - ocmember_T *members = v_type == VAR_OBJECT - ? cl->class_obj_members - : cl->class_class_members; - for (int i = 0; i < count; ++i) + + if (flags & GLV_PREFER_FUNC) { - ocmember_T *om = members + i; - if (STRNCMP(om->ocm_name, key, p - key) == 0 - && om->ocm_name[p - key] == NUL) + // First look for a function with this name. + // round 1: class functions (skipped for an object) + // round 2: object methods + for (int round = v_type == VAR_OBJECT ? 2 : 1; + round <= 2; ++round) { - switch (om->ocm_access) + int count = round == 1 + ? cl->class_class_function_count + : cl->class_obj_method_count; + ufunc_T **funcs = round == 1 + ? cl->class_class_functions + : cl->class_obj_methods; + for (int i = 0; i < count; ++i) { - case ACCESS_PRIVATE: - semsg(_(e_cannot_access_private_member_str), - om->ocm_name); - return NULL; - case ACCESS_READ: - if (!(flags & GLV_READ_ONLY)) - { - semsg(_(e_member_is_not_writable_str), + ufunc_T *fp = funcs[i]; + char_u *ufname = (char_u *)fp->uf_name; + if (STRNCMP(ufname, key, p - key) == 0 + && ufname[p - key] == NUL) + { + lp->ll_ufunc = fp; + lp->ll_valtype = fp->uf_func_type; + round = 3; + break; + } + } + } + } + + if (lp->ll_valtype == NULL) + { + int count = v_type == VAR_OBJECT + ? cl->class_obj_member_count + : cl->class_class_member_count; + ocmember_T *members = v_type == VAR_OBJECT + ? cl->class_obj_members + : cl->class_class_members; + for (int i = 0; i < count; ++i) + { + ocmember_T *om = members + i; + if (STRNCMP(om->ocm_name, key, p - key) == 0 + && om->ocm_name[p - key] == NUL) + { + switch (om->ocm_access) + { + case ACCESS_PRIVATE: + semsg(_(e_cannot_access_private_member_str), om->ocm_name); return NULL; - } - break; - case ACCESS_ALL: - break; - } + case ACCESS_READ: + if ((flags & GLV_READ_ONLY) == 0) + { + semsg(_(e_member_is_not_writable_str), + om->ocm_name); + return NULL; + } + break; + case ACCESS_ALL: + break; + } - lp->ll_valtype = om->ocm_type; + lp->ll_valtype = om->ocm_type; - if (v_type == VAR_OBJECT) - lp->ll_tv = ((typval_T *)( + if (v_type == VAR_OBJECT) + lp->ll_tv = ((typval_T *)( lp->ll_tv->vval.v_object + 1)) + i; - else - lp->ll_tv = &cl->class_members_tv[i]; - break; + else + lp->ll_tv = &cl->class_members_tv[i]; + break; + } } } + if (lp->ll_valtype == NULL) { if (v_type == VAR_OBJECT) |