vim: src/eval.c comparison

comparison src/eval.c @ 9157:e316b83892c1 v7.4.1862

commit https://github.com/vim/vim/commit/18dfb4404a618c52ee7138630a2381aed4d66eaf Author: Bram Moolenaar <Bram@vim.org> Date: Tue May 31 22:31:23 2016 +0200 patch 7.4.1862 Problem: string() with repeated argument does not give a result usable by eval(). Solution: Refactor echo_striong and tv2string(), moving the common part to echo_string_core(). (Ken Takata)

author	Christian Brabandt <cb@256bit.org>
date	Tue, 31 May 2016 22:45:06 +0200
parents	c2fe86f2bda1
children	731ee601de16

comparison

equal deleted inserted replaced

-:724c5ba6e649
+:e316b83892c1
 static long list_find_nr(list_T *l, long idx, int *errorp);
 static long list_idx_of_item(list_T *l, listitem_T *item);
 static int list_extend(list_T	*l1, list_T *l2, listitem_T *bef);
 static int list_concat(list_T *l1, list_T *l2, typval_T *tv);
 static list_T *list_copy(list_T *orig, int deep, int copyID);
-static char_u *list2string(typval_T *tv, int copyID);
+static char_u *list2string(typval_T *tv, int copyID, int restore_copyID);
-static int list_join_inner(garray_T *gap, list_T *l, char_u *sep, int echo_style, int copyID, garray_T *join_gap);
+static int list_join_inner(garray_T *gap, list_T *l, char_u *sep, int echo_style, int restore_copyID, int copyID, garray_T *join_gap);
-static int list_join(garray_T *gap, list_T *l, char_u *sep, int echo, int copyID);
+static int list_join(garray_T *gap, list_T *l, char_u *sep, int echo_style, int restore_copyID, int copyID);
 static int free_unref_items(int copyID);
 static dictitem_T *dictitem_copy(dictitem_T *org);
 static void dictitem_remove(dict_T *dict, dictitem_T *item);
 static dict_T *dict_copy(dict_T *orig, int deep, int copyID);
 static long dict_len(dict_T *d);
-static char_u *dict2string(typval_T *tv, int copyID);
+static char_u *dict2string(typval_T *tv, int copyID, int restore_copyID);
 static int get_dict_tv(char_u **arg, typval_T *rettv, int evaluate);
