Mercurial > vim

diff src/vim9compile.c @ 25282:9bce044c7643 v8.2.3178

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3178: Vim9: the file name of an :import cannot be an expression Commit: https://github.com/vim/vim/commit/4db572eeb2b42819268e934e76c67163316d873f Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jul 18 18:21:38 2021 +0200 patch 8.2.3178: Vim9: the file name of an :import cannot be an expression 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.
author Bram Moolenaar <Bram@vim.org>
date Sun, 18 Jul 2021 18:30:04 +0200
parents 84d5cda23b34
children e56c8dc1a534
line wrap: on
line diff
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -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;
 	    }
@@ -7294,15 +7293,6 @@ compile_unletlock(char_u *arg, exarg_T *
 }
 
 /*
- * 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".
  */
     static int
@@ -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: