Mercurial > vim

diff src/structs.h @ 23364:17a0e32eefd4 v8.2.2225

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.2225: Vim9: error when using :import in legacy script twice Commit: https://github.com/vim/vim/commit/a6294955308fac1d14b9a8481e7f8581146c706c Author: Bram Moolenaar <Bram@vim.org> Date: Sun Dec 27 13:39:50 2020 +0100 patch 8.2.2225: Vim9: error when using :import in legacy script twice Problem: Vim9: error when using :import in legacy script twice. Solution: Make it possible to redefine an import when reloading.
author Bram Moolenaar <Bram@vim.org>
date Sun, 27 Dec 2020 13:45:04 +0100
parents b3142fc0a414
children 9a5f12b36273
line wrap: on
line diff
--- a/src/structs.h
+++ b/src/structs.h
@@ -1778,17 +1778,19 @@ typedef struct {
     char_u	*imp_name;	    // name imported as (allocated)
     int		imp_sid;	    // script ID of "from"
 
-    // for "import * as Name", "imp_name" is "Name"
-    int		imp_all;
-
-    // for variable
+    int		imp_flags;	    // IMP_FLAGS_ values
+
+    // for a variable
     type_T	*imp_type;
     int		imp_var_vals_idx;   // index in sn_var_vals of "from"
 
-    // for function
+    // for a function
     char_u	*imp_funcname;	    // user func name (NOT allocated)
 } imported_T;
 
+#define IMP_FLAGS_STAR		1   // using "import * as Name"
+#define IMP_FLAGS_RELOAD	2   // script reloaded, OK to redefine
+
 /*
  * Info about an already sourced scripts.
  */