vim: src/eval.c comparison

comparison src/eval.c @ 13796:87012d2b17b5 v8.0.1770

patch 8.0.1770: assert functions don't return anything commit https://github.com/vim/vim/commit/65a5464985f980d2bbbf4e14d39d416dce065ec7 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Apr 28 16:56:53 2018 +0200 patch 8.0.1770: assert functions don't return anything Problem: Assert functions don't return anything. Solution: Return non-zero when the assertion fails.

author	Christian Brabandt <cb@256bit.org>
date	Sat, 28 Apr 2018 17:00:06 +0200
parents	e76499e85744
children	eadecbe4e390

comparison

equal deleted inserted replaced

-:d3f0d82cf9ec
+:87012d2b17b5
 	/* Make sure v:errors is a list. */
 	set_vim_var_list(VV_ERRORS, list_alloc());
 list_append_string(vimvars[VV_ERRORS].vv_list, gap->ga_data, gap->ga_len);
 }
-void
+int
 assert_equal_common(typval_T *argvars, assert_type_T atype)
 {
 garray_T	ga;
 if (tv_equal(&argvars[0], &argvars[1], FALSE, FALSE)
 	prepare_assert_error(&ga);
 	fill_assert_error(&ga, &argvars[2], NULL, &argvars[0], &argvars[1],
 								       atype);
 	assert_error(&ga);
 	ga_clear(&ga);
-}
+	return 1;
 }
+return 0;
-void
+}
+int
 assert_equalfile(typval_T *argvars)
 {
 char_u	buf1[NUMBUFLEN];
 char_u	buf2[NUMBUFLEN];
 char_u	*fname1 = get_tv_string_buf_chk(&argvars[0], buf1);
 garray_T	ga;
 FILE	*fd1;
 FILE	*fd2;
 if (fname1 == NULL || fname2 == NULL)
-	return;
+	return 0;
 IObuff[0] = NUL;
 fd1 = mch_fopen((char *)fname1, READBIN);
 if (fd1 == NULL)
 {
 {
 	prepare_assert_error(&ga);
 	ga_concat(&ga, IObuff);
 	assert_error(&ga);
 	ga_clear(&ga);
-}
+	return 1;
 }
+return 0;
-void
+}
+int
 assert_match_common(typval_T *argvars, assert_type_T atype)
 {
 garray_T	ga;
 char_u	buf1[NUMBUFLEN];
 char_u	buf2[NUMBUFLEN];
 	prepare_assert_error(&ga);
 	fill_assert_error(&ga, &argvars[2], NULL, &argvars[0], &argvars[1],
 									atype);
 	assert_error(&ga);
 	ga_clear(&ga);
-}
+	return 1;
 }
+return 0;
-void
+}
+int
 assert_inrange(typval_T *argvars)
 {
 garray_T	ga;
 int		error = FALSE;
 varnumber_T	lower = get_tv_number_chk(&argvars[0], &error);
 char_u	*tofree;
 char	msg[200];
 char_u	numbuf[NUMBUFLEN];
 if (error)
-	return;
+	return 0;
 if (actual < lower || actual > upper)
 {
 	prepare_assert_error(&ga);
 	if (argvars[3].v_type != VAR_UNKNOWN)
 	{
 				       (long)lower, (long)upper, (long)actual);
 	    ga_concat(&ga, (char_u *)msg);
 	}
 	assert_error(&ga);
 	ga_clear(&ga);
-}
+	return 1;
+}
+return 0;
 }
 /*
 * Common for assert_true() and assert_false().
-*/
+* Return non-zero for failure.
-void
+*/
+int
 assert_bool(typval_T *argvars, int isTrue)
 {
 int		error = FALSE;
 garray_T	ga;
 if (argvars[0].v_type == VAR_SPECIAL
 	    && argvars[0].vval.v_number == (isTrue ? VVAL_TRUE : VVAL_FALSE))
-	return;
+	return 0;
 if (argvars[0].v_type != VAR_NUMBER
 	    || (get_tv_number_chk(&argvars[0], &error) == 0) == isTrue
 	    || error)
 {
 	prepare_assert_error(&ga);
 	fill_assert_error(&ga, &argvars[1],
 		(char_u *)(isTrue ? "True" : "False"),
 		NULL, &argvars[0], ASSERT_OTHER);
 	assert_error(&ga);
 	ga_clear(&ga);
-}
+	return 1;
 }
