summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-04-04 13:44:37 +0200
committerBram Moolenaar <Bram@vim.org>2019-04-04 13:44:37 +0200
commitfda1bff39f89775b20a2d88ef3903656d52f66ad (patch)
tree3676cb1f5c70fb693ee24e10da893ef01babe911
parente5e4e22c1c15c8c22b14935affe969569acc8df9 (diff)
patch 8.1.1111: it is not easy to check for infinityv8.1.1111
Problem: It is not easy to check for infinity. Solution: Add isinf(). (Ozaki Kiichi, closes #3787)
-rw-r--r--runtime/doc/eval.txt12
-rw-r--r--src/evalfunc.c17
-rw-r--r--src/testdir/test_float_func.vim23
-rw-r--r--src/version.c2
4 files changed, 45 insertions, 9 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index a367946164..c764f9aa0c 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -2411,6 +2411,8 @@ inputsecret({prompt} [, {text}]) String like input() but hiding the text
insert({object}, {item} [, {idx}]) List insert {item} in {object} [before {idx}]
invert({expr}) Number bitwise invert
isdirectory({directory}) Number |TRUE| if {directory} is a directory
+isinf({expr}) Number determine if {expr} is infinity value
+ (positive or negative)
islocked({expr}) Number |TRUE| if {expr} is locked
isnan({expr}) Number |TRUE| if {expr} is NaN
items({dict}) List key-value pairs in {dict}
@@ -5772,6 +5774,16 @@ isdirectory({directory}) *isdirectory()*
exist, or isn't a directory, the result is |FALSE|. {directory}
is any expression, which is used as a String.
+isinf({expr}) *isinf()*
+ Return 1 if {expr} is a positive infinity, or -1 a negative
+ infinity, otherwise 0. >
+ :echo isinf(1.0 / 0.0)
+< 1 >
+ :echo isinf(-1.0 / 0.0)
+< -1
+
+ {only available when compiled with the |+float| feature}
+
islocked({expr}) *islocked()* *E786*
The result is a Number, which is |TRUE| when {expr} is the
name of a locked variable.
diff --git a/src/evalfunc.c b/src/evalfunc.c
index 2eafe140ce..4a54d6dc9d 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -237,6 +237,7 @@ static void f_invert(typval_T *argvars, typval_T *rettv);
static void f_isdirectory(typval_T *argvars, typval_T *rettv);
static void f_islocked(typval_T *argvars, typval_T *rettv);
#if defined(FEAT_FLOAT) && defined(HAVE_MATH_H)
+static void f_isinf(typval_T *argvars, typval_T *rettv);
static void f_isnan(typval_T *argvars, typval_T *rettv);
#endif
static void f_items(typval_T *argvars, typval_T *rettv);
@@ -721,6 +722,9 @@ static struct fst
{"insert", 2, 3, f_insert},
{"invert", 1, 1, f_invert},
{"isdirectory", 1, 1, f_isdirectory},
+#if defined(FEAT_FLOAT) && defined(HAVE_MATH_H)
+ {"isinf", 1, 1, f_isinf},
+#endif
{"islocked", 1, 1, f_islocked},
#if defined(FEAT_FLOAT) && defined(HAVE_MATH_H)
{"isnan", 1, 1, f_isnan},
@@ -6582,9 +6586,6 @@ f_has(typval_T *argvars, typval_T *rettv)
#ifdef FEAT_TAG_BINS
"tag_binary",
#endif
-#ifdef FEAT_TAG_OLDSTATIC
- "tag_old_static",
-#endif
#ifdef FEAT_TCL
# ifndef DYNAMIC_TCL
"tcl",
@@ -7443,6 +7444,16 @@ f_islocked(typval_T *argvars, typval_T *rettv)
#if defined(FEAT_FLOAT) && defined(HAVE_MATH_H)
/*
+ * "isinf()" function
+ */
+ static void
+f_isinf(typval_T *argvars, typval_T *rettv)
+{
+ if (argvars[0].v_type == VAR_FLOAT && isinf(argvars[0].vval.v_float))
+ rettv->vval.v_number = argvars[0].vval.v_float > 0.0 ? 1 : -1;
+}
+
+/*
* "isnan()" function
*/
static void
diff --git a/src/testdir/test_float_func.vim b/src/testdir/test_float_func.vim
index 32b985e1b8..48fae74012 100644
--- a/src/testdir/test_float_func.vim
+++ b/src/testdir/test_float_func.vim
@@ -288,13 +288,24 @@ func Test_trunc()
call assert_fails("call trunc('')", 'E808:')
endfunc
+func Test_isinf()
+ call assert_equal(1, isinf(1.0/0.0))
+ call assert_equal(-1, isinf(-1.0/0.0))
+ call assert_false(isinf(1.0))
+ call assert_false(isinf(0.0/0.0))
+ call assert_false(isinf('a'))
+ call assert_false(isinf([]))
+ call assert_false(isinf({}))
+endfunc
+
func Test_isnan()
- call assert_equal(0, isnan(1.0))
- call assert_equal(1, isnan(0.0/0.0))
- call assert_equal(0, isnan(1.0/0.0))
- call assert_equal(0, isnan('a'))
- call assert_equal(0, isnan([]))
- call assert_equal(0, isnan({}))
+ call assert_true(isnan(0.0/0.0))
+ call assert_false(isnan(1.0))
+ call assert_false(isnan(1.0/0.0))
+ call assert_false(isnan(-1.0/0.0))
+ call assert_false(isnan('a'))
+ call assert_false(isnan([]))
+ call assert_false(isnan({}))
endfunc
" This was converted from test65
diff --git a/src/version.c b/src/version.c
index 38a7683f9b..9c237e5a9f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1111,
+/**/
1110,
/**/
1109,