Patch 9.0.1139

[Bram Moolenaar]

Patch 9.0.1139
Problem: Cannot create a new object in a compiled function.
Solution: Compile the instructins to create a new object.
Files: src/vim9type.c, src/vim9expr.c, src/testdir/test_vim9_class.vim


*** ../vim-9.0.1138/src/vim9type.c 2023-01-03 12:33:23.078974299 +0000
--- src/vim9type.c 2023-01-03 13:15:00.733001848 +0000
***************
*** 581,586 ****
--- 581,591 ----
}
}

+ if (tv->v_type == VAR_CLASS)
+ member_type = (type_T *)tv->vval.v_class;
+ else if (tv->v_type == VAR_OBJECT && tv->vval.v_object != NULL)
+ member_type = (type_T *)tv->vval.v_object->obj_class;
+
type = get_type_ptr(type_gap);
if (type == NULL)
return NULL;
*** ../vim-9.0.1138/src/vim9expr.c 2023-01-02 20:32:18.425749782 +0000
--- src/vim9expr.c 2023-01-03 13:48:00.347215422 +0000
***************
*** 273,280 ****
class_T *cl = (class_T *)type->tt_member;
if (*name_end == '(')
{
! // TODO: method or function call
! emsg("compile_class_object_index(): object/class call not handled yet");
}
else if (type->tt_type == VAR_OBJECT)
{
--- 273,319 ----
class_T *cl = (class_T *)type->tt_member;
if (*name_end == '(')
{
! if (type->tt_type == VAR_CLASS)
! {
! garray_T *instr = &cctx->ctx_instr;
! if (instr->ga_len > 0)
! {
! isn_T *isn = ((isn_T *)instr->ga_data) + instr->ga_len - 1;
! if (isn->isn_type == ISN_LOADSCRIPT)
! {
! // The class was recognized as a script item. We only need
! // to know what class it is, drop the instruction.
! --instr->ga_len;
! vim_free(isn->isn_arg.script.scriptref);
! }
! }
!
! for (int i = 0; i < cl->class_class_function_count; ++i)
! {
! ufunc_T *fp = cl->class_class_functions[i];
! // Use a separate pointer to avoid that ASAN complains about
! // uf_name[] only being 4 characters.
! char_u *ufname = (char_u *)fp->uf_name;
! if (STRNCMP(name, ufname, len) == 0 && ufname[len] == NUL)
! {
! *arg = skipwhite(name_end + 1);
! int argcount = 0;
! if (compile_arguments(arg, cctx, &argcount,
! CA_NOT_SPECIAL) == FAIL)
! return FAIL;
! return generate_CALL(cctx, fp, argcount);
! }
! }
!
! semsg(_(e_method_not_found_on_class_str_str),
! cl->class_name, name);
! return FAIL;
! }
! else
! {
! // TODO: method call
! emsg("compile_class_object_index(): object call not handled yet");
! }
}
else if (type->tt_type == VAR_OBJECT)
{
*** ../vim-9.0.1138/src/testdir/test_vim9_class.vim 2023-01-02 20:32:18.429749782 +0000
--- src/testdir/test_vim9_class.vim 2023-01-03 13:53:25.001822394 +0000
***************
*** 394,402 ****
END

v9.CheckScriptSuccess(class_lines + test_lines)
! # TODO: this does not work yet
! #v9.CheckScriptSuccess(
! # class_lines + ['def Test()'] + test_lines + ['enddef', 'Test()'])

for op in ['>', '>=', '<', '<=', '=~', '!~']
var op_lines = [
--- 394,401 ----
END

v9.CheckScriptSuccess(class_lines + test_lines)
! v9.CheckScriptSuccess(
! class_lines + ['def Test()'] + test_lines + ['enddef', 'Test()'])

for op in ['>', '>=', '<', '<=', '=~', '!~']
var op_lines = [
***************
*** 405,413 ****
'echo i1 ' .. op .. ' i2',
]
v9.CheckScriptFailure(class_lines + op_lines, 'E1153: Invalid operation for object')
! # TODO: this does not work yet
! #v9.CheckScriptFailure(class_lines
! # + ['def Test()'] + op_lines + ['enddef', 'Test()'], 'E99:')
endfor
enddef

--- 404,411 ----
'echo i1 ' .. op .. ' i2',
]
v9.CheckScriptFailure(class_lines + op_lines, 'E1153: Invalid operation for object')
! v9.CheckScriptFailure(class_lines
! + ['def Test()'] + op_lines + ['enddef', 'Test()'], 'E1153: Invalid operation for object')
endfor
enddef

*** ../vim-9.0.1138/src/version.c 2023-01-03 12:33:23.082974364 +0000
--- src/version.c 2023-01-03 13:58:26.290637129 +0000
***************
*** 697,698 ****
--- 697,700 ----
{ /* Add new patch number below this line */
+ /**/
+ 1139,
/**/

--
This message contains 78% recycled characters.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///