patch 9.1.1148: Vim9: finding imported scripts can be further improved

Problem:  Vim9: finding imported scripts can be further improved
          (after v9.1.1146)
Solution: Eliminate extra find_imported() call (Hirohito Higashi)

related: #16602
related: #16660
closes: #16731

Signed-off-by: Hirohito Higashi <h.east.727@gmail.com>
Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/proto/vim9expr.pro b/src/proto/vim9expr.pro
index f58e3462526e096c1c9580fdaaac275c24696be4..d28908c40019de6c37141c31ba5fbc2a20c81965 100644 (file)
--- a/src/proto/vim9expr.pro
+++ b/src/proto/vim9expr.pro
@@ -2,7 +2,7 @@
 int generate_ppconst(cctx_T *cctx, ppconst_T *ppconst);
 void clear_ppconst(ppconst_T *ppconst);
 int compile_member(int is_slice, int *keeping_dict, cctx_T *cctx);
-int compile_load_scriptvar(cctx_T *cctx, char_u *name, char_u *start, char_u **end);
+int compile_load_scriptvar(cctx_T *cctx, char_u *name, char_u *start, char_u **end, imported_T *import);
 int compile_load(char_u **arg, char_u *end_arg, cctx_T *cctx, int is_expr, int error);
 int compile_arguments(char_u **arg, cctx_T *cctx, int *argcount, ca_special_T special_fn);
 char_u *to_name_end(char_u *arg, int use_namespace);

diff --git a/src/version.c b/src/version.c
index d028159f6777df8f1c2b6d0a76169e3e8710283e..839509a789e431c013195a6c4b7deac279564d4d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1148,
 /**/
     1147,
 /**/

diff --git a/src/vim9compile.c b/src/vim9compile.c
index f6764831af7b8ccad47b7610c2edc5970e51c21f..67eeda857995c7df18c49a4c5ff0cd3908251b9a 100644 (file)
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -1374,7 +1374,7 @@ generate_loadvar(cctx_T *cctx, lhs_T *lhs)
        case dest_script:
        case dest_script_v9:
            res = compile_load_scriptvar(cctx,
-                           name + (name[1] == ':' ? 2 : 0), NULL, NULL);
+                           name + (name[1] == ':' ? 2 : 0), NULL, NULL, NULL);
            break;
        case dest_env:
            // Include $ in the name here

diff --git a/src/vim9expr.c b/src/vim9expr.c
index af12fb69cce677fa89343ec4a1621bcfa4294533..f875bc404ac19321308c082d60aa6143f46aeccd 100644 (file)
--- a/src/vim9expr.c
+++ b/src/vim9expr.c
@@ -538,11 +538,12 @@ compile_load_scriptvar(
        cctx_T *cctx,
        char_u *name,       // variable NUL terminated
        char_u *start,      // start of variable
-       char_u **end)       // end of variable, may be NULL
+       char_u **end,       // end of variable, may be NULL
+       imported_T *import) // found imported item, can be NULL
 {
     scriptitem_T    *si;
     int                    idx;
-    imported_T     *import;
+    imported_T     *imp;
 
     if (!SCRIPT_ID_VALID(current_sctx.sc_sid))
        return FAIL;
@@ -557,8 +558,14 @@ compile_load_scriptvar(
        return OK;
     }
 
-    import = end == NULL ? NULL : find_imported(name, 0, FALSE);
-    if (import != NULL)
+    if (end == NULL)
+       imp = NULL;
+    else if (import == NULL)
+       imp = find_imported(name, 0, FALSE);
+    else
+       imp = import;
+
+    if (imp != NULL)
     {
        char_u  *p = skipwhite(*end);
        char_u  *exp_name;
@@ -568,8 +575,8 @@ compile_load_scriptvar(
        int     done = FALSE;
        int     res = OK;
 
-       check_script_symlink(import->imp_sid);
-       import_check_sourced_sid(&import->imp_sid);
+       check_script_symlink(imp->imp_sid);
+       import_check_sourced_sid(&imp->imp_sid);
 
        // Need to lookup the member.
        if (*p != '.')
@@ -591,11 +598,11 @@ compile_load_scriptvar(
        cc = *p;
        *p = NUL;
 
-       si = SCRIPT_ITEM(import->imp_sid);
+       si = SCRIPT_ITEM(imp->imp_sid);
        if (si->sn_import_autoload && si->sn_state == SN_STATE_NOT_LOADED)
            // "import autoload './dir/script.vim'" or
            // "import autoload './autoload/script.vim'" - load script first
-           res = generate_SOURCE(cctx, import->imp_sid);
+           res = generate_SOURCE(cctx, imp->imp_sid);
 
        if (res == OK)
        {
@@ -624,17 +631,17 @@ compile_load_scriptvar(
                {
                    char_u sid_name[MAX_FUNC_NAME_LEN];
 
-                   func_name_with_sid(exp_name, import->imp_sid, sid_name);
+                   func_name_with_sid(exp_name, imp->imp_sid, sid_name);
                    res = generate_PUSHFUNC(cctx, sid_name, &t_func_any, TRUE);
                }
                else
                    res = generate_OLDSCRIPT(cctx, ISN_LOADEXPORT, exp_name,
-                                                     import->imp_sid, &t_any);
+                                                     imp->imp_sid, &t_any);
                done = TRUE;
            }
            else
            {
-               idx = find_exported(import->imp_sid, exp_name, &ufunc, &type,
+               idx = find_exported(imp->imp_sid, exp_name, &ufunc, &type,
                                                             cctx, NULL, TRUE);
            }
        }
@@ -656,7 +663,7 @@ compile_load_scriptvar(
        }
 
        generate_VIM9SCRIPT(cctx, ISN_LOADSCRIPT,
-               import->imp_sid,
+               imp->imp_sid,
                idx,
                type);
        return OK;
@@ -771,7 +778,7 @@ compile_load(
                              res = generate_funcref(cctx, name, FALSE);
                          else
                              res = compile_load_scriptvar(cctx, name,
-                                                               NULL, &end);
+                                                           NULL, &end, NULL);
                          break;
                case 'g': if (vim_strchr(name, AUTOLOAD_CHAR) == NULL)
                          {
@@ -887,11 +894,13 @@ compile_load(
            }
            else
            {
+               imported_T *imp = NULL;
+
                // "var" can be script-local even without using "s:" if it
                // already exists in a Vim9 script or when it's imported.
                if (script_var_exists(*arg, len, cctx, NULL) == OK
-                               || find_imported(name, 0, FALSE) != NULL)
-                   res = compile_load_scriptvar(cctx, name, *arg, &end);
+                           || (imp = find_imported(name, 0, FALSE)) != NULL)
+                   res = compile_load_scriptvar(cctx, name, *arg, &end, imp);
 
                // When evaluating an expression and the name starts with an
                // uppercase letter it can be a user defined function.