Mercurial > vim

comparison src/eval.c @ 34472:5c1a025192ed v9.1.0148

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.1.0148: Vim9: can't call internal methods with objects Commit: https://github.com/vim/vim/commit/d3eae7bc116297f70220f21ded436ed0a88066d8 Author: Yegappan Lakshmanan <yegappan@yahoo.com> Date: Sun Mar 3 16:26:58 2024 +0100 patch 9.1.0148: Vim9: can't call internal methods with objects Problem: Vim9: can't call internal methods with objects Solution: Add support for empty(), len() and string() function calls for objects (Yegappan Lakshmanan) closes: #14129 Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Sun, 03 Mar 2024 16:45:06 +0100
parents 6df143135376
children 64edf95a833a
comparison
equal deleted inserted replaced
34471:7f6302969e3d 34472:5c1a025192ed
6316 cl == NULL ? "[unknown]" : (char *)cl->class_name); 6316 cl == NULL ? "[unknown]" : (char *)cl->class_name);
6317 } 6317 }
6318 break; 6318 break;
6319 6319
6320 case VAR_OBJECT: 6320 case VAR_OBJECT:
6321 { 6321 *tofree = r = object_string(tv->vval.v_object, numbuf, copyID,
6322 garray_T ga; 6322 echo_style, restore_copyID,
6323 ga_init2(&ga, 1, 50); 6323 composite_val);
6324 ga_concat(&ga, (char_u *)"object of ");
6325 object_T *obj = tv->vval.v_object;
6326 class_T *cl = obj == NULL ? NULL : obj->obj_class;
6327 ga_concat(&ga, cl == NULL ? (char_u *)"[unknown]"
6328 : cl->class_name);
6329 if (cl != NULL)
6330 {
6331 ga_concat(&ga, (char_u *)" {");
6332 for (int i = 0; i < cl->class_obj_member_count; ++i)
6333 {
6334 if (i > 0)
6335 ga_concat(&ga, (char_u *)", ");
6336 ocmember_T *m = &cl->class_obj_members[i];
6337 ga_concat(&ga, m->ocm_name);
6338 ga_concat(&ga, (char_u *)": ");
6339 char_u *tf = NULL;
6340 ga_concat(&ga, echo_string_core(
6341 (typval_T *)(obj + 1) + i,
6342 &tf, numbuf, copyID, echo_style,
6343 restore_copyID, composite_val));
6344 vim_free(tf);
6345 }
6346 ga_concat(&ga, (char_u *)"}");
6347 }
6348
6349 *tofree = r = ga.ga_data;
6350 }
6351 break; 6324 break;
6352 6325
6353 case VAR_FLOAT: 6326 case VAR_FLOAT:
6354 *tofree = NULL; 6327 *tofree = NULL;
6355 vim_snprintf((char *)numbuf, NUMBUFLEN, "%g", tv->vval.v_float); 6328 vim_snprintf((char *)numbuf, NUMBUFLEN, "%g", tv->vval.v_float);