aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 9.0.1358: compilation error with some compilers

Browse Source 
Problem:    Compilation error with some compilers.
Solution:   Avoid using "class" as member name.
This commit is contained in:
Bram Moolenaar 2023-02-27 08:07:14 +00:00
parent c4e1b86cb0
commit 30a8447715
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/version.c
View File

@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1358,
/**/ /**/
1357, 1357,
/**/ /**/

4
src/vim9.h
View File

@ -102,7 +102,7 @@ typedef enum {
ISN_PUSHCHANNEL, // push NULL channel ISN_PUSHCHANNEL, // push NULL channel
ISN_PUSHJOB, // push NULL job ISN_PUSHJOB, // push NULL job
ISN_PUSHOBJ, // push NULL object ISN_PUSHOBJ, // push NULL object
ISN_PUSHCLASS, // push class, uses isn_arg.class ISN_PUSHCLASS, // push class, uses isn_arg.classarg
ISN_NEWLIST, // push list from stack items, size is isn_arg.number ISN_NEWLIST, // push list from stack items, size is isn_arg.number
// -1 for null_list // -1 for null_list
ISN_NEWDICT, // push dict from stack items, size is isn_arg.number ISN_NEWDICT, // push dict from stack items, size is isn_arg.number
@ -520,7 +520,7 @@ struct isn_S {
channel_T *channel; channel_T *channel;
job_T *job; job_T *job;
partial_T *partial; partial_T *partial;
class_T *class; class_T *classarg;
jump_T jump; jump_T jump;
jumparg_T jumparg; jumparg_T jumparg;
forloop_T forloop; forloop_T forloop;

6
src/vim9execute.c
View File

@ -4071,7 +4071,7 @@ exec_instructions(ectx_T *ectx)
break; break;
case ISN_PUSHCLASS: case ISN_PUSHCLASS:
tv->v_type = VAR_CLASS; tv->v_type = VAR_CLASS;
tv->vval.v_class = iptr->isn_arg.class; tv->vval.v_class = iptr->isn_arg.classarg;
break; break;
default: default:
tv->v_type = VAR_STRING; tv->v_type = VAR_STRING;
@ -6676,8 +6676,8 @@ list_instructions(char *pfx, isn_T *instr, int instr_count, ufunc_T *ufunc)
break; break;
case ISN_PUSHCLASS: case ISN_PUSHCLASS:
smsg("%s%4d PUSHCLASS %s", pfx, current, smsg("%s%4d PUSHCLASS %s", pfx, current,
iptr->isn_arg.class == NULL ? "null" iptr->isn_arg.classarg == NULL ? "null"
: (char *)iptr->isn_arg.class->class_name); : (char *)iptr->isn_arg.classarg->class_name);
break; break;
case ISN_PUSHEXC: case ISN_PUSHEXC:
smsg("%s%4d PUSH v:exception", pfx, current); smsg("%s%4d PUSH v:exception", pfx, current);

4
src/vim9instr.c
View File

@ -678,7 +678,7 @@ generate_PUSHCLASS(cctx_T *cctx, class_T *class)
class == NULL ? &t_any : &class->class_type); class == NULL ? &t_any : &class->class_type);
if (isn == NULL) if (isn == NULL)
return FAIL; return FAIL;
isn->isn_arg.class = class; isn->isn_arg.classarg = class;
if (class != NULL) if (class != NULL)
++class->class_refcount; ++class->class_refcount;
return OK; return OK;
@ -2509,7 +2509,7 @@ delete_instr(isn_T *isn)
break; break;
case ISN_PUSHCLASS: case ISN_PUSHCLASS:
class_unref(isn->isn_arg.class); class_unref(isn->isn_arg.classarg);
break; break;
case ISN_UCALL: case ISN_UCALL: