aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-13 06:54:15 -04:00
Code Activity

patch 8.0.1770: assert functions don't return anything

Browse Source 
Problem:    Assert functions don't return anything.
Solution:   Return non-zero when the assertion fails.
This commit is contained in:
Bram Moolenaar
2018-04-28 16:56:53 +02:00
parent 9b25af3620
commit 65a5464985
6 changed files with 149 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/evalfunc.c
View File

@@ -1300,108 +1300,108 @@ f_argv(typval_T *argvars, typval_T *rettv)
* "assert_beeps(cmd [, error])" function
*/
static void
f_assert_beeps(typval_T *argvars, typval_T *rettv UNUSED)
f_assert_beeps(typval_T *argvars, typval_T *rettv)
{
assert_beeps(argvars);
rettv->vval.v_number = assert_beeps(argvars);
}
/*
* "assert_equal(expected, actual[, msg])" function
*/
static void
f_assert_equal(typval_T *argvars, typval_T *rettv UNUSED)
f_assert_equal(typval_T *argvars, typval_T *rettv)
{
assert_equal_common(argvars, ASSERT_EQUAL);
rettv->vval.v_number = assert_equal_common(argvars, ASSERT_EQUAL);
}
/*
* "assert_equalfile(fname-one, fname-two)" function
*/
static void
f_assert_equalfile(typval_T *argvars, typval_T *rettv UNUSED)
f_assert_equalfile(typval_T *argvars, typval_T *rettv)
{
assert_equalfile(argvars);
rettv->vval.v_number = assert_equalfile(argvars);
}
/*
* "assert_notequal(expected, actual[, msg])" function
*/
static void
f_assert_notequal(typval_T *argvars, typval_T *rettv UNUSED)
f_assert_notequal(typval_T *argvars, typval_T *rettv)
{
assert_equal_common(argvars, ASSERT_NOTEQUAL);
rettv->vval.v_number = assert_equal_common(argvars, ASSERT_NOTEQUAL);
}
/*
* "assert_exception(string[, msg])" function
*/
static void
f_assert_exception(typval_T *argvars, typval_T *rettv UNUSED)
f_assert_exception(typval_T *argvars, typval_T *rettv)
{
assert_exception(argvars);
rettv->vval.v_number = assert_exception(argvars);
}
/*
* "assert_fails(cmd [, error])" function
*/
static void
f_assert_fails(typval_T *argvars, typval_T *rettv UNUSED)
f_assert_fails(typval_T *argvars, typval_T *rettv)
{
assert_fails(argvars);
rettv->vval.v_number = assert_fails(argvars);
}
/*
* "assert_false(actual[, msg])" function
*/
static void
f_assert_false(typval_T *argvars, typval_T *rettv UNUSED)
f_assert_false(typval_T *argvars, typval_T *rettv)
{
assert_bool(argvars, FALSE);
rettv->vval.v_number = assert_bool(argvars, FALSE);
}
/*
* "assert_inrange(lower, upper[, msg])" function
*/
static void
f_assert_inrange(typval_T *argvars, typval_T *rettv UNUSED)
f_assert_inrange(typval_T *argvars, typval_T *rettv)
{
assert_inrange(argvars);
rettv->vval.v_number = assert_inrange(argvars);
}
/*
* "assert_match(pattern, actual[, msg])" function
*/
static void
f_assert_match(typval_T *argvars, typval_T *rettv UNUSED)
f_assert_match(typval_T *argvars, typval_T *rettv)
{
assert_match_common(argvars, ASSERT_MATCH);
rettv->vval.v_number = assert_match_common(argvars, ASSERT_MATCH);
}
/*
* "assert_notmatch(pattern, actual[, msg])" function
*/
static void
f_assert_notmatch(typval_T *argvars, typval_T *rettv UNUSED)
f_assert_notmatch(typval_T *argvars, typval_T *rettv)
{
assert_match_common(argvars, ASSERT_NOTMATCH);
rettv->vval.v_number = assert_match_common(argvars, ASSERT_NOTMATCH);
}
/*
* "assert_report(msg)" function
*/
static void
f_assert_report(typval_T *argvars, typval_T *rettv UNUSED)
f_assert_report(typval_T *argvars, typval_T *rettv)
{
assert_report(argvars);
rettv->vval.v_number = assert_report(argvars);
}
/*
* "assert_true(actual[, msg])" function
*/
static void
f_assert_true(typval_T *argvars, typval_T *rettv UNUSED)
f_assert_true(typval_T *argvars, typval_T *rettv)
{
assert_bool(argvars, TRUE);
rettv->vval.v_number = assert_bool(argvars, TRUE);
}
#ifdef FEAT_FLOAT