+return 0;
-void
+}
+int
 assert_report(typval_T *argvars)
 {
 garray_T	ga;
 prepare_assert_error(&ga);
 ga_concat(&ga, get_tv_string(&argvars[0]));
 assert_error(&ga);
 ga_clear(&ga);
-}
+return 1;
+}
-void
+int
 assert_exception(typval_T *argvars)
 {
 garray_T	ga;
 char_u	*error = get_tv_string_chk(&argvars[0]);
 {
 	prepare_assert_error(&ga);
 	ga_concat(&ga, (char_u *)"v:exception is not set");
 	assert_error(&ga);
 	ga_clear(&ga);
+	return 1;
 }
 else if (error != NULL
 	&& strstr((char *)vimvars[VV_EXCEPTION].vv_str, (char *)error) == NULL)
 {
 	prepare_assert_error(&ga);
 	fill_assert_error(&ga, &argvars[1], NULL, &argvars[0],
 				  &vimvars[VV_EXCEPTION].vv_tv, ASSERT_OTHER);
 	assert_error(&ga);
 	ga_clear(&ga);
-}
+	return 1;
 }
+return 0;
-void
+}
+int
 assert_beeps(typval_T *argvars)
 {
 char_u	*cmd = get_tv_string_chk(&argvars[0]);
 garray_T	ga;
+int		ret = 0;
 called_vim_beep = FALSE;
 suppress_errthrow = TRUE;
 emsg_silent = FALSE;
 do_cmdline_cmd(cmd);
 	prepare_assert_error(&ga);
 	ga_concat(&ga, (char_u *)"command did not beep: ");
 	ga_concat(&ga, cmd);
 	assert_error(&ga);
 	ga_clear(&ga);
+	ret = 1;
 }
 suppress_errthrow = FALSE;
 emsg_on_display = FALSE;
-}
+return ret;
+}
-void
+int
 assert_fails(typval_T *argvars)
 {
 char_u	*cmd = get_tv_string_chk(&argvars[0]);
 garray_T	ga;
+int		ret = 0;
 called_emsg = FALSE;
 suppress_errthrow = TRUE;
 emsg_silent = TRUE;
 do_cmdline_cmd(cmd);
 	prepare_assert_error(&ga);
 	ga_concat(&ga, (char_u *)"command did not fail: ");
 	ga_concat(&ga, cmd);
 	assert_error(&ga);
 	ga_clear(&ga);
+	ret = 1;
 }
 else if (argvars[1].v_type != VAR_UNKNOWN)
 {
 	char_u	buf[NUMBUFLEN];
 	char	*error = (char *)get_tv_string_buf_chk(&argvars[1], buf);
 	    prepare_assert_error(&ga);
 	    fill_assert_error(&ga, &argvars[2], NULL, &argvars[1],
 				     &vimvars[VV_ERRMSG].vv_tv, ASSERT_OTHER);
 	    assert_error(&ga);
 	    ga_clear(&ga);
+	ret = 1;
 	}
 }
 called_emsg = FALSE;
 suppress_errthrow = FALSE;
 emsg_silent = FALSE;
 emsg_on_display = FALSE;
 set_vim_var_string(VV_ERRMSG, NULL, 0);
+return ret;
 }
 /*
 * Append "str" to "gap", escaping unprintable characters.
 * Changes NL to \n, CR to \r, etc.

Mercurial > vim

comparison src/eval.c @ 13796:87012d2b17b5 v8.0.1770