+static char_u *echo_string_core(typval_T *tv, char_u **tofree, char_u *numbuf, int copyID, int echo_style, int restore_copyID, int dict_val);
 static char_u *echo_string(typval_T *tv, char_u **tofree, char_u *numbuf, int copyID);
 static char_u *string_quote(char_u *str, int function);
 static int get_env_tv(char_u **arg, typval_T *rettv, int evaluate);
 static int find_internal_func(char_u *name);
 static char_u *deref_func_name(char_u *name, int *lenp, partial_T **partial, int no_autoload);
 	if (convert && tv.v_type == VAR_LIST)
 	{
 	    ga_init2(&ga, (int)sizeof(char), 80);
 	    if (tv.vval.v_list != NULL)
 	    {
-		list_join(&ga, tv.vval.v_list, (char_u *)"\n", TRUE, 0);
+		list_join(&ga, tv.vval.v_list, (char_u *)"\n", TRUE, FALSE, 0);
 		if (tv.vval.v_list->lv_len > 0)
 		    ga_append(&ga, NL);
 	    }
 	    ga_append(&ga, NUL);
 	    retval = (char_u *)ga.ga_data;
 /*
 * Return an allocated string with the string representation of a list.
 * May return NULL.
 */
 static char_u *
-list2string(typval_T *tv, int copyID)
+list2string(typval_T *tv, int copyID, int restore_copyID)
 {
 garray_T	ga;
 if (tv->vval.v_list == NULL)
 	return NULL;
 ga_init2(&ga, (int)sizeof(char), 80);
 ga_append(&ga, '[');
-if (list_join(&ga, tv->vval.v_list, (char_u *)", ", FALSE, copyID) == FAIL)
+if (list_join(&ga, tv->vval.v_list, (char_u *)", ",
+				       FALSE, restore_copyID, copyID) == FAIL)
 {
 	vim_free(ga.ga_data);
 	return NULL;
 }
 ga_append(&ga, ']');
 list_join_inner(
 garray_T	*gap,		/* to store the result in */
 list_T	*l,
 char_u	*sep,
 int		echo_style,
+int		restore_copyID,
 int		copyID,
 garray_T	*join_gap)	/* to keep each list item string */
 {
 int		i;
 join_T	*p;
 char_u	*s;
 /* Stringify each item in the list. */
 for (item = l->lv_first; item != NULL && !got_int; item = item->li_next)
 {
-	if (echo_style)
+	s = echo_string_core(&item->li_tv, &tofree, numbuf, copyID,
-	    s = echo_string(&item->li_tv, &tofree, numbuf, copyID);
+					   echo_style, restore_copyID, FALSE);
-	else
-	    s = tv2string(&item->li_tv, &tofree, numbuf, copyID);
 	if (s == NULL)
 	    return FAIL;
 	len = (int)STRLEN(s);
 	sumlen += len;
 list_join(
 garray_T	*gap,
 list_T	*l,
 char_u	*sep,
 int		echo_style,
+int		restore_copyID,
 int		copyID)
 {
 garray_T	join_ga;
 int		retval;
 join_T	*p;
 int		i;
 if (l->lv_len < 1)
 	return OK; /* nothing to do */
 ga_init2(&join_ga, (int)sizeof(join_T), l->lv_len);
-retval = list_join_inner(gap, l, sep, echo_style, copyID, &join_ga);
+retval = list_join_inner(gap, l, sep, echo_style, restore_copyID,
+							    copyID, &join_ga);
 /* Dispose each item in join_ga. */
 if (join_ga.ga_data != NULL)
 {
 	p = (join_T *)join_ga.ga_data;
 /*
 * Return an allocated string with the string representation of a Dictionary.
 * May return NULL.
 */
 static char_u *
-dict2string(typval_T *tv, int copyID)
+dict2string(typval_T *tv, int copyID, int restore_copyID)
 {
 garray_T	ga;
 int		first = TRUE;
 char_u	*tofree;
 char_u	numbuf[NUMBUFLEN];
 	    {
 		ga_concat(&ga, tofree);
 		vim_free(tofree);
 	    }
 	    ga_concat(&ga, (char_u *)": ");
-	    s = tv2string(&HI2DI(hi)->di_tv, &tofree, numbuf, copyID);
+	    s = echo_string_core(&HI2DI(hi)->di_tv, &tofree, numbuf, copyID,
+						 FALSE, restore_copyID, TRUE);
 	    if (s != NULL)
 		ga_concat(&ga, s);
 	    vim_free(tofree);
 	    if (s == NULL || did_echo_string_emsg)
 		break;
 /*
 * Return a string with the string representation of a variable.
 * If the memory is allocated "tofree" is set to it, otherwise NULL.
 * "numbuf" is used for a number.
-* Does not put quotes around strings, as ":echo" displays values.
 * When "copyID" is not NULL replace recursive lists and dicts with "...".
+* When both "echo_style" and "dict_val" are FALSE, put quotes around stings as
+* "string()", otherwise does not put quotes around strings, as ":echo"
+* displays values.
+* When "restore_copyID" is FALSE, repeated items in dictionaries and lists
+* are replaced with "...".
 * May return NULL.
 */
 static char_u *
-echo_string(
+echo_string_core(
 typval_T	*tv,
 char_u	**tofree,
 char_u	*numbuf,
-int		copyID)
+int		copyID,
+int		echo_style,
+int		restore_copyID,
+int		dict_val)
 {
 static int	recurse = 0;
 char_u	*r = NULL;
 if (recurse >= DICT_MAXNEST)
 }
 ++recurse;
 switch (tv->v_type)
 {
+	case VAR_STRING:
+	    if (echo_style && !dict_val)
+	    {
+		*tofree = NULL;
+		r = get_tv_string_buf(tv, numbuf);
+	    }
+	    else
+	    {
+		*tofree = string_quote(tv->vval.v_string, FALSE);
+		r = *tofree;
+	    }
+	    break;
 	case VAR_FUNC:
-	    *tofree = NULL;
+	    if (echo_style)
-	    r = tv->vval.v_string;
+	    {
+		*tofree = NULL;
+		r = tv->vval.v_string;
+	    }
+	    else
+	    {
+		*tofree = string_quote(tv->vval.v_string, TRUE);
+		r = *tofree;
+	    }
 	    break;
 	case VAR_PARTIAL:
 	    {
 		partial_T   *pt = tv->vval.v_partial;
 	    if (tv->vval.v_list == NULL)
 	    {
 		*tofree = NULL;
 		r = NULL;
 	    }
-	    else if (copyID != 0 && tv->vval.v_list->lv_copyID == copyID)
+	    else if (copyID != 0 && tv->vval.v_list->lv_copyID == copyID
+		    && tv->vval.v_list->lv_len > 0)
 	    {
 		*tofree = NULL;
 		r = (char_u *)"[...]";
 	    }
 	    else
 	    {
+		int old_copyID = tv->vval.v_list->lv_copyID;
 		tv->vval.v_list->lv_copyID = copyID;
-		*tofree = list2string(tv, copyID);
+		*tofree = list2string(tv, copyID, restore_copyID);
+		if (restore_copyID)
+		    tv->vval.v_list->lv_copyID = old_copyID;
 		r = *tofree;
 	    }
 	    break;
 	case VAR_DICT:
 	    if (tv->vval.v_dict == NULL)
 	    {
 		*tofree = NULL;
 		r = NULL;
 	    }
-	    else if (copyID != 0 && tv->vval.v_dict->dv_copyID == copyID)
+	    else if (copyID != 0 && tv->vval.v_dict->dv_copyID == copyID
+		    && tv->vval.v_dict->dv_hashtab.ht_used != 0)
 	    {
 		*tofree = NULL;
 		r = (char_u *)"{...}";
 	    }
 	    else
 	    {
+		int old_copyID = tv->vval.v_dict->dv_copyID;
 		tv->vval.v_dict->dv_copyID = copyID;
-		*tofree = dict2string(tv, copyID);
+		*tofree = dict2string(tv, copyID, restore_copyID);
+		if (restore_copyID)
+		    tv->vval.v_dict->dv_copyID = old_copyID;
 		r = *tofree;
 	    }
 	    break;
-	case VAR_STRING:
 	case VAR_NUMBER:
 	case VAR_UNKNOWN:
 	case VAR_JOB:
 	case VAR_CHANNEL:
 	    *tofree = NULL;
 /*
 * Return a string with the string representation of a variable.
 * If the memory is allocated "tofree" is set to it, otherwise NULL.
 * "numbuf" is used for a number.
+* Does not put quotes around strings, as ":echo" displays values.
+* When "copyID" is not NULL replace recursive lists and dicts with "...".
+* May return NULL.
+*/
+static char_u *
+echo_string(
+typval_T	*tv,
+char_u	**tofree,
+char_u	*numbuf,
+int		copyID)
+{
+return echo_string_core(tv, tofree, numbuf, copyID, TRUE, FALSE, FALSE);
+}
+/*
+* Return a string with the string representation of a variable.
+* If the memory is allocated "tofree" is set to it, otherwise NULL.
+* "numbuf" is used for a number.
 * Puts quotes around strings, so that they can be parsed back by eval().
 * May return NULL.
 */
 char_u *
 tv2string(
 typval_T	*tv,
 char_u	**tofree,
 char_u	*numbuf,
 int		copyID)
 {
-switch (tv->v_type)
+return echo_string_core(tv, tofree, numbuf, copyID, FALSE, TRUE, FALSE);
-{
-	case VAR_FUNC:
-	    *tofree = string_quote(tv->vval.v_string, TRUE);
-	    return *tofree;
-	case VAR_STRING:
-	    *tofree = string_quote(tv->vval.v_string, FALSE);
-	    return *tofree;
-	case VAR_FLOAT:
-#ifdef FEAT_FLOAT
-	    *tofree = NULL;
-	    vim_snprintf((char *)numbuf, NUMBUFLEN - 1, "%g", tv->vval.v_float);
-	    return numbuf;
-#endif
-	case VAR_NUMBER:
-	case VAR_LIST:
-	case VAR_DICT:
-	case VAR_PARTIAL:
-	case VAR_SPECIAL:
-	case VAR_JOB:
-	case VAR_CHANNEL:
-	case VAR_UNKNOWN:
-	    break;
-}
-return echo_string(tv, tofree, numbuf, copyID);
 }
 /*
 * Return string "str" in ' quotes, doubling ' characters.
 * If "str" is NULL an empty string is assumed.
 rettv->v_type = VAR_STRING;
 if (sep != NULL)
 {
 	ga_init2(&ga, (int)sizeof(char), 80);
-	list_join(&ga, argvars[0].vval.v_list, sep, TRUE, 0);
+	list_join(&ga, argvars[0].vval.v_list, sep, TRUE, FALSE, 0);
 	ga_append(&ga, NUL);
 	rettv->vval.v_string = (char_u *)ga.ga_data;
 }
 else
 	rettv->vval.v_string = NULL;

Mercurial > vim

comparison src/eval.c @ 9157:e316b83892c1 v7.4.1862