aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-01 04:54:07 -04:00
Code Activity

patch 9.0.1075: build fails if compiler doesn't allow declaration after case

Browse Source 
Problem:    build fails if the compiler doesn't allow for a declaration right
            after "case".
Solution:   Add a block.
This commit is contained in:
Bram Moolenaar
2022-12-18 22:01:42 +00:00
parent d505d17885
commit c336ae3ce6
2 changed files with 24 additions and 19 deletions
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 */
/**/
1075,
/**/ /**/
1074, 1074,
/**/ /**/

41
src/vim9instr.c
View File

@@ -2188,29 +2188,32 @@ generate_store_var(
case dest_vimvar: case dest_vimvar:
return generate_STORE(cctx, ISN_STOREV, vimvaridx, NULL); return generate_STORE(cctx, ISN_STOREV, vimvaridx, NULL);
case dest_script: 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; int scriptvar_idx = lhs->lhs_scriptvar_idx;
int scriptvar_sid = lhs->lhs_scriptvar_sid;
if (SCRIPT_ID_VALID(scriptvar_sid) if (scriptvar_idx < 0)
&& SCRIPT_ITEM(scriptvar_sid)->sn_import_autoload
&& SCRIPT_ITEM(scriptvar_sid)->sn_autoload_prefix
== NULL)
{ {
// "import autoload './dir/script.vim'" - load script first isntype_T isn_type = ISN_STORES;
if (generate_SOURCE(cctx, scriptvar_sid) == FAIL)
return FAIL;
isn_type = ISN_STOREEXPORT;
}
// "s:" may be included in the name. if (SCRIPT_ID_VALID(scriptvar_sid)
return generate_OLDSCRIPT(cctx, isn_type, name, && SCRIPT_ITEM(scriptvar_sid)->sn_import_autoload
scriptvar_sid, type); && SCRIPT_ITEM(scriptvar_sid)->sn_autoload_prefix
} == NULL)
return generate_VIM9SCRIPT(cctx, ISN_STORESCRIPT, {
// "import autoload './dir/script.vim'" - load script
// first
if (generate_SOURCE(cctx, scriptvar_sid) == FAIL)
return FAIL;
isn_type = ISN_STOREEXPORT;
}
// "s:" may be included in the name.
return generate_OLDSCRIPT(cctx, isn_type, name,
scriptvar_sid, type);
}
return generate_VIM9SCRIPT(cctx, ISN_STORESCRIPT,
scriptvar_sid, scriptvar_idx, type); scriptvar_sid, scriptvar_idx, type);
}
case dest_class_member: case dest_class_member:
return generate_CLASSMEMBER(cctx, FALSE, return generate_CLASSMEMBER(cctx, FALSE,
lhs->lhs_class, lhs->lhs_classmember_idx); lhs->lhs_class, lhs->lhs_classmember_idx);