vim: src/eval.c comparison

comparison src/eval.c @ 446:7472c565592a v7.0117

updated for version 7.0117

author	vimboss
date	Wed, 27 Jul 2005 21:13:01 +0000
parents	c773cb978acf
children	dd9db57ee7ce

comparison

equal deleted inserted replaced

-:c773cb978acf
+:7472c565592a
 static int get_var_tv __ARGS((char_u *name, int len, typval_T *rettv, int verbose));
 static int handle_subscript __ARGS((char_u **arg, typval_T *rettv, int evaluate, int verbose));
 static typval_T *alloc_tv __ARGS((void));
 static typval_T *alloc_string_tv __ARGS((char_u *string));
 static void free_tv __ARGS((typval_T *varp));
-static void clear_tv __ARGS((typval_T *varp));
 static void init_tv __ARGS((typval_T *varp));
 static long get_tv_number __ARGS((typval_T *varp));
 static long get_tv_number_chk __ARGS((typval_T *varp, int *denote));
 static linenr_T get_tv_lnum __ARGS((typval_T *argvars));
 static char_u *get_tv_string __ARGS((typval_T *varp));
 # ifdef __BORLANDC__
 _RTLENTRYF
 # endif
 	prof_self_cmp __ARGS((const void *s1, const void *s2));
 #endif
-static int script_autoload __ARGS((char_u *name));
+static int script_autoload __ARGS((char_u *name, int reload));
 static char_u *autoload_name __ARGS((char_u *name));
 static void cat_func_name __ARGS((char_u *buf, ufunc_T *fp));
 static void func_free __ARGS((ufunc_T *fp));
 static void func_unref __ARGS((char_u *name));
 static void func_ref __ARGS((char_u *name));
 if (li == NULL)
 	return -1;
 return get_tv_number(&li->li_tv);
 }
 #endif
+/*
+* Top level evaluation function,
+*/
+typval_T *
+eval_expr(arg, nextcmd)
+char_u	*arg;
+char_u	**nextcmd;
+{
+typval_T	*tv;
+tv = (typval_T *)alloc(sizeof(typval_T));
+if (!tv)
+	return NULL;
+if (eval0(arg, tv, nextcmd, TRUE) == FAIL)
+{
+	vim_free(tv);
+	return NULL;
+}
+return tv;
+}
 #if (defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL)) || defined(PROTO)
 /*
 * Call some vimL function and return the result in "*rettv".
 * Uses argv[argc] for the function arguments.
 		/* executed an autocommand, search for the function again */
 		fp = find_func(fname);
 	    }
 #endif
 	    /* Try loading a package. */
-	    if (fp == NULL && script_autoload(fname) && !aborting())
+	    if (fp == NULL && script_autoload(fname, TRUE) && !aborting())
 	    {
 		/* loaded a package, search for the function again */
 		fp = find_func(fname);
 	    }
 }
 /*
 * Free the memory for a variable value and set the value to NULL or 0.
 */
-static void
+void
 clear_tv(varp)
 typval_T *varp;
 {
 if (varp != NULL)
 {
 hi = hash_find(ht, varname);
 if (HASHITEM_EMPTY(hi))
 {
 	/* For global variables we may try auto-loading the script.  If it
-	 * worked find the variable again. */
+	 * worked find the variable again.  Don't auto-load a script if it was
+	 * loaded already, otherwise it would be loaded every time when
+	 * checking if a function name is a Funcref variable. */
 	if (ht == &globvarht && !writing
-				   && script_autoload(varname) && !aborting())
+			    && script_autoload(varname, FALSE) && !aborting())
 	    hi = hash_find(ht, varname);
 	if (HASHITEM_EMPTY(hi))
 	    return NULL;
 }
 return HI2DI(hi);
 return profile_cmp(&p1->uf_tm_self, &p2->uf_tm_self);
 }
 #endif
+/* The names of packages that once were loaded is remembered. */
+static garray_T	    ga_loaded = {0, 0, sizeof(char_u *), 4, NULL};
 /*
 * If "name" has a package name try autoloading the script for it.
 * Return TRUE if a package was loaded.
 */
 static int
-script_autoload(name)
+script_autoload(name, reload)
-char_u *name;
+char_u	*name;
+int		reload;	    /* load script again when already loaded */
 {
 char_u	*p;
-char_u	*scriptname;
+char_u	*scriptname, *tofree;
 int		ret = FALSE;
+int		i;
-/* If there is no colon after name[1] there is no package name. */
+/* If there is no '#' after name[0] there is no package name. */
 p = vim_strchr(name, AUTOLOAD_CHAR);
-if (p == NULL || p <= name + 2)
+if (p == NULL || p == name)
 	return FALSE;
-/* Try loading the package from $VIMRUNTIME/autoload/<name>.vim */
+tofree = scriptname = autoload_name(name);
-scriptname = autoload_name(name);
-if (cmd_runtime(scriptname, FALSE) == OK)
+/* Find the name in the list of previously loaded package names.  Skip
-	ret = TRUE;
+* "autoload/", it's always the same. */
+for (i = 0; i < ga_loaded.ga_len; ++i)
-vim_free(scriptname);
+	if (STRCMP(((char_u **)ga_loaded.ga_data)[i] + 9, scriptname + 9) == 0)
+	    break;
+if (!reload && i < ga_loaded.ga_len)
+	ret = FALSE;	    /* was loaded already */
+else
+{
+	/* Remember the name if it wasn't loaded already. */
+	if (i == ga_loaded.ga_len && ga_grow(&ga_loaded, 1) == OK)
+	{
+	    ((char_u **)ga_loaded.ga_data)[ga_loaded.ga_len++] = scriptname;
+	    tofree = NULL;
+	}
+	/* Try loading the package from $VIMRUNTIME/autoload/<name>.vim */
+	if (cmd_runtime(scriptname, FALSE) == OK)
+	    ret = TRUE;
+}
+vim_free(tofree);
 return ret;
 }
 /*
 * Return the autoload script name for a function or variable name.

Mercurial > vim

comparison src/eval.c @ 446:7472c565592a v7.0117