vim: src/eval.c comparison

comparison src/eval.c @ 142:0ef5b70c3eaf v7.0045

updated for version 7.0045

author	vimboss
date	Thu, 27 Jan 2005 14:44:31 +0000
parents	3e7d17e425b0
children	40a0699b6c62

comparison

equal deleted inserted replaced

-:88256bf8571c
+:0ef5b70c3eaf
 static dict_T		globvardict;
 static dictitem_T	globvars_var;
 #define globvarht globvardict.dv_hashtab
 /*
+* Old Vim variables such as "v:version" are also available without the "v:".
+* Also in functions.  We need a special hashtable for them.
+*/
+hashtab_T		compat_hashtab;
+/*
 * Array to hold the hashtab with variables local to each sourced script.
 * Each item holds a variable (nameless) that points to the dict_T.
 */
 typedef struct
 {
 * Struct used by trans_function_name()
 */
 typedef struct
 {
 dict_T	*fd_dict;	/* Dictionary used */
-char_u	*fd_newkey;	/* new key in "dict" */
+char_u	*fd_newkey;	/* new key in "dict" in allocated memory */
 dictitem_T	*fd_di;		/* Dictionary item used */
 } funcdict_T;
 /*
 int		    i;
 struct vimvar   *p;
 init_var_dict(&globvardict, &globvars_var);
 init_var_dict(&vimvardict, &vimvars_var);
+hash_init(&compat_hashtab);
 for (i = 0; i < VV_LEN; ++i)
 {
 	p = &vimvars[i];
 	STRCPY(p->vv_di.di_key, p->vv_name);
 	else
 	    p->vv_di.di_flags = DI_FLAGS_FIX;
 	/* add to v: scope dict */
 	hash_add(&vimvarht, p->vv_di.di_key);
 	if (p->vv_flags & VV_COMPAT)
-	    /* add to g: scope dict */
+	    /* add to compat scope dict */
-	    hash_add(&globvardict.dv_hashtab, p->vv_di.di_key);
+	    hash_add(&compat_hashtab, p->vv_di.di_key);
 }
 }
 /*
 * Return the name of the executed function.
 /* If it is the name of a variable of type VAR_FUNC use its contents. */
 len = STRLEN(tofree);
 name = deref_func_name(tofree, &len);
-startarg = arg;
+/* Skip white space to allow ":call func ()".  Not good, but required for
+* backward compatibility. */
+startarg = skipwhite(arg);
 rettv.v_type = VAR_UNKNOWN;	/* clear_tv() uses this */
 if (*startarg != '(')
 {
 	EMSG2(_("E107: Missing braces: %s"), name);
 char_u *
 get_user_var_name(xp, idx)
 expand_T	*xp;
 int		idx;
 {
-static int	gdone;
+static long_u	gdone;
-static int	bdone;
+static long_u	bdone;
-static int	wdone;
+static long_u	wdone;
-static int	vidx;
+static int		vidx;
-static hashitem_T *hi;
+static hashitem_T	*hi;
-hashtab_T	*ht;
+hashtab_T		*ht;
 if (idx == 0)
 	gdone = bdone = wdone = vidx = 0;
 /* Global variables */
 if (gdone < globvarht.ht_used)
 {
 	if (gdone++ == 0)
 	    hi = globvarht.ht_array;
+	else
+	    ++hi;
 	while (HASHITEM_EMPTY(hi))
 	    ++hi;
 	if (STRNCMP("g:", xp->xp_pattern, 2) == 0)
 	    return cat_prefix_varname('g', hi->hi_key);
 	return hi->hi_key;
 ht = &curbuf->b_vars.dv_hashtab;
 if (bdone < ht->ht_used)
 {
 	if (bdone++ == 0)
 	    hi = ht->ht_array;
+	else
+	    ++hi;
 	while (HASHITEM_EMPTY(hi))
 	    ++hi;
 	return cat_prefix_varname('b', hi->hi_key);
 }
 if (bdone == ht->ht_used)
 ht = &curwin->w_vars.dv_hashtab;
 if (wdone < ht->ht_used)
 {
 	if (bdone++ == 0)
 	    hi = ht->ht_array;
+	else
+	    ++hi;
 	while (HASHITEM_EMPTY(hi))
 	    ++hi;
 	return cat_prefix_varname('w', hi->hi_key);
 }
 #endif
 {"stridx",		2, 3, f_stridx},
 {"string",		1, 1, f_string},
 {"strlen",		1, 1, f_strlen},
 {"strpart",		2, 3, f_strpart},
-{"strridx",		2, 2, f_strridx},
+{"strridx",		2, 3, f_strridx},
 {"strtrans",	1, 1, f_strtrans},
 {"submatch",	1, 1, f_submatch},
 {"substitute",	4, 4, f_substitute},
 {"synID",		3, 3, f_synID},
 {"synIDattr",	2, 3, f_synIDattr},
 rettv->vval.v_number = -1;
 if (argvars[2].v_type != VAR_UNKNOWN)
 {
 	start_idx = get_tv_number(&argvars[2]);
-	if (start_idx < 0 || start_idx >= (int)STRLEN(haystack))
+	if (start_idx >= (int)STRLEN(haystack))
 	    return;
-	haystack += start_idx;
+	if (start_idx >= 0)
+	    haystack += start_idx;
 }
 pos	= (char_u *)strstr((char *)haystack, (char *)needle);
 if (pos != NULL)
 	rettv->vval.v_number = (varnumber_T)(pos - save_haystack);
 char_u	buf[NUMBUFLEN];
 char_u	*needle;
 char_u	*haystack;
 char_u	*rest;
 char_u	*lastmatch = NULL;
+int		haystack_len, end_idx;
 needle = get_tv_string(&argvars[1]);
 haystack = get_tv_string_buf(&argvars[0], buf);
+haystack_len = STRLEN(haystack);
 if (*needle == NUL)
 	/* Empty string matches past the end. */
-	lastmatch = haystack + STRLEN(haystack);
+	lastmatch = haystack + haystack_len;
 else
+{
+	if (argvars[2].v_type != VAR_UNKNOWN)
+	{
+	    /* Third argument: upper limit for index */
+	    end_idx = get_tv_number(&argvars[2]);
+	    if (end_idx < 0)
+	    {
+		/* can never find a match */
+		rettv->vval.v_number = -1;
+		return;
+	    }
+	}
+	else
+	    end_idx = haystack_len;
 	for (rest = haystack; *rest != '\0'; ++rest)
 	{
 	    rest = (char_u *)strstr((char *)rest, (char *)needle);
-	    if (rest == NULL)
+	    if (rest == NULL || rest > haystack + end_idx)
 		break;
 	    lastmatch = rest;
 	}
+}
 if (lastmatch == NULL)
 	rettv->vval.v_number = -1;
 else
 	rettv->vval.v_number = (varnumber_T)(lastmatch - haystack);
 {
 	/* If not "x:name" there must not be any ":" in the name. */
 	if (vim_strchr(name, ':') != NULL)
 	    return NULL;
 	*varname = name;
+	/* "version" is "v:version" in all scopes */
+	if (!HASHITEM_EMPTY(hash_find(&compat_hashtab, name)))
+	    return &compat_hashtab;
 	if (current_funccal == NULL)
 	    return &globvarht;			/* global variable */
 	return &current_funccal->l_vars.dv_hashtab; /* l: variable */
 }
 *varname = name + 2;

Mercurial > vim

comparison src/eval.c @ 142:0ef5b70c3eaf v7.0045