vim: src/eval.c comparison

comparison src/eval.c @ 1851:e7f6ca5594cf v7.2.149

updated for version 7.2-149

author	vimboss
date	Wed, 22 Apr 2009 10:56:16 +0000
parents	e7633eb32cfd
children	b88f0420148e

comparison

equal deleted inserted replaced

-:eaecfa88c246
+:e7f6ca5594cf
 int		convert;
 {
 typval_T	tv;
 char_u	*retval;
 garray_T	ga;
+#ifdef FEAT_FLOAT
 char_u	numbuf[NUMBUFLEN];
+#endif
 if (eval0(arg, &tv, nextcmd, TRUE) == FAIL)
 	retval = NULL;
 else
 {
 /* execute the function if no errors detected and executing */
 if (evaluate && error == ERROR_NONE)
 {
-	rettv->v_type = VAR_NUMBER;	/* default is number rettv */
+	rettv->v_type = VAR_NUMBER;	/* default rettv is number zero */
+	rettv->vval.v_number = 0;
 	error = ERROR_UNKNOWN;
 	if (!builtin_function(fname))
 	{
 	    /*
 	    l = argvars[1].vval.v_list;
 	    if (l == NULL)
 		return;
 	    li = l->lv_first;
 	}
-	rettv->vval.v_number = 0;	/* Default: Success */
 	for (;;)
 	{
 	    if (l == NULL)
 		tv = &argvars[1];	/* append a string */
 	    else if (li == NULL)
 int		argc = 0;
 listitem_T	*item;
 int		dummy;
 dict_T	*selfdict = NULL;
-rettv->vval.v_number = 0;
 if (argvars[1].v_type != VAR_LIST)
 {
 	EMSG(_(e_listreq));
 	return;
 }
 }
 if (buttons == NULL || *buttons == NUL)
 	buttons = (char_u *)_("&Ok");
-if (error)
+if (!error)
-	rettv->vval.v_number = 0;
-else
 	rettv->vval.v_number = do_dialog(type, NULL, message, buttons,
 								   def, NULL);
-#else
-rettv->vval.v_number = 0;
 #endif
 }
 /*
 * "copy()" function
 	if (argvars[2].v_type != VAR_UNKNOWN)
 	    prepend = get_tv_string_buf(&argvars[2], buf);
 }
 rettv->vval.v_number = cs_connection(num, dbpath, prepend);
-#else
-rettv->vval.v_number = 0;
 #endif
 }
 /*
 * "cursor(lnum, col)" function
 *
-* Moves the cursor to the specified line and column
+* Moves the cursor to the specified line and column.
+* Returns 0 when the position could be set, -1 otherwise.
 */
 /*ARGSUSED*/
 static void
 f_cursor(argvars, rettv)
 typval_T	*argvars;
 long	line, col;
 #ifdef FEAT_VIRTUALEDIT
 long	coladd = 0;
 #endif
+rettv->vval.v_number = -1;
 if (argvars[1].v_type == VAR_UNKNOWN)
 {
 	pos_T	    pos;
 	if (list2fpos(argvars, &pos, NULL) == FAIL)
 if (has_mbyte)
 	mb_adjust_cursor();
 #endif
 curwin->w_set_curswant = TRUE;
+rettv->vval.v_number = 0;
 }
 /*
 * "deepcopy()" function
 */
 typval_T	*argvars;
 typval_T	*rettv;
 {
 #ifdef FEAT_AUTOCMD
 rettv->vval.v_number = did_filetype;
-#else
-rettv->vval.v_number = 0;
 #endif
 }
 /*
 * "diff_filler()" function
 static void
 f_extend(argvars, rettv)
 typval_T	*argvars;
 typval_T	*rettv;
 {
-rettv->vval.v_number = 0;
 if (argvars[0].v_type == VAR_LIST && argvars[1].v_type == VAR_LIST)
 {
 	list_T		*l1, *l2;
 	listitem_T	*item;
 	long		before;
 * executed in the sandbox it would be OK, but it probably happens later,
 * when "sandbox" is no longer set. */
 if (check_secure())
 	return;
-rettv->vval.v_number = 0;
 keys = get_tv_string(&argvars[0]);
 if (*keys != NUL)
 {
 	if (argvars[1].v_type != VAR_UNKNOWN)
 	{
 int		rem;
 int		todo;
 char_u	*ermsg = map ? (char_u *)"map()" : (char_u *)"filter()";
 int		save_did_emsg;
-rettv->vval.v_number = 0;
 if (argvars[0].v_type == VAR_LIST)
 {
 	if ((l = argvars[0].vval.v_list) == NULL
 		|| (map && tv_check_lock(l->lv_lock, ermsg)))
 	    return;
 	else if (f > 0x7fffffff)
 	    rettv->vval.v_number = 0x7fffffff;
 	else
 	    rettv->vval.v_number = (varnumber_T)f;
 }
-else
-	rettv->vval.v_number = 0;
 }
 /*
 * "floor({float})" function
 */
 linenr_T	lnum;
 lnum = get_tv_lnum(argvars);
 if (lnum >= 1 && lnum <= curbuf->b_ml.ml_line_count)
 	rettv->vval.v_number = foldLevel(lnum);
-else
+#endif
-#endif
-	rettv->vval.v_number = 0;
 }
 /*
 * "foldtext()" function
 */
 static void
 f_foreground(argvars, rettv)
 typval_T	*argvars;
 typval_T	*rettv;
 {
-rettv->vval.v_number = 0;
 #ifdef FEAT_GUI
 if (gui.in_use)
 	gui_mch_set_foreground();
 #else
 # ifdef WIN32
 typval_T	*argvars;
 typval_T	*rettv;
 {
 char_u	*s;
-rettv->vval.v_number = 0;
 s = get_tv_string(&argvars[0]);
 if (s == NULL || *s == NUL || VIM_ISDIGIT(*s))
 	EMSG2(_(e_invarg2), s);
 /* Don't check an autoload name for existence here. */
 else if (vim_strchr(s, AUTOLOAD_CHAR) == NULL && !function_exists(s))
 else
 	EMSG2(_(e_listdictarg), "get()");
 if (tv == NULL)
 {
-	if (argvars[2].v_type == VAR_UNKNOWN)
+	if (argvars[2].v_type != VAR_UNKNOWN)
-	    rettv->vval.v_number = 0;
-	else
 	    copy_tv(&argvars[2], rettv);
 }
 else
 	copy_tv(tv, rettv);
 }
 int		retlist;
 typval_T	*rettv;
 {
 char_u	*p;
-if (retlist)
+if (retlist && rettv_list_alloc(rettv) == FAIL)
-{
+	return;
-	if (rettv_list_alloc(rettv) == FAIL)
-	    return;
-}
-else
-	rettv->vval.v_number = 0;
 if (buf == NULL || buf->b_ml.ml_mfp == NULL || start < 0)
 	return;
 if (!retlist)
 {
 #ifdef FEAT_SEARCH_EXTRA
 dict_T	*dict;
 matchitem_T	*cur = curwin->w_match_head;
-rettv->vval.v_number = 0;
 if (rettv_list_alloc(rettv) == OK)
 {
 	while (cur != NULL)
 	{
 	    dict = dict_alloc();
 {
 #ifdef FEAT_QUICKFIX
 win_T	*wp;
 #endif
-rettv->vval.v_number = 0;
 #ifdef FEAT_QUICKFIX
 if (rettv_list_alloc(rettv) == OK)
 {
 	wp = NULL;
 	if (argvars[0].v_type != VAR_UNKNOWN)	/* getloclist() */
 static void
 f_has_key(argvars, rettv)
 typval_T	*argvars;
 typval_T	*rettv;
 {
-rettv->vval.v_number = 0;
 if (argvars[0].v_type != VAR_DICT)
 {
 	EMSG(_(e_dictreq));
 	return;
 }
 else
 	/* string given: remove all matching entries */
 	n = del_history_entry(get_histtype(str),
 				      get_tv_string_buf(&argvars[1], buf));
 rettv->vval.v_number = n;
-#else
-rettv->vval.v_number = 0;
 #endif
 }
 /*
 * "histget()" function
 {
 listitem_T	*li;
 int		selected;
 int		mouse_used;
-rettv->vval.v_number = 0;
 #ifdef NO_CONSOLE_INPUT
 /* While starting up, there is no place to enter text. */
 if (no_console_input())
 	return;
 #endif
 if (ga_userinput.ga_len > 0)
 {
 	--ga_userinput.ga_len;
 	restore_typeahead((tasave_T *)(ga_userinput.ga_data)
 						       + ga_userinput.ga_len);
-	rettv->vval.v_number = 0; /* OK */
+	/* default return is zero == OK */
 }
 else if (p_verbose > 1)
 {
 	verb_msg((char_u *)_("called inputrestore() more often than inputsave()"));
 	rettv->vval.v_number = 1; /* Failed */
 if (ga_grow(&ga_userinput, 1) == OK)
 {
 	save_typeahead((tasave_T *)(ga_userinput.ga_data)
 						       + ga_userinput.ga_len);
 	++ga_userinput.ga_len;
-	rettv->vval.v_number = 0; /* OK */
+	/* default return is zero == OK */
 }
 else
 	rettv->vval.v_number = 1; /* Failed */
 }
 long	before = 0;
 listitem_T	*item;
 list_T	*l;
 int		error = FALSE;
-rettv->vval.v_number = 0;
 if (argvars[0].v_type != VAR_LIST)
 	EMSG2(_(e_listarg), "insert()");
 else if ((l = argvars[0].vval.v_list) != NULL
 	    && !tv_check_lock(l->lv_lock, (char_u *)"insert()"))
 {
 listitem_T	*li;
 listitem_T	*li2;
 dict_T	*d;
 int		todo;
-rettv->vval.v_number = 0;
 if (argvars[0].v_type != VAR_DICT)
 {
 	EMSG(_(e_dictreq));
 	return;
 }
 typval_T	*rettv;
 {
 garray_T	ga;
 char_u	*sep;
-rettv->vval.v_number = 0;
 if (argvars[0].v_type != VAR_LIST)
 {
 	EMSG(_(e_listreq));
 	return;
 }
 char_u		**string_result;
 int			nr_result;
 #endif
 rettv->v_type = type;
-if (type == VAR_NUMBER)
+if (type != VAR_NUMBER)
-	rettv->vval.v_number = 0;
-else
 	rettv->vval.v_string = NULL;
 if (check_restricted() || check_secure())
 	return;
 static void
 f_pumvisible(argvars, rettv)
 typval_T	*argvars;
 typval_T	*rettv;
 {
-rettv->vval.v_number = 0;
 #ifdef FEAT_INS_EXPAND
 if (pum_visible())
 	rettv->vval.v_number = 1;
 #endif
 }
 	end = get_tv_number_chk(&argvars[1], &error);
 	if (argvars[2].v_type != VAR_UNKNOWN)
 	    stride = get_tv_number_chk(&argvars[2], &error);
 }
-rettv->vval.v_number = 0;
 if (error)
 	return;		/* type error; errmsg already given */
 if (stride == 0)
 	EMSG(_("E726: Stride is zero"));
 else if (stride > 0 ? end + 1 < start : end - 1 > start)
 static void
 f_remote_foreground(argvars, rettv)
 typval_T	*argvars;
 typval_T	*rettv;
 {
-rettv->vval.v_number = 0;
 #ifdef FEAT_CLIENTSERVER
 # ifdef WIN32
 /* On Win32 it's done in this application. */
 {
 	char_u	*server_name = get_tv_string_chk(&argvars[0]);
 {
 	s = serverGetReply((HWND)n, FALSE, FALSE, FALSE);
 	rettv->vval.v_number = (s != NULL);
 }
 # else
-rettv->vval.v_number = 0;
 if (check_connection() == FAIL)
 	return;
 rettv->vval.v_number = serverPeekReply(X_DISPLAY,
 						serverStrToWin(serverid), &s);
 long	end;
 char_u	*key;
 dict_T	*d;
 dictitem_T	*di;
-rettv->vval.v_number = 0;
 if (argvars[0].v_type == VAR_DICT)
 {
 	if (argvars[2].v_type != VAR_UNKNOWN)
 	    EMSG2(_(e_toomanyarg), "remove()");
 	else if ((d = argvars[0].vval.v_dict) != NULL
 typval_T	*rettv;
 {
 list_T	*l;
 listitem_T	*li, *ni;
-rettv->vval.v_number = 0;
 if (argvars[0].v_type != VAR_LIST)
 	EMSG2(_(e_listarg), "reverse()");
 else if ((l = argvars[0].vval.v_list) != NULL
 	    && !tv_check_lock(l->lv_lock, (char_u *)"reverse()"))
 {
 {
 pos_T	match_pos;
 int		lnum = 0;
 int		col = 0;
-rettv->vval.v_number = 0;
 if (rettv_list_alloc(rettv) == FAIL)
 	return;
 if (searchpair_cmn(argvars, &match_pos) > 0)
 {
 int		lnum = 0;
 int		col = 0;
 int		n;
 int		flags = 0;
-rettv->vval.v_number = 0;
 if (rettv_list_alloc(rettv) == FAIL)
 	return;
 n = search_cmn(argvars, &match_pos, &flags);
 if (n > 0)
 aco_save_T	aco;
 char_u	*varname, *bufvarname;
 typval_T	*varp;
 char_u	nbuf[NUMBUFLEN];
-rettv->vval.v_number = 0;
 if (check_restricted() || check_secure())
 	return;
 (void)get_tv_number(&argvars[0]);	    /* issue errmsg if type error */
 varname = get_tv_string_chk(&argvars[1]);
 buf = get_buf_tv(&argvars[0]);
 	li = l->lv_first;
 }
 else
 	line = get_tv_string_chk(&argvars[1]);
-rettv->vval.v_number = 0;		/* OK */
+/* default result is zero == OK */
 for (;;)
 {
 	if (l != NULL)
 	{
 	    /* list argument, get next string */
 }
 /*
 * "setwinvar()" and "settabwinvar()" functions
 */
+/*ARGSUSED*/
 static void
 setwinvar(argvars, rettv, off)
 typval_T	*argvars;
 typval_T	*rettv;
 int		off;
 #endif
 char_u	*varname, *winvarname;
 typval_T	*varp;
 char_u	nbuf[NUMBUFLEN];
 tabpage_T	*tp;
-rettv->vval.v_number = 0;
 if (check_restricted() || check_secure())
 	return;
 #ifdef FEAT_WINDOWS
 listitem_T	*li;
 listitem_T	**ptrs;
 long	len;
 long	i;
-rettv->vval.v_number = 0;
 if (argvars[0].v_type != VAR_LIST)
 	EMSG2(_(e_listarg), "sort()");
 else
 {
 	l = argvars[0].vval.v_list;
 static void
 f_tabpagebuflist(argvars, rettv)
 typval_T	*argvars;
 typval_T	*rettv;
 {
-#ifndef FEAT_WINDOWS
+#ifdef FEAT_WINDOWS
-rettv->vval.v_number = 0;
-#else
 tabpage_T	*tp;
 win_T	*wp = NULL;
 if (argvars[0].v_type == VAR_UNKNOWN)
 	wp = firstwin;
 {
 	tp = find_tabpage((int)get_tv_number(&argvars[0]));
 	if (tp != NULL)
 	    wp = (tp == curtab) ? firstwin : tp->tp_firstwin;
 }
-if (wp == NULL)
+if (wp != NULL && rettv_list_alloc(rettv) != FAIL)
-	rettv->vval.v_number = 0;
+{
-else
+	for (; wp != NULL; wp = wp->w_next)
-{
+	    if (list_append_number(rettv->vval.v_list,
-	if (rettv_list_alloc(rettv) == FAIL)
-	    rettv->vval.v_number = 0;
-	else
-	{
-	    for (; wp != NULL; wp = wp->w_next)
-		if (list_append_number(rettv->vval.v_list,
 						wp->w_buffer->b_fnum) == FAIL)
-		    break;
+		break;
-	}
 }
 #endif
 }
 char_u	fname[MAXPATHL + 1];
 tagname_T	tn;
 int		first;
 if (rettv_list_alloc(rettv) == FAIL)
-{
-	rettv->vval.v_number = 0;
 	return;
-}
 for (first = TRUE; ; first = FALSE)
 	if (get_tagfname(&tn, first, fname) == FAIL
 		|| list_append_string(rettv->vval.v_list, fname, -1) == FAIL)
 	    break;
 rettv->vval.v_string = vim_strsave(str);
 /* A non-zero number or non-empty string argument: reset mode. */
 if (non_zero_arg(&argvars[0]))
 	curbuf->b_visual_mode_eval = NUL;
-#else
-rettv->vval.v_number = 0; /* return anything, it won't work anyway */
 #endif
 }
 /*
 * "winbufnr(nr)" function

Mercurial > vim

comparison src/eval.c @ 1851:e7f6ca5594cf v7.2.149