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.1074: class members are not supported yet

Browse Source 
Problem:    Class members are not supported yet.
Solution:   Add initial support for class members.
This commit is contained in:
Bram Moolenaar
2022-12-18 21:42:55 +00:00
parent 731d00770d
commit d505d17885
13 changed files with 578 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/vim9instr.c
View File

@@ -956,6 +956,38 @@ generate_STORE(cctx_T *cctx, isntype_T isn_type, int idx, char_u *name)
return OK;
}
/*
* Generate an ISN_LOAD_CLASSMEMBER ("load" == TRUE) or ISN_STORE_CLASSMEMBER
* ("load" == FALSE) instruction.
*/
int
generate_CLASSMEMBER(
cctx_T *cctx,
int load,
class_T *cl,
int idx)
{
isn_T *isn;
RETURN_OK_IF_SKIP(cctx);
if (load)
{
ocmember_T *m = &cl->class_class_members[idx];
isn = generate_instr_type(cctx, ISN_LOAD_CLASSMEMBER, m->ocm_type);
}
else
{
isn = generate_instr_drop(cctx, ISN_STORE_CLASSMEMBER, 1);
}
if (isn == NULL)
return FAIL;
isn->isn_arg.classmember.cm_class = cl;
++cl->class_refcount;
isn->isn_arg.classmember.cm_idx = idx;
return OK;
}
/*
* Generate an ISN_STOREOUTER instruction.
*/
@@ -2114,6 +2146,7 @@ generate_undo_cmdmods(cctx_T *cctx)
/*
* Generate a STORE instruction for "dest", not being "dest_local".
* "lhs" might be NULL.
* Return FAIL when out of memory.
*/
int
@@ -2122,10 +2155,9 @@ generate_store_var(
assign_dest_T dest,
int opt_flags,
int vimvaridx,
int scriptvar_idx,
int scriptvar_sid,
type_T *type,
char_u *name)
char_u *name,
lhs_T *lhs)
{
switch (dest)
{
@@ -2156,9 +2188,11 @@ generate_store_var(
case dest_vimvar:
return generate_STORE(cctx, ISN_STOREV, vimvaridx, NULL);
case dest_script:
int scriptvar_idx = lhs->lhs_scriptvar_idx;
int scriptvar_sid = lhs->lhs_scriptvar_sid;
if (scriptvar_idx < 0)
{
isntype_T isn_type = ISN_STORES;
isntype_T isn_type = ISN_STORES;
if (SCRIPT_ID_VALID(scriptvar_sid)
&& SCRIPT_ITEM(scriptvar_sid)->sn_import_autoload
@@ -2177,6 +2211,10 @@ generate_store_var(
}
return generate_VIM9SCRIPT(cctx, ISN_STORESCRIPT,
scriptvar_sid, scriptvar_idx, type);
case dest_class_member:
return generate_CLASSMEMBER(cctx, FALSE,
lhs->lhs_class, lhs->lhs_classmember_idx);
case dest_local:
case dest_expr:
// cannot happen
@@ -2210,8 +2248,7 @@ generate_store_lhs(cctx_T *cctx, lhs_T *lhs, int instr_count, int is_decl)
if (lhs->lhs_dest != dest_local)
return generate_store_var(cctx, lhs->lhs_dest,
lhs->lhs_opt_flags, lhs->lhs_vimvaridx,
lhs->lhs_scriptvar_idx, lhs->lhs_scriptvar_sid,
lhs->lhs_type, lhs->lhs_name);
lhs->lhs_type, lhs->lhs_name, lhs);
if (lhs->lhs_lvar != NULL)
{
@@ -2422,6 +2459,11 @@ delete_instr(isn_T *isn)
vim_free(isn->isn_arg.script.scriptref);
break;
case ISN_LOAD_CLASSMEMBER:
case ISN_STORE_CLASSMEMBER:
class_unref(isn->isn_arg.classmember.cm_class);
break;
case ISN_TRY:
vim_free(isn->isn_arg.tryref.try_ref);
break;