thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.3178: Vim9: the file name of an :import cannot be an expression

Browse Source 
Problem:    Vim9: the file name of an :import cannot be an expression.
Solution:   Accept an expression that results in a string.  Do not support
            :import in a function.
This commit is contained in:
Bram Moolenaar
2021-07-18 18:21:38 +02:00
parent ad2d4969e1
commit 4db572eeb2
5 changed files with 25 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/vim9compile.c
View File

@@ -4335,7 +4335,6 @@ compile_subscript(
semsg(_(e_missing_paren), *arg);
return FAIL;
}
// TODO: base value may not be the first argument
if (compile_call(arg, p - *arg, cctx, ppconst, 1) == FAIL)
return FAIL;
}
@@ -7293,15 +7292,6 @@ compile_unletlock(char_u *arg, exarg_T *eap, cctx_T *cctx)
return eap->nextcmd == NULL ? (char_u *)"" : eap->nextcmd;
}
/*
* Compile an :import command.
*/
static char_u *
compile_import(char_u *arg, cctx_T *cctx)
{
return handle_import(arg, &cctx->ctx_imports, 0, NULL, cctx);
}
/*
* generate a jump to the ":endif"/":endfor"/":endwhile"/":finally"/":endtry".
*/
@@ -9638,7 +9628,8 @@ compile_def_function(
break;
case CMD_import:
line = compile_import(p, &cctx);
emsg(_(e_import_can_only_be_used_in_script));
line = NULL;
break;
case CMD_if: