Problem: No good reason to build without the float feature.
Solution: Remove configure check for float and "#ifdef FEAT_FLOAT".
Can also be used as a |method|: >
Compute()->abs()
-< {only available when compiled with the |+float| feature}
-
acos({expr}) *acos()*
Return the arc cosine of {expr} measured in radians, as a
Can also be used as a |method|: >
Compute()->acos()
-< {only available when compiled with the |+float| feature}
-
add({object}, {expr}) *add()*
Append the item {expr} to |List| or |Blob| {object}. Returns
Can also be used as a |method|: >
Compute()->asin()
-<
- {only available when compiled with the |+float| feature}
assert_ functions are documented here: |assert-functions-details|
Can also be used as a |method|: >
Compute()->atan()
-<
- {only available when compiled with the |+float| feature}
atan2({expr1}, {expr2}) *atan2()*
Can also be used as a |method|: >
Compute()->atan2(1)
-<
- {only available when compiled with the |+float| feature}
autocmd_add({acmds}) *autocmd_add()*
Can also be used as a |method|: >
Compute()->ceil()
-<
- {only available when compiled with the |+float| feature}
ch_ functions are documented here: |channel-functions-details|
Can also be used as a |method|: >
Compute()->cos()
-<
- {only available when compiled with the |+float| feature}
cosh({expr}) *cosh()*
Can also be used as a |method|: >
Compute()->cosh()
-<
- {only available when compiled with the |+float| feature}
count({comp}, {expr} [, {ic} [, {start}]]) *count()*
Can also be used as a |method|: >
Compute()->exp()
-<
- {only available when compiled with the |+float| feature}
expand({string} [, {nosuf} [, {list}]]) *expand()*
Can also be used as a |method|: >
Compute()->float2nr()
-<
- {only available when compiled with the |+float| feature}
floor({expr}) *floor()*
Can also be used as a |method|: >
Compute()->floor()
-<
- {only available when compiled with the |+float| feature}
fmod({expr1}, {expr2}) *fmod()*
Can also be used as a |method|: >
Compute()->fmod(1.22)
-<
- {only available when compiled with |+float| feature}
fnameescape({string}) *fnameescape()*
Can also be used as a |method|: >
Compute()->isinf()
-<
- {only available when compiled with the |+float| feature}
islocked({expr}) *islocked()* *E786*
The result is a Number, which is |TRUE| when {expr} is the
Can also be used as a |method|: >
Compute()->isnan()
-<
- {only available when compiled with the |+float| feature}
items({dict}) *items()*
Return a |List| with all the key-value pairs of {dict}. Each
Can also be used as a |method|: >
Compute()->log()
-<
- {only available when compiled with the |+float| feature}
log10({expr}) *log10()*
Can also be used as a |method|: >
Compute()->log10()
-<
- {only available when compiled with the |+float| feature}
luaeval({expr} [, {expr}]) *luaeval()*
Evaluate Lua expression {expr} and return its result converted
argument accessible as _A inside first {expr}.
Strings are returned as they are.
Boolean objects are converted to numbers.
- Numbers are converted to |Float| values if vim was compiled
- with |+float| and to numbers otherwise.
+ Numbers are converted to |Float| values.
Dictionaries and lists obtained by vim.eval() are returned
as-is.
Other objects are returned as zero without any errors.
Can also be used as a |method|: >
Compute()->pow(3)
-<
- {only available when compiled with the |+float| feature}
prevnonblank({lnum}) *prevnonblank()*
Return the line number of the first line at or above {lnum}
Can also be used as a |method|: >
Compute()->round()
-<
- {only available when compiled with the |+float| feature}
rubyeval({expr}) *rubyeval()*
Evaluate Ruby expression {expr} and return its result
Can also be used as a |method|: >
Compute()->sin()
-<
- {only available when compiled with the |+float| feature}
sinh({expr}) *sinh()*
Can also be used as a |method|: >
Compute()->sinh()
-<
- {only available when compiled with the |+float| feature}
slice({expr}, {start} [, {end}]) *slice()*
Can also be used as a |method|: >
Compute()->sqrt()
-<
- {only available when compiled with the |+float| feature}
srand([{expr}]) *srand()*
Can also be used as a |method|: >
let f = text->substitute(',', '', 'g')->str2float()
-<
- {only available when compiled with the |+float| feature}
str2list({string} [, {utf8}]) *str2list()*
Return a list containing the number values which represent
Can also be used as a |method|: >
Compute()->tan()
-<
- {only available when compiled with the |+float| feature}
tanh({expr}) *tanh()*
Can also be used as a |method|: >
Compute()->tanh()
-<
- {only available when compiled with the |+float| feature}
tempname() *tempname()* *temp-file-name*
Can also be used as a |method|: >
Compute()->trunc()
<
- {only available when compiled with the |+float| feature}
-
*type()*
type({expr}) The result is a Number representing the type of {expr}.
Instead of using the number directly, it is better to use the
Examples: -123 0x10 0177 0o177 0b1011
Float A floating point number. |floating-point-format| *Float*
- {only when compiled with the |+float| feature} *E1076*
Examples: 123.456 1.15e-6 -1.1e3
String A NUL terminated string of 8-bit unsigned characters (bytes).
{exp} is the exponent, power of 10.
Only a decimal point is accepted, not a comma. No matter what the current
locale is.
-{only when compiled with the |+float| feature}
Examples:
123.456
characters. This sets $LC_COLLATE.
Without an argument all are set, and additionally
$LANG is set.
- When compiled with the |+float| feature the LC_NUMERIC
- value will always be set to "C", so that floating
- point numbers use '.' as the decimal point.
+ If available the LC_NUMERIC value will always be set
+ to "C", so that floating point numbers use '.' as the
+ decimal point.
This will make a difference for items that depend on
the language (some messages, time and date format).
Not fully supported on all systems
N *+folding* |folding|
*+footer* |gui-footer|
*+fork* Unix only: |fork| shell commands
- *+float* Floating point support
+T *+float* Floating point support Always enabled since 9.0.0491
N *+gettext* message translations |multi-lang|
- *+GUI_Athena* Unix only: Athena |GUI|
*+GUI_neXtaw* Unix only: neXtaw |GUI|
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strtod() and other floating point functions" >&5
-$as_echo_n "checking for strtod() and other floating point functions... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#ifdef HAVE_MATH_H
-# include <math.h>
-#endif
-#if STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#endif
-
-int
-main ()
-{
-char *s; double d;
- d = strtod("1.1", &s);
- d = fabs(1.11);
- d = ceil(1.11);
- d = floor(1.11);
- d = log10(1.11);
- d = pow(1.11, 2.22);
- d = sqrt(1.11);
- d = sin(1.11);
- d = cos(1.11);
- d = atan(1.11);
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }; $as_echo "#define HAVE_FLOAT_FUNCS 1" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for isinf()" >&5
$as_echo_n "checking for isinf()... " >&6; }
#undef HAVE_FCHDIR
#undef HAVE_FCHOWN
#undef HAVE_FCHMOD
-#undef HAVE_FLOAT_FUNCS
#undef HAVE_FSEEKO
#undef HAVE_FSYNC
#undef HAVE_FTRUNCATE
AC_MSG_RESULT(yes); AC_DEFINE(HAVE_NL_LANGINFO_CODESET),
AC_MSG_RESULT(no))
-dnl Need various functions for floating point support. Only enable
-dnl floating point when they are all present.
+dnl Floating point support may require the "m" library
AC_CHECK_LIB(m, strtod)
-AC_MSG_CHECKING([for strtod() and other floating point functions])
-AC_LINK_IFELSE([AC_LANG_PROGRAM([
-#ifdef HAVE_MATH_H
-# include <math.h>
-#endif
-#if STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#endif
-], [char *s; double d;
- d = strtod("1.1", &s);
- d = fabs(1.11);
- d = ceil(1.11);
- d = floor(1.11);
- d = log10(1.11);
- d = pow(1.11, 2.22);
- d = sqrt(1.11);
- d = sin(1.11);
- d = cos(1.11);
- d = atan(1.11);
- ])],
- AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FLOAT_FUNCS),
- AC_MSG_RESULT(no))
dnl isinf() and isnan() need to include header files and may need -lm.
AC_MSG_CHECKING([for isinf()])
}
if (evaluate)
{
-#ifdef FEAT_FLOAT
if (tvkey.v_type == VAR_FLOAT)
{
tvkey.vval.v_string = typval_tostring(&tvkey, TRUE);
tvkey.v_type = VAR_STRING;
}
-#endif
key = tv_get_string_buf_chk(&tvkey, buf);
if (key == NULL)
{
INIT(= N_("E360: Cannot execute shell with -f option"));
#endif
// E361 unused
-#if defined(FEAT_EVAL) && defined(FEAT_FLOAT)
+#if defined(FEAT_EVAL)
EXTERN char e_using_boolean_value_as_float[]
INIT(= N_("E362: Using a boolean value as a Float"));
#endif
// xgettext:no-c-format
INIT(= N_("E804: Cannot use '%' with Float"));
#endif
-#ifdef FEAT_FLOAT
EXTERN char e_using_float_as_number[]
INIT(= N_("E805: Using a Float as a Number"));
EXTERN char e_using_float_as_string[]
INIT(= N_("E806: Using a Float as a String"));
-#endif
-#ifdef FEAT_FLOAT
EXTERN char e_expected_float_argument_for_printf[]
INIT(= N_("E807: Expected Float argument for printf()"));
-#endif
-#if defined(FEAT_EVAL) && defined(FEAT_FLOAT)
+#if defined(FEAT_EVAL)
EXTERN char e_number_or_float_required[]
INIT(= N_("E808: Number or Float required"));
#endif
EXTERN char e_trailing_char_after_rsb_str_str[]
INIT(= N_("E890: Trailing char after ']': %s]%s"));
#endif
-#ifdef FEAT_FLOAT
EXTERN char e_using_funcref_as_float[]
INIT(= N_("E891: Using a Funcref as a Float"));
EXTERN char e_using_string_as_float[]
INIT(= N_("E893: Using a List as a Float"));
EXTERN char e_using_dictionary_as_float[]
INIT(= N_("E894: Using a Dictionary as a Float"));
-#endif
#ifdef FEAT_MZSCHEME
EXTERN char e_sorry_this_command_is_disabled_the_mzscheme_racket_base_module_could_not_be_loaded[]
INIT(= N_("E895: Sorry, this command is disabled, the MzScheme's racket/base module could not be loaded."));
EXTERN char e_not_an_open_channel[]
INIT(= N_("E906: Not an open channel"));
#endif
-#ifdef FEAT_FLOAT
EXTERN char e_using_special_value_as_float[]
INIT(= N_("E907: Using a special value as a Float"));
-#endif
#ifdef FEAT_EVAL
EXTERN char e_using_invalid_value_as_string_str[]
INIT(= N_("E908: Using an invalid value as a String: %s"));
INIT(= N_("E973: Blob literal should have an even number of hex characters"));
EXTERN char e_using_blob_as_number[]
INIT(= N_("E974: Using a Blob as a Number"));
-# ifdef FEAT_FLOAT
EXTERN char e_using_blob_as_float[]
INIT(= N_("E975: Using a Blob as a Float"));
-# endif
EXTERN char e_using_blob_as_string[]
INIT(= N_("E976: Using a Blob as a String"));
EXTERN char e_can_only_compare_blob_with_blob[]
INIT(= N_("E1074: No white space allowed after dot"));
EXTERN char e_namespace_not_supported_str[]
INIT(= N_("E1075: Namespace not supported: %s"));
-# ifndef FEAT_FLOAT
-EXTERN char e_this_vim_is_not_compiled_with_float_support[]
- INIT(= N_("E1076: This Vim is not compiled with float support"));
-# endif
+// E1076 was deleted
EXTERN char e_missing_argument_type_for_str[]
INIT(= N_("E1077: Missing argument type for %s"));
#endif
{
garray_T ga;
char_u *retval;
-#ifdef FEAT_FLOAT
char_u numbuf[NUMBUFLEN];
-#endif
if (convert && tv->v_type == VAR_LIST)
{
ga_append(&ga, NUL);
retval = (char_u *)ga.ga_data;
}
-#ifdef FEAT_FLOAT
else if (convert && tv->v_type == VAR_FLOAT)
{
vim_snprintf((char *)numbuf, NUMBUFLEN, "%g", tv->vval.v_float);
retval = vim_strsave(numbuf);
}
-#endif
else
retval = vim_strsave(tv_get_string(tv));
return retval;
{
// nr += nr , nr -= nr , nr *=nr , nr /= nr , nr %= nr
n = tv_get_number(tv1);
-#ifdef FEAT_FLOAT
if (tv2->v_type == VAR_FLOAT)
{
float_T f = n;
tv1->vval.v_float = f;
}
else
-#endif
{
switch (*op)
{
return failed ? FAIL : OK;
case VAR_FLOAT:
-#ifdef FEAT_FLOAT
{
float_T f;
case '/': tv1->vval.v_float /= f; break;
}
}
-#endif
return OK;
}
}
}
if ((op != '+' || (rettv->v_type != VAR_LIST
&& rettv->v_type != VAR_BLOB))
-#ifdef FEAT_FLOAT
&& (op == '.' || rettv->v_type != VAR_FLOAT)
-#endif
&& evaluate)
{
int error = FALSE;
|| var2.v_type == VAR_JOB))
semsg(_(e_using_invalid_value_as_string_str),
vartype_name(var2.v_type));
-#ifdef FEAT_FLOAT
else if (vim9script && var2.v_type == VAR_FLOAT)
{
vim_snprintf((char *)buf2, NUMBUFLEN, "%g",
var2.vval.v_float);
s2 = buf2;
}
-#endif
else
s2 = tv_get_string_buf_chk(&var2, buf2);
if (s2 == NULL) // type error ?
{
int error = FALSE;
varnumber_T n1, n2;
-#ifdef FEAT_FLOAT
- float_T f1 = 0, f2 = 0;
+ float_T f1 = 0, f2 = 0;
if (rettv->v_type == VAR_FLOAT)
{
n1 = 0;
}
else
-#endif
{
n1 = tv_get_number_chk(rettv, &error);
if (error)
clear_tv(&var2);
return FAIL;
}
-#ifdef FEAT_FLOAT
if (var2.v_type == VAR_FLOAT)
f1 = n1;
-#endif
}
-#ifdef FEAT_FLOAT
if (var2.v_type == VAR_FLOAT)
{
f2 = var2.vval.v_float;
n2 = 0;
}
else
-#endif
{
n2 = tv_get_number_chk(&var2, &error);
if (error)
clear_tv(&var2);
return FAIL;
}
-#ifdef FEAT_FLOAT
if (rettv->v_type == VAR_FLOAT)
f2 = n2;
-#endif
}
clear_tv(rettv);
-#ifdef FEAT_FLOAT
// If there is a float on either side the result is a float.
if (rettv->v_type == VAR_FLOAT || var2.v_type == VAR_FLOAT)
{
rettv->vval.v_float = f1;
}
else
-#endif
{
if (op == '+')
n1 = n1 + n2;
evalarg_T *evalarg,
int want_string) // after "." operator
{
-#ifdef FEAT_FLOAT
int use_float = FALSE;
-#endif
/*
* Get the first expression.
char_u *p;
int op;
varnumber_T n1, n2;
-#ifdef FEAT_FLOAT
float_T f1, f2;
-#endif
int error;
// "*=", "/=" and "%=" are assignments
*arg = p;
}
-#ifdef FEAT_FLOAT
f1 = 0;
f2 = 0;
-#endif
error = FALSE;
if (evaluate)
{
-#ifdef FEAT_FLOAT
if (rettv->v_type == VAR_FLOAT)
{
f1 = rettv->vval.v_float;
n1 = 0;
}
else
-#endif
n1 = tv_get_number_chk(rettv, &error);
clear_tv(rettv);
if (error)
if (evaluate)
{
-#ifdef FEAT_FLOAT
if (var2.v_type == VAR_FLOAT)
{
if (!use_float)
n2 = 0;
}
else
-#endif
{
n2 = tv_get_number_chk(&var2, &error);
clear_tv(&var2);
if (error)
return FAIL;
-#ifdef FEAT_FLOAT
if (use_float)
f2 = n2;
-#endif
}
/*
* Compute the result.
* When either side is a float the result is a float.
*/
-#ifdef FEAT_FLOAT
if (use_float)
{
if (op == '*')
f1 = f1 * f2;
else if (op == '/')
{
-# ifdef VMS
+#ifdef VMS
// VMS crashes on divide by zero, work around it
if (f2 == 0.0)
{
}
else
f1 = f1 / f2;
-# else
+#else
// We rely on the floating point library to handle divide
// by zero to result in "inf" and not a crash.
f1 = f1 / f2;
-# endif
+#endif
}
else
{
rettv->vval.v_float = f1;
}
else
-#endif
{
int failed = FALSE;
return FAIL;
end_leader = *arg;
- if (**arg == '.' && (!isdigit(*(*arg + 1))
-#ifdef FEAT_FLOAT
- || in_old_script(2)
-#endif
- ))
+ if (**arg == '.' && (!isdigit(*(*arg + 1)) || in_old_script(2)))
{
semsg(_(e_invalid_expression_str), *arg);
++*arg;
varnumber_T val = 0;
vartype_T type = rettv->v_type;
int vim9script = in_vim9script();
-#ifdef FEAT_FLOAT
float_T f = 0.0;
if (rettv->v_type == VAR_FLOAT)
f = rettv->vval.v_float;
else
-#endif
{
while (VIM_ISWHITE(end_leader[-1]))
--end_leader;
++end_leader;
break;
}
-#ifdef FEAT_FLOAT
if (rettv->v_type == VAR_FLOAT)
{
if (vim9script)
f = !f;
}
else
-#endif
{
val = !val;
type = VAR_BOOL;
}
else if (*end_leader == '-')
{
-#ifdef FEAT_FLOAT
if (rettv->v_type == VAR_FLOAT)
f = -f;
else
-#endif
{
val = -val;
type = VAR_NUMBER;
}
}
}
-#ifdef FEAT_FLOAT
if (rettv->v_type == VAR_FLOAT)
{
clear_tv(rettv);
rettv->vval.v_float = f;
}
else
-#endif
{
clear_tv(rettv);
if (vim9script)
{
int error = FALSE;
-#ifdef FEAT_FLOAT
// allow for indexing with float
if (vim9script && rettv->v_type == VAR_DICT
&& var1.v_type == VAR_FLOAT)
var1.vval.v_string = typval_tostring(&var1, TRUE);
var1.v_type = VAR_STRING;
}
-#endif
+
if (vim9script && rettv->v_type == VAR_LIST)
tv_get_number_chk(&var1, &error);
else
emsg(_(e_cannot_index_a_funcref));
return FAIL;
case VAR_FLOAT:
-#ifdef FEAT_FLOAT
if (verbose)
emsg(_(e_using_float_as_string));
return FAIL;
-#endif
case VAR_BOOL:
case VAR_SPECIAL:
case VAR_JOB:
break;
case VAR_FLOAT:
-#ifdef FEAT_FLOAT
*tofree = NULL;
vim_snprintf((char *)numbuf, NUMBUFLEN, "%g", tv->vval.v_float);
r = numbuf;
break;
-#endif
case VAR_BOOL:
case VAR_SPECIAL:
#define FEARG_3 3 // base is the third argument
#define FEARG_4 4 // base is the fourth argument
-#ifdef FEAT_FLOAT
-# define FLOAT_FUNC(name) name
-#else
-# define FLOAT_FUNC(name) NULL
-#endif
-#if defined(FEAT_FLOAT) && defined(HAVE_MATH_H)
+#if defined(HAVE_MATH_H)
# define MATH_FUNC(name) name
#else
# define MATH_FUNC(name) NULL
static funcentry_T global_functions[] =
{
{"abs", 1, 1, FEARG_1, arg1_float_or_nr,
- ret_any, FLOAT_FUNC(f_abs)},
+ ret_any, f_abs},
{"acos", 1, 1, FEARG_1, arg1_float_or_nr,
- ret_float, FLOAT_FUNC(f_acos)},
+ ret_float, f_acos},
{"add", 2, 2, FEARG_1, arg2_listblob_item,
ret_first_arg, f_add},
{"and", 2, 2, FEARG_1, arg2_number,
{"argv", 0, 2, 0, arg2_number,
ret_argv, f_argv},
{"asin", 1, 1, FEARG_1, arg1_float_or_nr,
- ret_float, FLOAT_FUNC(f_asin)},
+ ret_float, f_asin},
{"assert_beeps", 1, 1, FEARG_1, arg1_string,
ret_number_bool, f_assert_beeps},
{"assert_equal", 2, 3, FEARG_2, NULL,
{"assert_true", 1, 2, FEARG_1, NULL,
ret_number_bool, f_assert_true},
{"atan", 1, 1, FEARG_1, arg1_float_or_nr,
- ret_float, FLOAT_FUNC(f_atan)},
+ ret_float, f_atan},
{"atan2", 2, 2, FEARG_1, arg2_float_or_nr,
- ret_float, FLOAT_FUNC(f_atan2)},
+ ret_float, f_atan2},
{"autocmd_add", 1, 1, FEARG_1, arg1_list_any,
ret_number_bool, f_autocmd_add},
{"autocmd_delete", 1, 1, FEARG_1, arg1_list_any,
{"call", 2, 3, FEARG_1, arg3_any_list_dict,
ret_any, f_call},
{"ceil", 1, 1, FEARG_1, arg1_float_or_nr,
- ret_float, FLOAT_FUNC(f_ceil)},
+ ret_float, f_ceil},
{"ch_canread", 1, 1, FEARG_1, arg1_chan_or_job,
ret_number_bool, JOB_FUNC(f_ch_canread)},
{"ch_close", 1, 1, FEARG_1, arg1_chan_or_job,
{"copy", 1, 1, FEARG_1, NULL,
ret_copy, f_copy},
{"cos", 1, 1, FEARG_1, arg1_float_or_nr,
- ret_float, FLOAT_FUNC(f_cos)},
+ ret_float, f_cos},
{"cosh", 1, 1, FEARG_1, arg1_float_or_nr,
- ret_float, FLOAT_FUNC(f_cosh)},
+ ret_float, f_cosh},
{"count", 2, 4, FEARG_1, arg24_count,
ret_number, f_count},
{"cscope_connection",0,3, 0, arg3_number_string_string,
{"exists_compiled", 1, 1, FEARG_1, arg1_string,
ret_number_bool, f_exists_compiled},
{"exp", 1, 1, FEARG_1, arg1_float_or_nr,
- ret_float, FLOAT_FUNC(f_exp)},
+ ret_float, f_exp},
{"expand", 1, 3, FEARG_1, arg3_string_bool_bool,
ret_any, f_expand},
{"expandcmd", 1, 2, FEARG_1, arg2_string_dict,
{"flattennew", 1, 2, FEARG_1, arg2_list_any_number,
ret_list_any, f_flattennew},
{"float2nr", 1, 1, FEARG_1, arg1_float_or_nr,
- ret_number, FLOAT_FUNC(f_float2nr)},
+ ret_number, f_float2nr},
{"floor", 1, 1, FEARG_1, arg1_float_or_nr,
- ret_float, FLOAT_FUNC(f_floor)},
+ ret_float, f_floor},
{"fmod", 2, 2, FEARG_1, arg2_float_or_nr,
- ret_float, FLOAT_FUNC(f_fmod)},
+ ret_float, f_fmod},
{"fnameescape", 1, 1, FEARG_1, arg1_string,
ret_string, f_fnameescape},
{"fnamemodify", 2, 2, FEARG_1, arg2_string,
{"localtime", 0, 0, 0, NULL,
ret_number, f_localtime},
{"log", 1, 1, FEARG_1, arg1_float_or_nr,
- ret_float, FLOAT_FUNC(f_log)},
+ ret_float, f_log},
{"log10", 1, 1, FEARG_1, arg1_float_or_nr,
- ret_float, FLOAT_FUNC(f_log10)},
+ ret_float, f_log10},
{"luaeval", 1, 2, FEARG_1, arg2_string_any,
ret_any,
#ifdef FEAT_LUA
{"popup_show", 1, 1, FEARG_1, arg1_number,
ret_void, PROP_FUNC(f_popup_show)},
{"pow", 2, 2, FEARG_1, arg2_float_or_nr,
- ret_float, FLOAT_FUNC(f_pow)},
+ ret_float, f_pow},
{"prevnonblank", 1, 1, FEARG_1, arg1_lnum,
ret_number, f_prevnonblank},
{"printf", 1, 19, FEARG_2, arg119_printf,
{"reltime", 0, 2, FEARG_1, arg2_list_number,
ret_list_any, f_reltime},
{"reltimefloat", 1, 1, FEARG_1, arg1_list_number,
- ret_float, FLOAT_FUNC(f_reltimefloat)},
+ ret_float, f_reltimefloat},
{"reltimestr", 1, 1, FEARG_1, arg1_list_number,
ret_string, f_reltimestr},
{"remote_expr", 2, 4, FEARG_1, arg24_remote_expr,
{"reverse", 1, 1, FEARG_1, arg1_list_or_blob,
ret_first_arg, f_reverse},
{"round", 1, 1, FEARG_1, arg1_float_or_nr,
- ret_float, FLOAT_FUNC(f_round)},
+ ret_float, f_round},
{"rubyeval", 1, 1, FEARG_1, arg1_string,
ret_any,
#ifdef FEAT_RUBY
{"simplify", 1, 1, FEARG_1, arg1_string,
ret_string, f_simplify},
{"sin", 1, 1, FEARG_1, arg1_float_or_nr,
- ret_float, FLOAT_FUNC(f_sin)},
+ ret_float, f_sin},
{"sinh", 1, 1, FEARG_1, arg1_float_or_nr,
- ret_float, FLOAT_FUNC(f_sinh)},
+ ret_float, f_sinh},
{"slice", 2, 3, FEARG_1, arg23_slice,
ret_slice, f_slice},
{"sort", 1, 3, FEARG_1, arg13_sortuniq,
{"split", 1, 3, FEARG_1, arg3_string_string_bool,
ret_list_string, f_split},
{"sqrt", 1, 1, FEARG_1, arg1_float_or_nr,
- ret_float, FLOAT_FUNC(f_sqrt)},
+ ret_float, f_sqrt},
{"srand", 0, 1, FEARG_1, arg1_number,
ret_list_number, f_srand},
{"state", 0, 1, FEARG_1, arg1_string,
ret_string, f_state},
{"str2float", 1, 2, FEARG_1, arg2_string_bool,
- ret_float, FLOAT_FUNC(f_str2float)},
+ ret_float, f_str2float},
{"str2list", 1, 2, FEARG_1, arg2_string_bool,
ret_list_number, f_str2list},
{"str2nr", 1, 3, FEARG_1, arg3_string_number_bool,
{"taglist", 1, 2, FEARG_1, arg2_string,
ret_list_dict_any, f_taglist},
{"tan", 1, 1, FEARG_1, arg1_float_or_nr,
- ret_float, FLOAT_FUNC(f_tan)},
+ ret_float, f_tan},
{"tanh", 1, 1, FEARG_1, arg1_float_or_nr,
- ret_float, FLOAT_FUNC(f_tanh)},
+ ret_float, f_tanh},
{"tempname", 0, 0, 0, NULL,
ret_string, f_tempname},
{"term_dumpdiff", 2, 3, FEARG_1, arg3_string_string_dict,
{"trim", 1, 3, FEARG_1, arg3_string_string_number,
ret_string, f_trim},
{"trunc", 1, 1, FEARG_1, arg1_float_or_nr,
- ret_float, FLOAT_FUNC(f_trunc)},
+ ret_float, f_trunc},
{"type", 1, 1, FEARG_1, NULL,
ret_number, f_type},
{"typename", 1, 1, FEARG_1, NULL,
n = argvars[0].vval.v_number == 0;
break;
case VAR_FLOAT:
-#ifdef FEAT_FLOAT
n = argvars[0].vval.v_float == 0.0;
break;
-#endif
case VAR_LIST:
n = argvars[0].vval.v_list == NULL
|| argvars[0].vval.v_list->lv_len == 0;
0
#endif
},
- {"float",
-#ifdef FEAT_FLOAT
- 1
-#else
- 0
-#endif
- },
+ {"float", 1},
{"folding",
#ifdef FEAT_FOLDING
1
#include "vim.h"
#include "version.h"
-#ifdef FEAT_FLOAT
-# include <float.h>
-#endif
+#include <float.h>
static int linelen(int *has_tab);
static void do_filter(linenr_T line1, linenr_T line2, exarg_T *eap, char_u *cmd, int do_in, int do_out);
static int sort_ic; // ignore case
static int sort_nr; // sort on number
static int sort_rx; // sort on regex instead of skipping it
-#ifdef FEAT_FLOAT
static int sort_flt; // sort on floating number
-#endif
static int sort_abort; // flag to indicate if sorting has been interrupted
varnumber_T value; // value if sorting by integer
int is_number; // TRUE when line contains a number
} num;
-#ifdef FEAT_FLOAT
float_T value_flt; // value if sorting by float
-#endif
} st_u;
} sorti_T;
result = l1.st_u.num.value == l2.st_u.num.value ? 0
: l1.st_u.num.value > l2.st_u.num.value ? 1 : -1;
}
-#ifdef FEAT_FLOAT
else if (sort_flt)
result = l1.st_u.value_flt == l2.st_u.value_flt ? 0
: l1.st_u.value_flt > l2.st_u.value_flt ? 1 : -1;
-#endif
else
{
// We need to copy one line into "sortbuf1", because there is no
goto sortend;
sort_abort = sort_ic = sort_lc = sort_rx = sort_nr = 0;
-#ifdef FEAT_FLOAT
sort_flt = 0;
-#endif
for (p = eap->arg; *p != NUL; ++p)
{
sort_nr = 1;
++format_found;
}
-#ifdef FEAT_FLOAT
else if (*p == 'f')
{
sort_flt = 1;
++format_found;
}
-#endif
else if (*p == 'b')
{
sort_what = STR2NR_BIN + STR2NR_FORCE;
if (regmatch.regprog != NULL)
end_col = 0;
- if (sort_nr
-#ifdef FEAT_FLOAT
- || sort_flt
-#endif
- )
+ if (sort_nr || sort_flt)
{
// Make sure vim_str2nr doesn't read any digits past the end
// of the match, by temporarily terminating the string there
NULL, 0, FALSE);
}
}
-#ifdef FEAT_FLOAT
else
{
s = skipwhite(p);
nrs[lnum - eap->line1].st_u.value_flt =
strtod((char *)s, NULL);
}
-#endif
*s2 = c;
}
else
* +wildignore 'wildignore' and 'backupskip' options
* +wildmenu 'wildmenu' option
* +builtin_terms all builtin termcap entries included
+ * +float Floating point variables.
*
* Obsolete:
* +tag_old_static Old style static tags: "file:tag file ..".
/*
* +eval Built-in script language and expression evaluation,
* ":let", ":if", etc.
- * +float Floating point variables.
*/
#ifdef FEAT_NORMAL
# define FEAT_EVAL
-# if defined(HAVE_FLOAT_FUNCS) || defined(MSWIN) || defined(MACOS_X)
-# define FEAT_FLOAT
-# endif
#endif
#ifdef FEAT_EVAL
#include "vim.h"
-#if (defined(FEAT_EVAL) && defined(FEAT_FLOAT)) || defined(PROTO)
+#if defined(FEAT_EVAL) || defined(PROTO)
#ifdef VMS
# include <float.h>
{
gnome_program_init(VIMPACKAGE, VIM_VERSION_SHORT,
LIBGNOMEUI_MODULE, gui_argc, gui_argv, NULL);
-# if defined(FEAT_FLOAT) && defined(LC_NUMERIC)
+# if defined(LC_NUMERIC)
{
char *p = setlocale(LC_NUMERIC, NULL);
cmdline_options, XtNumber(cmdline_options),
CARDINAL &gui_argc, gui_argv);
-# if defined(FEAT_FLOAT) && defined(LC_NUMERIC)
+# if defined(LC_NUMERIC)
{
// The call to XtOpenDisplay() may have set the locale from the
// environment. Set LC_NUMERIC to "C" to make sure that strtod() uses a
case VAR_NUMBER:
lua_pushinteger(L, (int) tv->vval.v_number);
break;
-#ifdef FEAT_FLOAT
case VAR_FLOAT:
lua_pushnumber(L, (lua_Number) tv->vval.v_float);
break;
-#endif
case VAR_LIST:
luaV_pushlist(L, tv->vval.v_list);
break;
tv->vval.v_string = vim_strsave((char_u *) lua_tostring(L, pos));
break;
case LUA_TNUMBER:
-#ifdef FEAT_FLOAT
{
const lua_Number n = lua_tonumber(L, pos);
tv->vval.v_number = (varnumber_T)n;
}
}
-#else
- tv->v_type = VAR_NUMBER;
- tv->vval.v_number = (varnumber_T) lua_tointeger(L, pos);
-#endif
break;
case LUA_TFUNCTION:
{
result = scheme_make_integer((long)vim_value->vval.v_number);
MZ_GC_CHECK();
}
-# ifdef FEAT_FLOAT
else if (vim_value->v_type == VAR_FLOAT)
{
result = scheme_make_double((double)vim_value->vval.v_float);
MZ_GC_CHECK();
}
-# endif
else if (vim_value->v_type == VAR_LIST)
{
list_T *list = vim_value->vval.v_list;
tv->v_type = VAR_BOOL;
tv->vval.v_number = SCHEME_TRUEP(obj);
}
-# ifdef FEAT_FLOAT
else if (SCHEME_DBLP(obj))
{
tv->v_type = VAR_FLOAT;
tv->vval.v_float = SCHEME_DBL_VAL(obj);
}
-# endif
else if (SCHEME_BYTE_STRINGP(obj))
{
tv->v_type = VAR_STRING;
sprintf(buf, "%ld", (long)our_tv->vval.v_number);
ret = PyString_FromString((char *)buf);
}
-#ifdef FEAT_FLOAT
else if (our_tv->v_type == VAR_FLOAT)
{
char buf[NUMBUFLEN];
sprintf(buf, "%f", our_tv->vval.v_float);
ret = PyString_FromString((char *)buf);
}
-#endif
else if (our_tv->v_type == VAR_LIST)
{
list_T *list = our_tv->vval.v_list;
}
else if (PyDict_Check(obj))
return convert_dl(obj, tv, pydict_to_tv, lookup_dict);
-#ifdef FEAT_FLOAT
else if (PyFloat_Check(obj))
{
tv->v_type = VAR_FLOAT;
tv->vval.v_float = (float_T) PyFloat_AsDouble(obj);
}
-#endif
else if (PyObject_HasAttrString(obj, "keys"))
return convert_dl(obj, tv, pymap_to_tv, lookup_dict);
// PyObject_GetIter can create built-in iterator for any sequence object
case VAR_NUMBER:
return PyLong_FromLong((long) tv->vval.v_number);
case VAR_FLOAT:
-#ifdef FEAT_FLOAT
return PyFloat_FromDouble((double) tv->vval.v_float);
-#endif
case VAR_LIST:
return NEW_LIST(tv->vval.v_list);
case VAR_DICT:
{
result = INT2NUM(tv->vval.v_number);
}
-# ifdef FEAT_FLOAT
else if (tv->v_type == VAR_FLOAT)
{
result = rb_float_new(tv->vval.v_float);
}
-# endif
else if (tv->v_type == VAR_LIST)
{
list_T *list = tv->vval.v_list;
rettv->v_type = VAR_NUMBER;
rettv->vval.v_number = (varnumber_T)NUM2LONG(val);
break;
-#ifdef FEAT_FLOAT
case T_FLOAT:
rettv->v_type = VAR_FLOAT;
rettv->vval.v_float = (float_T)NUM2DBL(val);
break;
-#endif
default:
val = rb_obj_as_string(val);
// FALLTHROUGH
break;
case VAR_FLOAT:
-#ifdef FEAT_FLOAT
-# if defined(HAVE_MATH_H)
+#if defined(HAVE_MATH_H)
if (isnan(val->vval.v_float))
ga_concat(gap, (char_u *)"NaN");
else if (isinf(val->vval.v_float))
ga_concat(gap, (char_u *)"Infinity");
}
else
-# endif
+#endif
{
vim_snprintf((char *)numbuf, NUMBUFLEN, "%g",
val->vval.v_float);
ga_concat(gap, numbuf);
}
break;
-#endif
case VAR_UNKNOWN:
case VAR_ANY:
case VAR_VOID:
}
}
sp = skipdigits(sp);
-#ifdef FEAT_FLOAT
if (*sp == '.' || *sp == 'e' || *sp == 'E')
{
if (cur_item == NULL)
}
}
else
-#endif
{
varnumber_T nr;
retval = OK;
break;
}
-#ifdef FEAT_FLOAT
if (STRNICMP((char *)p, "NaN", 3) == 0)
{
reader->js_used += 3;
retval = OK;
break;
}
-#endif
// check for truncated name
len = (int)(reader->js_end
- (reader->js_buf + reader->js_used));
if (
(len < 5 && STRNICMP((char *)p, "false", len) == 0)
-#ifdef FEAT_FLOAT
- || (len < 9 && STRNICMP((char *)p, "-Infinity", len) == 0)
- || (len < 8 && STRNICMP((char *)p, "Infinity", len) == 0)
+ || (len < 9
+ && STRNICMP((char *)p, "-Infinity", len) == 0)
+ || (len < 8
+ && STRNICMP((char *)p, "Infinity", len) == 0)
|| (len < 3 && STRNICMP((char *)p, "NaN", len) == 0)
-#endif
- || (len < 4 && (STRNICMP((char *)p, "true", len) == 0
- || STRNICMP((char *)p, "null", len) == 0)))
+ || (len < 4
+ && (STRNICMP((char *)p, "true", len) == 0
+ || STRNICMP((char *)p, "null", len) == 0)))
retval = MAYBE;
else
if (top_item != NULL && top_item->jd_type == JSON_OBJECT_KEY
&& cur_item != NULL)
{
-#ifdef FEAT_FLOAT
if (cur_item->v_type == VAR_FLOAT)
{
// cannot use a float as a key
retval = FAIL;
goto theend;
}
-#endif
top_item->jd_key = tv_get_string_buf_chk(cur_item, key_buf);
if (top_item->jd_key == NULL)
{
int item_compare_lc;
int item_compare_numeric;
int item_compare_numbers;
-#ifdef FEAT_FLOAT
int item_compare_float;
-#endif
char_u *item_compare_func;
partial_T *item_compare_partial;
dict_T *item_compare_selfdict;
return v1 == v2 ? 0 : v1 > v2 ? 1 : -1;
}
-#ifdef FEAT_FLOAT
if (sortinfo->item_compare_float)
{
float_T v1 = tv_get_float(tv1);
return v1 == v2 ? 0 : v1 > v2 ? 1 : -1;
}
-#endif
// tv2string() puts quotes around a string and allocates memory. Don't do
// that for string variables. Use a single quote when comparing with a
info->item_compare_lc = FALSE;
info->item_compare_numeric = FALSE;
info->item_compare_numbers = FALSE;
-#ifdef FEAT_FLOAT
info->item_compare_float = FALSE;
-#endif
info->item_compare_func = NULL;
info->item_compare_partial = NULL;
info->item_compare_selfdict = NULL;
info->item_compare_func = NULL;
info->item_compare_numbers = TRUE;
}
-#ifdef FEAT_FLOAT
else if (STRCMP(info->item_compare_func, "f") == 0)
{
info->item_compare_func = NULL;
info->item_compare_float = TRUE;
}
-#endif
else if (STRCMP(info->item_compare_func, "i") == 0)
{
info->item_compare_func = NULL;
// Tell Gtk not to change our locale settings.
gtk_disable_setlocale();
# endif
-# if defined(FEAT_FLOAT) && defined(LC_NUMERIC)
+# if defined(LC_NUMERIC)
// Make sure strtod() uses a decimal point, not a comma.
setlocale(LC_NUMERIC, "C");
# endif
# endif
{
loc = setlocale(what, (char *)name);
-# if defined(FEAT_FLOAT) && defined(LC_NUMERIC)
+# if defined(LC_NUMERIC)
// Make sure strtod() uses a decimal point, not a comma.
setlocale(LC_NUMERIC, "C");
# endif
# define MESSAGE_QUEUE
#endif
-#if defined(FEAT_EVAL) && defined(FEAT_FLOAT)
+#if defined(FEAT_EVAL)
# include <float.h>
# if defined(HAVE_MATH_H)
// for isnan() and isinf()
assert(bsize == 0 || STRNCMP(buf, "001100", bsize_int) == 0);
assert(bsize == 0 || buf[MIN(n, bsize_int)] == '\0');
-#ifdef FEAT_FLOAT
n = vim_snprintf(buf, bsize, "%f", 1.234);
assert(n == 8);
assert(bsize == 0 || STRNCMP(buf, "1.234000", bsize_int) == 0);
assert(n == 9);
assert(bsize == 0 || STRNCMP(buf, "-0.000000", bsize_int) == 0);
assert(bsize == 0 || buf[MIN(n, bsize_int)] == '\0');
-#endif
n = vim_snprintf(buf, bsize, "%s", "漢語");
assert(n == 6);
# ifdef HAVE_LOCALE_H
setlocale(LC_ALL, "");
# endif
-# if defined(FEAT_FLOAT) && defined(LC_NUMERIC)
+# if defined(LC_NUMERIC)
// Make sure strtod() uses a decimal point, not a comma.
setlocale(LC_NUMERIC, "C");
# endif
#define HAVE_SETENV
#define HAVE_SETJMP_H
#define HAVE_MATH_H
-#define HAVE_FLOAT_FUNCS
#define HAVE_GETTIMEOFDAY
#define HAVE_PWD_H
#define HAVE_NETDB_H
return buf;
}
-# if defined(FEAT_FLOAT) || defined(PROTO)
/*
* Return a float that represents the time in "tm".
*/
float_T
profile_float(proftime_T *tm)
{
-# ifdef MSWIN
+# ifdef MSWIN
LARGE_INTEGER fr;
QueryPerformanceFrequency(&fr);
return (float_T)tm->QuadPart / (float_T)fr.QuadPart;
-# else
+# else
return (float_T)tm->tv_sec + (float_T)tm->tv_usec / 1000000.0;
-# endif
-}
# endif
+}
/*
* Put the time "msec" past now in "tm".
# endif // FEAT_PROFILE || FEAT_RELTIME
-#if defined(FEAT_SYN_HL) && defined(FEAT_RELTIME) && defined(FEAT_FLOAT) && defined(FEAT_PROFILE)
+#if defined(FEAT_SYN_HL) && defined(FEAT_RELTIME) && defined(FEAT_PROFILE)
# if defined(HAVE_MATH_H)
# include <math.h>
# endif
}
vim_free(p);
}
-#ifdef FEAT_FLOAT
else if (this_var->di_tv.v_type == VAR_FLOAT
&& var_flavour(this_var->di_key) == VAR_FLAVOUR_SESSION)
{
|| put_eol(fd) == FAIL)
return FAIL;
}
-#endif
}
}
return OK;
return s;
}
-# ifdef FEAT_FLOAT
/*
* Get float argument from "idxp" entry in "tvs". First entry is 1.
*/
}
return f;
}
-# endif
#endif
-#ifdef FEAT_FLOAT
/*
* Return the representation of infinity for printf() function:
* "-inf", "inf", "+inf", " inf", "-INF", "INF", "+INF" or " INF".
idx += 4;
return table[idx];
}
-#endif
/*
* This code was included to provide a portable vsnprintf() and snprintf().
char length_modifier = '\0';
// temporary buffer for simple numeric->string conversion
-# if defined(FEAT_FLOAT)
-# define TMP_LEN 350 // On my system 1e308 is the biggest number possible.
+# define TMP_LEN 350 // On my system 1e308 is the biggest number possible.
// That sounds reasonable to use as the maximum
// printable.
-# else
-# define TMP_LEN 66
-# endif
char tmp[TMP_LEN];
// string address in case of string argument
break;
}
-# ifdef FEAT_FLOAT
case 'f':
case 'F':
case 'e':
int remove_trailing_zeroes = FALSE;
f =
-# if defined(FEAT_EVAL)
+# if defined(FEAT_EVAL)
tvs != NULL ? tv_float(tvs, &arg_idx) :
-# endif
+# endif
va_arg(ap, double);
abs_f = f < 0 ? -f : f;
}
if ((fmt_spec == 'f' || fmt_spec == 'F') &&
-# ifdef VAX
+# ifdef VAX
abs_f > 1.0e38
-# else
+# else
abs_f > 1.0e307
-# endif
+# endif
)
{
// Avoid a buffer overflow
str_arg = tmp;
break;
}
-# endif
default:
// unrecognized conversion specifier, keep format string
union
{
varnumber_T v_number; // number value
-#ifdef FEAT_FLOAT
float_T v_float; // floating number value
-#endif
char_u *v_string; // string value (can be NULL!)
list_T *v_list; // list value (can be NULL!)
dict_T *v_dict; // dict value (can be NULL!)
{
int idx;
synpat_T *spp;
-# if defined(FEAT_RELTIME) && defined(FEAT_FLOAT)
+# if defined(FEAT_RELTIME)
proftime_T tm;
# endif
int len;
p->match = spp->sp_time.match;
total_count += spp->sp_time.count;
p->slowest = spp->sp_time.slowest;
-# if defined(FEAT_RELTIME) && defined(FEAT_FLOAT)
+# if defined(FEAT_RELTIME)
profile_divide(&spp->sp_time.total, spp->sp_time.count, &tm);
p->average = tm;
# endif
msg_puts(profile_msg(&p->slowest));
msg_puts(" ");
msg_advance(38);
-# ifdef FEAT_FLOAT
msg_puts(profile_msg(&p->average));
msg_puts(" ");
-# endif
msg_advance(50);
msg_outtrans(highlight_group_name(p->id - 1));
msg_puts(" ");
if has('reltime')
let message ..= repeat(' ', 50 - len(message))
let time = reltime(func_start)
- if has('float') && reltimefloat(time) > 0.1
+ if reltimefloat(time) > 0.1
let message = s:t_bold .. message
endif
let message ..= ' in ' .. reltimestr(time) .. ' seconds'
- if has('float') && reltimefloat(time) > 0.1
+ if reltimefloat(time) > 0.1
let message ..= s:t_normal
endif
endif
call assert_fails('call assert_inrange(1, 1)', 'E119:')
- if has('float')
- call assert_equal(0, assert_inrange(7.0, 7, 7))
- call assert_equal(0, assert_inrange(7, 7.0, 7))
- call assert_equal(0, assert_inrange(7, 7, 7.0))
- call assert_equal(0, assert_inrange(5, 7, 5.0))
- call assert_equal(0, assert_inrange(5, 7, 6.0))
- call assert_equal(0, assert_inrange(5, 7, 7.0))
-
- call assert_equal(1, assert_inrange(5, 7, 4.0))
- call assert_match("Expected range 5.0 - 7.0, but got 4.0", v:errors[0])
- call remove(v:errors, 0)
- call assert_equal(1, assert_inrange(5, 7, 8.0))
- call assert_match("Expected range 5.0 - 7.0, but got 8.0", v:errors[0])
- call remove(v:errors, 0)
- endif
+ call assert_equal(0, assert_inrange(7.0, 7, 7))
+ call assert_equal(0, assert_inrange(7, 7.0, 7))
+ call assert_equal(0, assert_inrange(7, 7, 7.0))
+ call assert_equal(0, assert_inrange(5, 7, 5.0))
+ call assert_equal(0, assert_inrange(5, 7, 6.0))
+ call assert_equal(0, assert_inrange(5, 7, 7.0))
+
+ call assert_equal(1, assert_inrange(5, 7, 4.0))
+ call assert_match("Expected range 5.0 - 7.0, but got 4.0", v:errors[0])
+ call remove(v:errors, 0)
+ call assert_equal(1, assert_inrange(5, 7, 8.0))
+ call assert_match("Expected range 5.0 - 7.0, but got 8.0", v:errors[0])
+ call remove(v:errors, 0)
endfunc
func Test_assert_with_msg()
endfunc
func Test_blob_sort()
- if has('float')
- call v9.CheckLegacyAndVim9Failure(['call sort([1.0, 0z11], "f")'], 'E975:')
- endif
+ call v9.CheckLegacyAndVim9Failure(['call sort([1.0, 0z11], "f")'], 'E975:')
call v9.CheckLegacyAndVim9Failure(['call sort([11, 0z11], "N")'], 'E974:')
endfunc
call assert_fails('cs find', 'E560:')
call assert_fails('cs find x', 'E560:')
- if has('float')
- " Test: Find places where this symbol is assigned a value
- " this needs a cscope >= 15.8
- " unfortunately, Travis has cscope version 15.7
- let cscope_version = systemlist('cscope --version')[0]
- let cs_version = str2float(matchstr(cscope_version, '\d\+\(\.\d\+\)\?'))
- if cs_version >= 15.8
- for cmd in ['cs find a item', 'cs find 9 item']
- let a = execute(cmd)
- call assert_equal(['', '(1 of 4): <<test_mf_hash>> item = LALLOC_CLEAR_ONE(mf_hashitem_T);'], split(a, '\n', 1))
- call assert_equal(' item = LALLOC_CLEAR_ONE(mf_hashitem_T);', getline('.'))
- cnext
- call assert_equal(' item = mf_hash_find(&ht, key);', getline('.'))
- cnext
- call assert_equal(' item = mf_hash_find(&ht, key);', getline('.'))
- cnext
- call assert_equal(' item = mf_hash_find(&ht, key);', getline('.'))
- endfor
- endif
+ " Test: Find places where this symbol is assigned a value
+ " this needs a cscope >= 15.8
+ " unfortunately, Travis has cscope version 15.7
+ let cscope_version = systemlist('cscope --version')[0]
+ let cs_version = str2float(matchstr(cscope_version, '\d\+\(\.\d\+\)\?'))
+ if cs_version >= 15.8
+ for cmd in ['cs find a item', 'cs find 9 item']
+ let a = execute(cmd)
+ call assert_equal(['', '(1 of 4): <<test_mf_hash>> item = LALLOC_CLEAR_ONE(mf_hashitem_T);'], split(a, '\n', 1))
+ call assert_equal(' item = LALLOC_CLEAR_ONE(mf_hashitem_T);', getline('.'))
+ cnext
+ call assert_equal(' item = mf_hash_find(&ht, key);', getline('.'))
+ cnext
+ call assert_equal(' item = mf_hash_find(&ht, key);', getline('.'))
+ cnext
+ call assert_equal(' item = mf_hash_find(&ht, key);', getline('.'))
+ endfor
endif
" Test: leading whitespace is not removed for cscope find text
let a..=b
call assert_equal('ab', a)
- if has('float')
- let a = 'A'
- let b = 1.234
- call assert_equal('A1.234', a .. b)
- endif
+ let a = 'A'
+ let b = 1.234
+ call assert_equal('A1.234', a .. b)
endfunc
" Test fix for issue #4507
call assert_fails('let a .= b', 'E985:')
call assert_fails('let vers = 1.2.3', 'E488:')
- if has('float')
- let f = .5
- call assert_equal(0.5, f)
- endif
+ let f = .5
+ call assert_equal(0.5, f)
endfunc
scriptversion 1
let vers = 1.2.3
call assert_equal('123', vers)
- if has('float')
- call assert_fails('let f = .5', 'E15:')
- endif
+ call assert_fails('let f = .5', 'E15:')
endfunc
scriptversion 3
call assert_equal("\nsomething", execute('echo "something"', 'silent'))
call assert_equal("\nsomething", execute('echo "something"', 'silent!'))
call assert_equal("", execute('burp', 'silent!'))
- if has('float')
- call assert_fails('call execute(3.4)', 'E492:')
- call assert_equal("\nx", execute("echo \"x\"", 3.4))
- call v9.CheckDefExecAndScriptFailure(['execute("echo \"x\"", 3.4)'], ['E1013: Argument 2: type mismatch, expected string but got float', 'E1174:'])
- endif
+ call assert_fails('call execute(3.4)', 'E492:')
+ call assert_equal("\nx", execute("echo \"x\"", 3.4))
+ call v9.CheckDefExecAndScriptFailure(['execute("echo \"x\"", 3.4)'], ['E1013: Argument 2: type mismatch, expected string but got float', 'E1174:'])
endfunc
func Test_execute_list()
call assert_equal(0z00, 0z00 ?? 456)
call assert_equal([1], [1] ?? 456)
call assert_equal({'one': 1}, {'one': 1} ?? 456)
- if has('float')
- call assert_equal(0.1, 0.1 ?? 456)
- endif
+ call assert_equal(0.1, 0.1 ?? 456)
call assert_equal(456, v:false ?? 456)
call assert_equal(456, 0 ?? 456)
call assert_equal(456, 0z ?? 456)
call assert_equal(456, [] ?? 456)
call assert_equal(456, {} ?? 456)
- if has('float')
- call assert_equal(456, 0.0 ?? 456)
- endif
+ call assert_equal(456, 0.0 ?? 456)
END
call v9.CheckLegacyAndVim9Success(lines)
endfunc
call assert_false(s:value == v:null)
let s:value = 0
call assert_true(s:value == v:null)
- if has('float')
- let s:value = 0.0
- call assert_true(s:value == v:null)
- endif
+ let s:value = 0.0
+ call assert_true(s:value == v:null)
let s:value = ''
call assert_false(s:value == v:null)
let s:value = 0z
endfunc
func Test_printf_float()
- if has('float')
- let lines =<< trim END
- call assert_equal('1.000000', printf('%f', 1))
- call assert_equal('1.230000', printf('%f', 1.23))
- call assert_equal('1.230000', printf('%F', 1.23))
- call assert_equal('9999999.9', printf('%g', 9999999.9))
- call assert_equal('9999999.9', printf('%G', 9999999.9))
- call assert_equal('1.00000001e7', printf('%.8g', 10000000.1))
- call assert_equal('1.00000001E7', printf('%.8G', 10000000.1))
- call assert_equal('1.230000e+00', printf('%e', 1.23))
- call assert_equal('1.230000E+00', printf('%E', 1.23))
- call assert_equal('1.200000e-02', printf('%e', 0.012))
- call assert_equal('-1.200000e-02', printf('%e', -0.012))
- call assert_equal('0.33', printf('%.2f', 1.0 / 3.0))
- call assert_equal(' 0.33', printf('%6.2f', 1.0 / 3.0))
- call assert_equal(' -0.33', printf('%6.2f', -1.0 / 3.0))
- call assert_equal('000.33', printf('%06.2f', 1.0 / 3.0))
- call assert_equal('-00.33', printf('%06.2f', -1.0 / 3.0))
- call assert_equal('-00.33', printf('%+06.2f', -1.0 / 3.0))
- call assert_equal('+00.33', printf('%+06.2f', 1.0 / 3.0))
- call assert_equal(' 00.33', printf('% 06.2f', 1.0 / 3.0))
- call assert_equal('000.33', printf('%06.2g', 1.0 / 3.0))
- call assert_equal('-00.33', printf('%06.2g', -1.0 / 3.0))
- call assert_equal('0.33', printf('%3.2f', 1.0 / 3.0))
- call assert_equal('003.33e-01', printf('%010.2e', 1.0 / 3.0))
- call assert_equal(' 03.33e-01', printf('% 010.2e', 1.0 / 3.0))
- call assert_equal('+03.33e-01', printf('%+010.2e', 1.0 / 3.0))
- call assert_equal('-03.33e-01', printf('%010.2e', -1.0 / 3.0))
-
- #" When precision is 0, the dot should be omitted.
- call assert_equal(' 2', printf('%3.f', 7.0 / 3.0))
- call assert_equal(' 2', printf('%3.g', 7.0 / 3.0))
- call assert_equal(' 2e+00', printf('%7.e', 7.0 / 3.0))
-
- #" Float zero can be signed.
- call assert_equal('+0.000000', printf('%+f', 0.0))
- call assert_equal('0.000000', printf('%f', 1.0 / (1.0 / 0.0)))
- call assert_equal('-0.000000', printf('%f', 1.0 / (-1.0 / 0.0)))
- call assert_equal('0.0', printf('%s', 1.0 / (1.0 / 0.0)))
- call assert_equal('-0.0', printf('%s', 1.0 / (-1.0 / 0.0)))
- call assert_equal('0.0', printf('%S', 1.0 / (1.0 / 0.0)))
- call assert_equal('-0.0', printf('%S', 1.0 / (-1.0 / 0.0)))
-
- #" Float infinity can be signed.
- call assert_equal('inf', printf('%f', 1.0 / 0.0))
- call assert_equal('-inf', printf('%f', -1.0 / 0.0))
- call assert_equal('inf', printf('%g', 1.0 / 0.0))
- call assert_equal('-inf', printf('%g', -1.0 / 0.0))
- call assert_equal('inf', printf('%e', 1.0 / 0.0))
- call assert_equal('-inf', printf('%e', -1.0 / 0.0))
- call assert_equal('INF', printf('%F', 1.0 / 0.0))
- call assert_equal('-INF', printf('%F', -1.0 / 0.0))
- call assert_equal('INF', printf('%E', 1.0 / 0.0))
- call assert_equal('-INF', printf('%E', -1.0 / 0.0))
- call assert_equal('INF', printf('%E', 1.0 / 0.0))
- call assert_equal('-INF', printf('%G', -1.0 / 0.0))
- call assert_equal('+inf', printf('%+f', 1.0 / 0.0))
- call assert_equal('-inf', printf('%+f', -1.0 / 0.0))
- call assert_equal(' inf', printf('% f', 1.0 / 0.0))
- call assert_equal(' inf', printf('%6f', 1.0 / 0.0))
- call assert_equal(' -inf', printf('%6f', -1.0 / 0.0))
- call assert_equal(' inf', printf('%6g', 1.0 / 0.0))
- call assert_equal(' -inf', printf('%6g', -1.0 / 0.0))
- call assert_equal(' +inf', printf('%+6f', 1.0 / 0.0))
- call assert_equal(' inf', printf('% 6f', 1.0 / 0.0))
- call assert_equal(' +inf', printf('%+06f', 1.0 / 0.0))
- call assert_equal('inf ', printf('%-6f', 1.0 / 0.0))
- call assert_equal('-inf ', printf('%-6f', -1.0 / 0.0))
- call assert_equal('+inf ', printf('%-+6f', 1.0 / 0.0))
- call assert_equal(' inf ', printf('%- 6f', 1.0 / 0.0))
- call assert_equal('-INF ', printf('%-6F', -1.0 / 0.0))
- call assert_equal('+INF ', printf('%-+6F', 1.0 / 0.0))
- call assert_equal(' INF ', printf('%- 6F', 1.0 / 0.0))
- call assert_equal('INF ', printf('%-6G', 1.0 / 0.0))
- call assert_equal('-INF ', printf('%-6G', -1.0 / 0.0))
- call assert_equal('INF ', printf('%-6E', 1.0 / 0.0))
- call assert_equal('-INF ', printf('%-6E', -1.0 / 0.0))
- call assert_equal('inf', printf('%s', 1.0 / 0.0))
- call assert_equal('-inf', printf('%s', -1.0 / 0.0))
-
- #" Test special case where max precision is truncated at 340.
- call assert_equal('1.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000', printf('%.330f', 1.0))
- call assert_equal('1.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000', printf('%.340f', 1.0))
- call assert_equal('1.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000', printf('%.350f', 1.0))
-
- #" Float nan (not a number) has no sign.
- call assert_equal('nan', printf('%f', sqrt(-1.0)))
- call assert_equal('nan', printf('%f', 0.0 / 0.0))
- call assert_equal('nan', printf('%f', -0.0 / 0.0))
- call assert_equal('nan', printf('%g', 0.0 / 0.0))
- call assert_equal('nan', printf('%e', 0.0 / 0.0))
- call assert_equal('NAN', printf('%F', 0.0 / 0.0))
- call assert_equal('NAN', printf('%G', 0.0 / 0.0))
- call assert_equal('NAN', printf('%E', 0.0 / 0.0))
- call assert_equal('NAN', printf('%F', -0.0 / 0.0))
- call assert_equal('NAN', printf('%G', -0.0 / 0.0))
- call assert_equal('NAN', printf('%E', -0.0 / 0.0))
- call assert_equal(' nan', printf('%6f', 0.0 / 0.0))
- call assert_equal(' nan', printf('%06f', 0.0 / 0.0))
- call assert_equal('nan ', printf('%-6f', 0.0 / 0.0))
- call assert_equal('nan ', printf('%- 6f', 0.0 / 0.0))
- call assert_equal('nan', printf('%s', 0.0 / 0.0))
- call assert_equal('nan', printf('%s', -0.0 / 0.0))
- call assert_equal('nan', printf('%S', 0.0 / 0.0))
- call assert_equal('nan', printf('%S', -0.0 / 0.0))
- END
- call v9.CheckLegacyAndVim9Success(lines)
-
- call v9.CheckLegacyAndVim9Failure(['echo printf("%f", "a")'], 'E807:')
- endif
+ let lines =<< trim END
+ call assert_equal('1.000000', printf('%f', 1))
+ call assert_equal('1.230000', printf('%f', 1.23))
+ call assert_equal('1.230000', printf('%F', 1.23))
+ call assert_equal('9999999.9', printf('%g', 9999999.9))
+ call assert_equal('9999999.9', printf('%G', 9999999.9))
+ call assert_equal('1.00000001e7', printf('%.8g', 10000000.1))
+ call assert_equal('1.00000001E7', printf('%.8G', 10000000.1))
+ call assert_equal('1.230000e+00', printf('%e', 1.23))
+ call assert_equal('1.230000E+00', printf('%E', 1.23))
+ call assert_equal('1.200000e-02', printf('%e', 0.012))
+ call assert_equal('-1.200000e-02', printf('%e', -0.012))
+ call assert_equal('0.33', printf('%.2f', 1.0 / 3.0))
+ call assert_equal(' 0.33', printf('%6.2f', 1.0 / 3.0))
+ call assert_equal(' -0.33', printf('%6.2f', -1.0 / 3.0))
+ call assert_equal('000.33', printf('%06.2f', 1.0 / 3.0))
+ call assert_equal('-00.33', printf('%06.2f', -1.0 / 3.0))
+ call assert_equal('-00.33', printf('%+06.2f', -1.0 / 3.0))
+ call assert_equal('+00.33', printf('%+06.2f', 1.0 / 3.0))
+ call assert_equal(' 00.33', printf('% 06.2f', 1.0 / 3.0))
+ call assert_equal('000.33', printf('%06.2g', 1.0 / 3.0))
+ call assert_equal('-00.33', printf('%06.2g', -1.0 / 3.0))
+ call assert_equal('0.33', printf('%3.2f', 1.0 / 3.0))
+ call assert_equal('003.33e-01', printf('%010.2e', 1.0 / 3.0))
+ call assert_equal(' 03.33e-01', printf('% 010.2e', 1.0 / 3.0))
+ call assert_equal('+03.33e-01', printf('%+010.2e', 1.0 / 3.0))
+ call assert_equal('-03.33e-01', printf('%010.2e', -1.0 / 3.0))
+
+ #" When precision is 0, the dot should be omitted.
+ call assert_equal(' 2', printf('%3.f', 7.0 / 3.0))
+ call assert_equal(' 2', printf('%3.g', 7.0 / 3.0))
+ call assert_equal(' 2e+00', printf('%7.e', 7.0 / 3.0))
+
+ #" Float zero can be signed.
+ call assert_equal('+0.000000', printf('%+f', 0.0))
+ call assert_equal('0.000000', printf('%f', 1.0 / (1.0 / 0.0)))
+ call assert_equal('-0.000000', printf('%f', 1.0 / (-1.0 / 0.0)))
+ call assert_equal('0.0', printf('%s', 1.0 / (1.0 / 0.0)))
+ call assert_equal('-0.0', printf('%s', 1.0 / (-1.0 / 0.0)))
+ call assert_equal('0.0', printf('%S', 1.0 / (1.0 / 0.0)))
+ call assert_equal('-0.0', printf('%S', 1.0 / (-1.0 / 0.0)))
+
+ #" Float infinity can be signed.
+ call assert_equal('inf', printf('%f', 1.0 / 0.0))
+ call assert_equal('-inf', printf('%f', -1.0 / 0.0))
+ call assert_equal('inf', printf('%g', 1.0 / 0.0))
+ call assert_equal('-inf', printf('%g', -1.0 / 0.0))
+ call assert_equal('inf', printf('%e', 1.0 / 0.0))
+ call assert_equal('-inf', printf('%e', -1.0 / 0.0))
+ call assert_equal('INF', printf('%F', 1.0 / 0.0))
+ call assert_equal('-INF', printf('%F', -1.0 / 0.0))
+ call assert_equal('INF', printf('%E', 1.0 / 0.0))
+ call assert_equal('-INF', printf('%E', -1.0 / 0.0))
+ call assert_equal('INF', printf('%E', 1.0 / 0.0))
+ call assert_equal('-INF', printf('%G', -1.0 / 0.0))
+ call assert_equal('+inf', printf('%+f', 1.0 / 0.0))
+ call assert_equal('-inf', printf('%+f', -1.0 / 0.0))
+ call assert_equal(' inf', printf('% f', 1.0 / 0.0))
+ call assert_equal(' inf', printf('%6f', 1.0 / 0.0))
+ call assert_equal(' -inf', printf('%6f', -1.0 / 0.0))
+ call assert_equal(' inf', printf('%6g', 1.0 / 0.0))
+ call assert_equal(' -inf', printf('%6g', -1.0 / 0.0))
+ call assert_equal(' +inf', printf('%+6f', 1.0 / 0.0))
+ call assert_equal(' inf', printf('% 6f', 1.0 / 0.0))
+ call assert_equal(' +inf', printf('%+06f', 1.0 / 0.0))
+ call assert_equal('inf ', printf('%-6f', 1.0 / 0.0))
+ call assert_equal('-inf ', printf('%-6f', -1.0 / 0.0))
+ call assert_equal('+inf ', printf('%-+6f', 1.0 / 0.0))
+ call assert_equal(' inf ', printf('%- 6f', 1.0 / 0.0))
+ call assert_equal('-INF ', printf('%-6F', -1.0 / 0.0))
+ call assert_equal('+INF ', printf('%-+6F', 1.0 / 0.0))
+ call assert_equal(' INF ', printf('%- 6F', 1.0 / 0.0))
+ call assert_equal('INF ', printf('%-6G', 1.0 / 0.0))
+ call assert_equal('-INF ', printf('%-6G', -1.0 / 0.0))
+ call assert_equal('INF ', printf('%-6E', 1.0 / 0.0))
+ call assert_equal('-INF ', printf('%-6E', -1.0 / 0.0))
+ call assert_equal('inf', printf('%s', 1.0 / 0.0))
+ call assert_equal('-inf', printf('%s', -1.0 / 0.0))
+
+ #" Test special case where max precision is truncated at 340.
+ call assert_equal('1.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000', printf('%.330f', 1.0))
+ call assert_equal('1.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000', printf('%.340f', 1.0))
+ call assert_equal('1.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000', printf('%.350f', 1.0))
+
+ #" Float nan (not a number) has no sign.
+ call assert_equal('nan', printf('%f', sqrt(-1.0)))
+ call assert_equal('nan', printf('%f', 0.0 / 0.0))
+ call assert_equal('nan', printf('%f', -0.0 / 0.0))
+ call assert_equal('nan', printf('%g', 0.0 / 0.0))
+ call assert_equal('nan', printf('%e', 0.0 / 0.0))
+ call assert_equal('NAN', printf('%F', 0.0 / 0.0))
+ call assert_equal('NAN', printf('%G', 0.0 / 0.0))
+ call assert_equal('NAN', printf('%E', 0.0 / 0.0))
+ call assert_equal('NAN', printf('%F', -0.0 / 0.0))
+ call assert_equal('NAN', printf('%G', -0.0 / 0.0))
+ call assert_equal('NAN', printf('%E', -0.0 / 0.0))
+ call assert_equal(' nan', printf('%6f', 0.0 / 0.0))
+ call assert_equal(' nan', printf('%06f', 0.0 / 0.0))
+ call assert_equal('nan ', printf('%-6f', 0.0 / 0.0))
+ call assert_equal('nan ', printf('%- 6f', 0.0 / 0.0))
+ call assert_equal('nan', printf('%s', 0.0 / 0.0))
+ call assert_equal('nan', printf('%s', -0.0 / 0.0))
+ call assert_equal('nan', printf('%S', 0.0 / 0.0))
+ call assert_equal('nan', printf('%S', -0.0 / 0.0))
+ END
+ call v9.CheckLegacyAndVim9Success(lines)
+
+ call v9.CheckLegacyAndVim9Failure(['echo printf("%f", "a")'], 'E807:')
endfunc
func Test_printf_errors()
call v9.CheckLegacyAndVim9Failure(['echo printf("%d", 1, 2)'], 'E767:')
call v9.CheckLegacyAndVim9Failure(['echo printf("%*d", 1)'], 'E766:')
call v9.CheckLegacyAndVim9Failure(['echo printf("%s")'], 'E766:')
- if has('float')
- call v9.CheckLegacyAndVim9Failure(['echo printf("%d", 1.2)'], 'E805:')
- call v9.CheckLegacyAndVim9Failure(['echo printf("%f")'], 'E766:')
- endif
+ call v9.CheckLegacyAndVim9Failure(['echo printf("%d", 1.2)'], 'E805:')
+ call v9.CheckLegacyAndVim9Failure(['echo printf("%f")'], 'E766:')
endfunc
func Test_printf_64bit()
call assert_equal("abcdefgi", printf('%s', "abcdefgi"))
#" float
- if has('float')
- call assert_equal("1.23", printf('%s', 1.23))
- endif
+ call assert_equal("1.23", printf('%s', 1.23))
#" list
VAR lvalue = [1, 'two', ['three', 4]]
" Test for float value comparison
func Test_float_compare()
- CheckFeature float
-
let lines =<< trim END
call assert_true(1.2 == 1.2)
call assert_true(1.0 != 1.2)
" test float functions
source check.vim
-CheckFeature float
import './vim9.vim' as v9
func Test_abs()
call assert_equal(0, empty(1))
call assert_equal(0, empty(-1))
- if has('float')
- call assert_equal(1, empty(0.0))
- call assert_equal(1, empty(-0.0))
- call assert_equal(0, empty(1.0))
- call assert_equal(0, empty(-1.0))
- call assert_equal(0, empty(1.0/0.0))
- call assert_equal(0, empty(0.0/0.0))
- endif
+ call assert_equal(1, empty(0.0))
+ call assert_equal(1, empty(-0.0))
+ call assert_equal(0, empty(1.0))
+ call assert_equal(0, empty(-1.0))
+ call assert_equal(0, empty(1.0/0.0))
+ call assert_equal(0, empty(0.0/0.0))
call assert_equal(1, empty([]))
call assert_equal(0, empty(['a']))
func Test_test_void()
call assert_fails('echo 1 == test_void()', 'E1031:')
- if has('float')
- call assert_fails('echo 1.0 == test_void()', 'E1031:')
- endif
+ call assert_fails('echo 1.0 == test_void()', 'E1031:')
call assert_fails('let x = json_encode(test_void())', 'E685:')
call assert_fails('let x = copy(test_void())', 'E685:')
call assert_fails('let x = copy([test_void()])', 'E1031:')
call assert_fails('call strwidth({})', 'E731:')
endfor
- if has('float')
- call assert_equal(3, strwidth(1.2))
- call v9.CheckDefAndScriptFailure(['echo strwidth(1.2)'], ['E1013: Argument 1: type mismatch, expected string but got float', 'E1174: String required for argument 1'])
- endif
+ call assert_equal(3, strwidth(1.2))
+ call v9.CheckDefAndScriptFailure(['echo strwidth(1.2)'], ['E1013: Argument 1: type mismatch, expected string but got float', 'E1174: String required for argument 1'])
set ambiwidth&
endfunc
call assert_fails('call str2nr([])', 'E730:')
call assert_fails('call str2nr({->2})', 'E729:')
- if has('float')
- call assert_equal(1, str2nr(1.2))
- call v9.CheckDefAndScriptFailure(['echo str2nr(1.2)'], ['E1013: Argument 1: type mismatch, expected string but got float', 'E1174: String required for argument 1'])
- endif
+ call assert_equal(1, str2nr(1.2))
+ call v9.CheckDefAndScriptFailure(['echo str2nr(1.2)'], ['E1013: Argument 1: type mismatch, expected string but got float', 'E1174: String required for argument 1'])
call assert_fails('call str2nr(10, [])', 'E745:')
endfunc
call assert_fails('call simplify({->0})', 'E729:')
call assert_fails('call simplify([])', 'E730:')
call assert_fails('call simplify({})', 'E731:')
- if has('float')
- call assert_equal('1.2', simplify(1.2))
- call v9.CheckDefAndScriptFailure(['echo simplify(1.2)'], ['E1013: Argument 1: type mismatch, expected string but got float', 'E1174: String required for argument 1'])
- endif
+ call assert_equal('1.2', simplify(1.2))
+ call v9.CheckDefAndScriptFailure(['echo simplify(1.2)'], ['E1013: Argument 1: type mismatch, expected string but got float', 'E1174: String required for argument 1'])
endfunc
func Test_pathshorten()
import './vim9.vim' as v9
func Test_glob2regpat_invalid()
- if has('float')
- call assert_equal('^1\.33$', glob2regpat(1.33))
- call v9.CheckDefAndScriptFailure(['echo glob2regpat(1.2)'], ['E1013: Argument 1: type mismatch, expected string but got float', 'E1174: String required for argument 1'])
- endif
+ call assert_equal('^1\.33$', glob2regpat(1.33))
+ call v9.CheckDefAndScriptFailure(['echo glob2regpat(1.2)'], ['E1013: Argument 1: type mismatch, expected string but got float', 'E1174: String required for argument 1'])
call assert_fails('call glob2regpat("}")', 'E219:')
call assert_fails('call glob2regpat("{")', 'E220:')
endfunc
let s:varmb = "s¢cĴgё"
let s:jsonnr = '1234'
let s:varnr = 1234
-if has('float')
- let s:jsonfl = '12.34'
- let s:varfl = 12.34
- let s:jsonneginf = '-Infinity'
- let s:jsonposinf = 'Infinity'
- let s:varneginf = -1.0 / 0.0
- let s:varposinf = 1.0 / 0.0
- let s:jsonnan = 'NaN'
- let s:varnan = 0.0 / 0.0
-endif
+let s:jsonfl = '12.34'
+let s:varfl = 12.34
+let s:jsonneginf = '-Infinity'
+let s:jsonposinf = 'Infinity'
+let s:varneginf = -1.0 / 0.0
+let s:varposinf = 1.0 / 0.0
+let s:jsonnan = 'NaN'
+let s:varnan = 0.0 / 0.0
let s:jsonl1 = '[1,"a",3]'
let s:varl1 = [1, "a", 3]
" no test for surrogate pair, json_encode() doesn't create them.
call assert_equal(s:jsonnr, json_encode(s:varnr))
- if has('float')
- call assert_equal(s:jsonfl, json_encode(s:varfl))
- call assert_equal(s:jsonneginf, json_encode(s:varneginf))
- call assert_equal(s:jsonposinf, json_encode(s:varposinf))
- call assert_equal(s:jsonnan, json_encode(s:varnan))
- endif
+ call assert_equal(s:jsonfl, json_encode(s:varfl))
+ call assert_equal(s:jsonneginf, json_encode(s:varneginf))
+ call assert_equal(s:jsonposinf, json_encode(s:varposinf))
+ call assert_equal(s:jsonnan, json_encode(s:varnan))
call assert_equal(s:jsonl1, json_encode(s:varl1))
call assert_equal(s:jsonl2, json_encode(s:varl2))
call assert_equal(s:varsp2, json_decode(s:jsonsp2))
call assert_equal(s:varnr, json_decode(s:jsonnr))
- if has('float')
- call assert_equal(s:varfl, json_decode(s:jsonfl))
- endif
+ call assert_equal(s:varfl, json_decode(s:jsonfl))
call assert_equal(s:varl1, json_decode(s:jsonl1))
call assert_equal(s:varl2x, json_decode(s:jsonl2))
call assert_fails('call json_decode("{\"n\":1,")', "E491:")
call assert_fails('call json_decode("{\"n\",1}")', "E491:")
call assert_fails('call json_decode("{-}")', "E491:")
- if has('float')
- call assert_fails('call json_decode("{3.14:1}")', "E806:")
- endif
+ call assert_fails('call json_decode("{3.14:1}")', "E806:")
call assert_fails('call json_decode("[foobar]")', "E491:")
call assert_fails('call json_decode("[")', "E491:")
" no test for surrogate pair, js_encode() doesn't create them.
call assert_equal(s:jsonnr, js_encode(s:varnr))
- if has('float')
- call assert_equal(s:jsonfl, js_encode(s:varfl))
- call assert_equal(s:jsonneginf, js_encode(s:varneginf))
- call assert_equal(s:jsonposinf, js_encode(s:varposinf))
- call assert_equal(s:jsonnan, js_encode(s:varnan))
- endif
+ call assert_equal(s:jsonfl, js_encode(s:varfl))
+ call assert_equal(s:jsonneginf, js_encode(s:varneginf))
+ call assert_equal(s:jsonposinf, js_encode(s:varposinf))
+ call assert_equal(s:jsonnan, js_encode(s:varnan))
call assert_equal(s:jsonl1, js_encode(s:varl1))
call assert_equal(s:jsonl2, js_encode(s:varl2))
call assert_equal(s:varsp2, js_decode(s:jsonsp2))
call assert_equal(s:varnr, js_decode(s:jsonnr))
- if has('float')
- call assert_equal(s:varfl, js_decode(s:jsonfl))
- call assert_equal(s:varneginf, js_decode(s:jsonneginf))
- call assert_equal(s:varposinf, js_decode(s:jsonposinf))
- call assert_true(isnan(js_decode(s:jsonnan)))
- endif
+ call assert_equal(s:varfl, js_decode(s:jsonfl))
+ call assert_equal(s:varneginf, js_decode(s:jsonneginf))
+ call assert_equal(s:varposinf, js_decode(s:jsonposinf))
+ call assert_true(isnan(js_decode(s:jsonnan)))
call assert_equal(s:varl1, js_decode(s:jsonl1))
call assert_equal(s:varl2x, js_decode(s:jsonl2))
call assert_equal(['-0', 'A11', 2, 'xaaa', 4, 'foo', 'foo6', 'foo', [0, 1, 2], 'x8', [0, 1, 2], 1.5], uniq(copy(l)))
call assert_equal([1.5, [0, 1, 2], 'x8', [0, 1, 2], 'foo', 'foo6', 'foo', 4, 'xaaa', 2, 2, 'A11', '-0'], reverse(l))
call assert_equal([1.5, [0, 1, 2], 'x8', [0, 1, 2], 'foo', 'foo6', 'foo', 4, 'xaaa', 2, 2, 'A11', '-0'], reverse(reverse(l)))
- if has('float')
- call assert_equal(['-0', 'A11', 'foo', 'foo', 'foo6', 'x8', 'xaaa', 1.5, 2, 2, 4, [0, 1, 2], [0, 1, 2]], sort(l))
- call assert_equal([[0, 1, 2], [0, 1, 2], 4, 2, 2, 1.5, 'xaaa', 'x8', 'foo6', 'foo', 'foo', 'A11', '-0'], reverse(sort(l)))
- call assert_equal(['-0', 'A11', 'foo', 'foo', 'foo6', 'x8', 'xaaa', 1.5, 2, 2, 4, [0, 1, 2], [0, 1, 2]], sort(reverse(sort(l))))
- call assert_equal(['-0', 'A11', 'foo', 'foo6', 'x8', 'xaaa', 1.5, 2, 4, [0, 1, 2]], uniq(sort(l)))
-
- LET l = [7, 9, 'one', 18, 12, 22, 'two', 10.0e-16, -1, 'three', 0xff, 0.22, 'four']
- call assert_equal([-1, 'one', 'two', 'three', 'four', 1.0e-15, 0.22, 7, 9, 12, 18, 22, 255], sort(copy(l), 'n'))
-
- LET l = [7, 9, 18, 12, 22, 10.0e-16, -1, 0xff, 0, -0, 0.22, 'bar', 'BAR', 'Bar', 'Foo', 'FOO', 'foo', 'FOOBAR', {}, []]
- call assert_equal(['bar', 'BAR', 'Bar', 'Foo', 'FOO', 'foo', 'FOOBAR', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}], sort(copy(l), 'i'))
- call assert_equal(['bar', 'BAR', 'Bar', 'Foo', 'FOO', 'foo', 'FOOBAR', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}], sort(copy(l), 'i'))
- call assert_equal(['BAR', 'Bar', 'FOO', 'FOOBAR', 'Foo', 'bar', 'foo', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}], sort(copy(l)))
- endif
+ call assert_equal(['-0', 'A11', 'foo', 'foo', 'foo6', 'x8', 'xaaa', 1.5, 2, 2, 4, [0, 1, 2], [0, 1, 2]], sort(l))
+ call assert_equal([[0, 1, 2], [0, 1, 2], 4, 2, 2, 1.5, 'xaaa', 'x8', 'foo6', 'foo', 'foo', 'A11', '-0'], reverse(sort(l)))
+ call assert_equal(['-0', 'A11', 'foo', 'foo', 'foo6', 'x8', 'xaaa', 1.5, 2, 2, 4, [0, 1, 2], [0, 1, 2]], sort(reverse(sort(l))))
+ call assert_equal(['-0', 'A11', 'foo', 'foo6', 'x8', 'xaaa', 1.5, 2, 4, [0, 1, 2]], uniq(sort(l)))
+
+ LET l = [7, 9, 'one', 18, 12, 22, 'two', 10.0e-16, -1, 'three', 0xff, 0.22, 'four']
+ call assert_equal([-1, 'one', 'two', 'three', 'four', 1.0e-15, 0.22, 7, 9, 12, 18, 22, 255], sort(copy(l), 'n'))
+
+ LET l = [7, 9, 18, 12, 22, 10.0e-16, -1, 0xff, 0, -0, 0.22, 'bar', 'BAR', 'Bar', 'Foo', 'FOO', 'foo', 'FOOBAR', {}, []]
+ call assert_equal(['bar', 'BAR', 'Bar', 'Foo', 'FOO', 'foo', 'FOOBAR', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}], sort(copy(l), 'i'))
+ call assert_equal(['bar', 'BAR', 'Bar', 'Foo', 'FOO', 'foo', 'FOOBAR', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}], sort(copy(l), 'i'))
+ call assert_equal(['BAR', 'Bar', 'FOO', 'FOOBAR', 'Foo', 'bar', 'foo', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}], sort(copy(l)))
END
call v9.CheckLegacyAndVim9Success(lines)
let l = [1, 2, 3]
call assert_fails("call extend(l, [4, 5, 6], 4)", 'E684:')
call assert_fails("call extend(l, [4, 5, 6], -4)", 'E684:')
- if has('float')
- call assert_fails("call extend(l, [4, 5, 6], 1.2)", 'E805:')
- endif
+ call assert_fails("call extend(l, [4, 5, 6], 1.2)", 'E805:')
" Test extend() with dictionaries.
call assert_fails("call extend(d, {'b': 0, 'c':'C'}, 'error')", 'E737:')
call assert_fails("call extend(d, {'b': 0}, [])", 'E730:')
call assert_fails("call extend(d, {'b': 0, 'c':'C'}, 'xxx')", 'E475:')
- if has('float')
- call assert_fails("call extend(d, {'b': 0, 'c':'C'}, 1.2)", 'E475:')
- endif
+ call assert_fails("call extend(d, {'b': 0, 'c':'C'}, 1.2)", 'E475:')
call assert_equal({'a': 'A', 'b': 'B'}, d)
call assert_fails("call extend([1, 2], 1)", 'E712:')
endfunc
CheckFeature lua
-CheckFeature float
" Depending on the lua version, the error messages are different.
let [s:major, s:minor, s:patch] = luaeval('vim.lua_version')->split('\.')->map({-> str2nr(v:val)})
call assert_equal("\n[1, 2, []]", execute(':echomsg [1, 2, test_null_list()]'))
call assert_equal("\n{}", execute(':echomsg {}'))
call assert_equal("\n{'a': 1, 'b': 2}", execute(':echomsg {"a": 1, "b": 2}'))
- if has('float')
- call assert_equal("\n1.23", execute(':echomsg 1.23'))
- endif
+ call assert_equal("\n1.23", execute(':echomsg 1.23'))
call assert_match("function('<lambda>\\d*')", execute(':echomsg {-> 1234}'))
endfunc
call assert_equal("\n12345 IgNoRe", execute(':echoerr 12345 "IgNoRe"'))
call assert_equal("\n[1, 2, 'IgNoRe']", execute(':echoerr [1, 2, "IgNoRe"]'))
call assert_equal("\n{'IgNoRe': 2, 'a': 1}", execute(':echoerr {"a": 1, "IgNoRe": 2}'))
- if has('float')
- call assert_equal("\n1.23 IgNoRe", execute(':echoerr 1.23 "IgNoRe"'))
- endif
+ call assert_equal("\n1.23 IgNoRe", execute(':echoerr 1.23 "IgNoRe"'))
eval '<lambda>'->test_ignore_error()
call assert_match("function('<lambda>\\d*')", execute(':echoerr {-> 1234}'))
call test_ignore_error('RESET')
endfunc
func Test_method_float()
- CheckFeature float
eval 1.234->string()->assert_equal('1.234')
eval -1.234->string()->assert_equal('-1.234')
endfunc
call assert_equal(0, perleval('0'))
call assert_equal(2, perleval('2'))
call assert_equal(-2, perleval('-2'))
- if has('float')
- call assert_equal(2.5, perleval('2.5'))
- else
- call assert_equal(2, perleval('2.5'))
- end
+ call assert_equal(2.5, perleval('2.5'))
sandbox call assert_equal(2, perleval('2'))
endfunc
func Test_python_float()
- CheckFeature float
let l = [0.0]
py l = vim.bindeval('l')
py l.extend([0.0])
py v = vim.eval('test_null_function()')
call assert_equal(v:none, pyeval('v'))
- if has('float')
- call assert_equal(0.0, pyeval('0.0'))
- endif
+ call assert_equal(0.0, pyeval('0.0'))
" Evaluate an invalid values
call AssertException(['let v = pyeval(''"\0"'')'], 'E859:')
" Test vim.eval() with various types.
func Test_python3_vim_val()
call assert_equal("\n8", execute('py3 print(vim.eval("3+5"))'))
- if has('float')
- call assert_equal("\n3.140000", execute('py3 print(vim.eval("1.01+2.13"))'))
- call assert_equal("\n0.000000", execute('py3 print(vim.eval("0.0/(1.0/0.0)"))'))
- call assert_equal("\n0.000000", execute('py3 print(vim.eval("0.0/(1.0/0.0)"))'))
- call assert_equal("\n-0.000000", execute('py3 print(vim.eval("0.0/(-1.0/0.0)"))'))
- " Commented out: output of infinity and nan depend on platforms.
- " call assert_equal("\ninf", execute('py3 print(vim.eval("1.0/0.0"))'))
- " call assert_equal("\n-inf", execute('py3 print(vim.eval("-1.0/0.0"))'))
- " call assert_equal("\n-nan", execute('py3 print(vim.eval("0.0/0.0"))'))
- endif
+ call assert_equal("\n3.140000", execute('py3 print(vim.eval("1.01+2.13"))'))
+ call assert_equal("\n0.000000", execute('py3 print(vim.eval("0.0/(1.0/0.0)"))'))
+ call assert_equal("\n0.000000", execute('py3 print(vim.eval("0.0/(1.0/0.0)"))'))
+ call assert_equal("\n-0.000000", execute('py3 print(vim.eval("0.0/(-1.0/0.0)"))'))
+ " Commented out: output of infinity and nan depend on platforms.
+ " call assert_equal("\ninf", execute('py3 print(vim.eval("1.0/0.0"))'))
+ " call assert_equal("\n-inf", execute('py3 print(vim.eval("-1.0/0.0"))'))
+ " call assert_equal("\n-nan", execute('py3 print(vim.eval("0.0/0.0"))'))
call assert_equal("\nabc", execute('py3 print(vim.eval("\"abc\""))'))
call assert_equal("\n['1', '2']", execute('py3 print(vim.eval("[1, 2]"))'))
call assert_equal("\n{'1': '2'}", execute('py3 print(vim.eval("{1:2}"))'))
endfunc
func Test_python3_float()
- CheckFeature float
let l = [0.0]
py3 l = vim.bindeval('l')
py3 l.extend([0.0])
py3 v = vim.eval('test_null_function()')
call assert_equal(v:none, py3eval('v'))
- if has('float')
- call assert_equal(0.0, py3eval('0.0'))
- endif
+ call assert_equal(0.0, py3eval('0.0'))
" Evaluate an invalid values
call AssertException(['let v = py3eval(''"\0"'')'], 'E859:')
call assert_equal(1001954530, rand())
call test_srand_seed()
- if has('float')
- call assert_fails('echo srand(1.2)', 'E805:')
- endif
+ call assert_fails('echo srand(1.2)', 'E805:')
call assert_fails('echo srand([1])', 'E745:')
call assert_fails('echo rand("burp")', 'E475:')
call assert_fails('echo rand([1, 2, 3])', 'E730:')
source check.vim
CheckFeature reltime
-CheckFeature float
func Test_reltime()
let g:test_is_flaky = 1
" on versions of Ruby.
call assert_match('^Integer\|Fixnum$', rubyeval('Vim::evaluate("123").class'))
- if has('float')
- call assert_equal(1.23, rubyeval('Vim::evaluate("1.23")'))
- call assert_equal('Float', rubyeval('Vim::evaluate("1.23").class'))
- endif
+ call assert_equal(1.23, rubyeval('Vim::evaluate("1.23")'))
+ call assert_equal('Float', rubyeval('Vim::evaluate("1.23").class'))
call assert_equal('foo', rubyeval('Vim::evaluate("\"foo\"")'))
call assert_equal('String', rubyeval('Vim::evaluate("\"foo\"").class'))
endfunc
func Test_sort_float()
- CheckFeature float
call assert_equal([0.28, 3, 13.5], sort([13.5, 0.28, 3], 'f'))
endfunc
endfunc
func Test_sort_default()
- CheckFeature float
-
" docs say omitted, empty or zero argument sorts on string representation.
call assert_equal(['2', 'A', 'AA', 'a', 1, 3.3], sort([3.3, 1, "2", "A", "a", "AA"]))
call assert_equal(['2', 'A', 'AA', 'a', 1, 3.3], sort([3.3, 1, "2", "A", "a", "AA"], ''))
\ ]
endif
endif
- if has('float')
- let tests += [
- \ {
- \ 'name' : 'float',
- \ 'cmd' : 'sort f',
- \ 'input' : [
- \ '1.234',
- \ '0.88',
- \ ' + 123.456',
- \ '1.15e-6',
- \ '-1.1e3',
- \ '-1.01e3',
- \ '',
- \ ''
- \ ],
- \ 'expected' : [
- \ '',
- \ '',
- \ '-1.1e3',
- \ '-1.01e3',
- \ '1.15e-6',
- \ '0.88',
- \ '1.234',
- \ ' + 123.456'
- \ ]
- \ },
- \ ]
- endif
+ let tests += [
+ \ {
+ \ 'name' : 'float',
+ \ 'cmd' : 'sort f',
+ \ 'input' : [
+ \ '1.234',
+ \ '0.88',
+ \ ' + 123.456',
+ \ '1.15e-6',
+ \ '-1.1e3',
+ \ '-1.01e3',
+ \ '',
+ \ ''
+ \ ],
+ \ 'expected' : [
+ \ '',
+ \ '',
+ \ '-1.1e3',
+ \ '-1.01e3',
+ \ '1.15e-6',
+ \ '0.88',
+ \ '1.234',
+ \ ' + 123.456'
+ \ ]
+ \ },
+ \ ]
for t in tests
enew!
endfunc
func Test_substitute_float()
- CheckFeature float
-
call assert_equal('number 1.23', substitute('number ', '$', { -> 1.23 }, ''))
vim9 assert_equal('number 1.23', substitute('number ', '$', () => 1.23, ''))
endfunc
call assert_fails("call term_start(cmd, {'term_rows': -1})", 'E475:')
call assert_fails("call term_start(cmd, {'term_rows': 1001})", 'E475:')
- if has('float')
- call assert_fails("call term_start(cmd, {'term_rows': 10.0})", 'E805:')
- endif
+ call assert_fails("call term_start(cmd, {'term_rows': 10.0})", 'E805:')
call delete('Xtext')
endfunc
call assert_fails('if [1]', 'E745:')
call assert_fails('if {1: 1}', 'E728:')
call assert_fails('if function("string")', 'E703:')
- if has('float')
- call assert_fails('if 1.3")', 'E805:')
- endif
+ call assert_fails('if 1.3")', 'E805:')
endfunc
function Try_arg_true_false(expr, false_val, true_val)
endfunc
function Try_arg_non_zero(expr, false_val, true_val)
- CheckFeature float
for v in ['v:false', '0', '[1]', '{2:3}', '3.4']
let r = eval(substitute(a:expr, '%v%', v, ''))
call assert_equal(a:false_val, r, 'result for ' . v . ' is not ' . a:false_val . ' but ' . r)
endfunc
func Test_default_arg()
- if has('float')
- call assert_equal(1.0, Log(10))
- call assert_equal(log(10), Log(10, exp(1)))
- call assert_fails("call Log(1,2,3)", 'E118:')
- endif
+ call assert_equal(1.0, Log(10))
+ call assert_equal(log(10), Log(10, exp(1)))
+ call assert_fails("call Log(1,2,3)", 'E118:')
let res = Args(1)
call assert_equal(res.mandatory, 1)
# calling job_start() is in test_vim9_fails.vim, it causes leak reports
endif
- if has('float')
- var float1: float = 3.4
- endif
+ var float1: float = 3.4
var Funky1: func
var Funky2: func = function('len')
var Party2: func = funcref('g:Test_syntax')
&ts %= 4
assert_equal(2, &ts)
- if has('float')
- var f100: float = 100.0
- f100 /= 5
- assert_equal(20.0, f100)
+ var f100: float = 100.0
+ f100 /= 5
+ assert_equal(20.0, f100)
- var f200: float = 200.0
- f200 /= 5.0
- assert_equal(40.0, f200)
+ var f200: float = 200.0
+ f200 /= 5.0
+ assert_equal(40.0, f200)
- v9.CheckDefFailure(['var nr: number = 200', 'nr /= 5.0'], 'E1012:')
- endif
+ v9.CheckDefFailure(['var nr: number = 200', 'nr /= 5.0'], 'E1012:')
lines =<< trim END
&ts = 6
g:inc_counter += 1
assert_equal(2, g:inc_counter)
- if has('float')
- var f: float
- f += 1
- assert_equal(1.0, f)
- endif
+ var f: float
+ f += 1
+ assert_equal(1.0, f)
$SOME_ENV_VAR ..= 'more'
assert_equal('somemore', $SOME_ENV_VAR)
enddef
def Test_float_and_number()
- if !has('float')
- MissingFeature float
- else
- var lines =<< trim END
- var f: float
- f += 2
- f -= 1
- assert_equal(1.0, f)
- ++f
- --f
- assert_equal(1.0, f)
- END
- v9.CheckDefAndScriptSuccess(lines)
- endif
+ var lines =<< trim END
+ var f: float
+ f += 2
+ f -= 1
+ assert_equal(1.0, f)
+ ++f
+ --f
+ assert_equal(1.0, f)
+ END
+ v9.CheckDefAndScriptSuccess(lines)
enddef
let g:someNumber = 43
var thenumber: number
assert_equal(0, thenumber)
- if has('float')
- var thefloat: float
- assert_equal(0.0, thefloat)
- endif
+ var thefloat: float
+ assert_equal(0.0, thefloat)
var thestring: string
assert_equal('', thestring)
assert_equal(2, abs(-2))
assert_equal(3, abs(3))
v9.CheckDefAndScriptFailure(['abs("text")'], ['E1013: Argument 1: type mismatch, expected number but got string', 'E1219: Float or Number required for argument 1'])
- if has('float')
- assert_equal(0, abs(0))
- assert_equal(2.0, abs(-2.0))
- assert_equal(3.0, abs(3.0))
- endif
+ assert_equal(0, abs(0))
+ assert_equal(2.0, abs(-2.0))
+ assert_equal(3.0, abs(3.0))
enddef
def Test_add()
" Test for float functions argument type
def Test_float_funcs_args()
- CheckFeature float
-
# acos()
v9.CheckDefAndScriptFailure(['acos("a")'], ['E1013: Argument 1: type mismatch, expected number but got string', 'E1219: Float or Number required for argument 1'])
assert_equal('1.570796', string(acos(0.0)))
enddef
def Test_str2float()
- if !has('float')
- CheckFeature float
- else
- str2float("1.00")->assert_equal(1.00)
- str2float("2e-2")->assert_equal(0.02)
- str2float('')->assert_equal(0.0)
+ str2float("1.00")->assert_equal(1.00)
+ str2float("2e-2")->assert_equal(0.02)
+ str2float('')->assert_equal(0.0)
- v9.CheckDefAndScriptFailure(['str2float(123)'], ['E1013: Argument 1: type mismatch, expected string but got number', 'E1174: String required for argument 1'])
- endif
+ v9.CheckDefAndScriptFailure(['str2float(123)'], ['E1013: Argument 1: type mismatch, expected string but got number', 'E1174: String required for argument 1'])
enddef
def Test_str2list()
enddef
def Test_typename()
- if has('float')
- assert_equal('func([unknown], [unknown]): float', typename(function('pow')))
- endif
+ assert_equal('func([unknown], [unknown]): float', typename(function('pow')))
assert_equal('func(...): unknown', test_null_partial()->typename())
assert_equal('list<unknown>', test_null_list()->typename())
assert_equal('dict<unknown>', test_null_dict()->typename())
var localbool = true
var localspec = v:none
var localblob = 0z1234
- if has('float')
- var localfloat = 1.234
- endif
+ var localfloat = 1.234
enddef
def Test_disassemble_push()
anyres = g:number / 7
anyres = g:number % 7
- if has('float')
- var fl = 3.0
- var flres = fl + 7.0
- flres = fl - 7.0
- flres = fl * 7.0
- flres = fl / 7.0
- endif
+ var fl = 3.0
+ var flres = fl + 7.0
+ flres = fl - 7.0
+ flres = fl * 7.0
+ flres = fl / 7.0
enddef
def Test_disassemble_computing()
'anyres = g:number % 7.*' ..
'\d OPANY %.*',
instr)
- if has('float')
- assert_match('Computing.*' ..
- 'var fl = 3.0.*' ..
- '\d PUSHF 3.0.*' ..
- '\d STORE $3.*' ..
- 'var flres = fl + 7.0.*' ..
- '\d LOAD $3.*' ..
- '\d PUSHF 7.0.*' ..
- '\d OPFLOAT +.*' ..
- '\d STORE $4.*' ..
- 'flres = fl - 7.0.*' ..
- '\d OPFLOAT -.*' ..
- 'flres = fl \* 7.0.*' ..
- '\d OPFLOAT \*.*' ..
- 'flres = fl / 7.0.*' ..
- '\d OPFLOAT /.*',
- instr)
- endif
+ assert_match('Computing.*' ..
+ 'var fl = 3.0.*' ..
+ '\d PUSHF 3.0.*' ..
+ '\d STORE $3.*' ..
+ 'var flres = fl + 7.0.*' ..
+ '\d LOAD $3.*' ..
+ '\d PUSHF 7.0.*' ..
+ '\d OPFLOAT +.*' ..
+ '\d STORE $4.*' ..
+ 'flres = fl - 7.0.*' ..
+ '\d OPFLOAT -.*' ..
+ 'flres = fl \* 7.0.*' ..
+ '\d OPFLOAT \*.*' ..
+ 'flres = fl / 7.0.*' ..
+ '\d OPFLOAT /.*',
+ instr)
enddef
def s:AddListBlob()
['77 isnot g:xx', 'COMPAREANY isnot'],
]
var floatDecl = ''
- if has('float')
- cases->extend([
- ['1.1 == aFloat', 'COMPAREFLOAT =='],
- ['1.1 != aFloat', 'COMPAREFLOAT !='],
- ['1.1 > aFloat', 'COMPAREFLOAT >'],
- ['1.1 < aFloat', 'COMPAREFLOAT <'],
- ['1.1 >= aFloat', 'COMPAREFLOAT >='],
- ['1.1 <= aFloat', 'COMPAREFLOAT <='],
- ['1.1 =~ aFloat', 'COMPAREFLOAT =\~'],
- ['1.1 !~ aFloat', 'COMPAREFLOAT !\~'],
- ])
- floatDecl = 'var aFloat = 2.2'
- endif
+ cases->extend([
+ ['1.1 == aFloat', 'COMPAREFLOAT =='],
+ ['1.1 != aFloat', 'COMPAREFLOAT !='],
+ ['1.1 > aFloat', 'COMPAREFLOAT >'],
+ ['1.1 < aFloat', 'COMPAREFLOAT <'],
+ ['1.1 >= aFloat', 'COMPAREFLOAT >='],
+ ['1.1 <= aFloat', 'COMPAREFLOAT <='],
+ ['1.1 =~ aFloat', 'COMPAREFLOAT =\~'],
+ ['1.1 !~ aFloat', 'COMPAREFLOAT !\~'],
+ ])
+ floatDecl = 'var aFloat = 2.2'
var nr = 1
for case in cases
assert_equal('one', 1 ?
'one' :
'two')
- if has('float')
- assert_equal('one', !!0.1 ? 'one' : 'two')
- endif
+ assert_equal('one', !!0.1 ? 'one' : 'two')
assert_equal('one', !!'x' ? 'one' : 'two')
assert_equal('one', !!'x'
? 'one'
assert_equal('two', false ? 'one' : 'two')
assert_equal('two', 0 ? 'one' : 'two')
- if has('float')
- assert_equal('two', !!0.0 ? 'one' : 'two')
- endif
+ assert_equal('two', !!0.0 ? 'one' : 'two')
assert_equal('two', !!'' ? 'one' : 'two')
assert_equal('two', !!0z ? 'one' : 'two')
assert_equal('two', !![] ? 'one' : 'two')
call v9.CheckDefExecAndScriptFailure(["var x = true ? xxx : 'foo'"], ['E1001:', 'E121:'], 1)
call v9.CheckDefExecAndScriptFailure(["var x = false ? 'foo' : xxx"], ['E1001:', 'E121:'], 1)
- if has('float')
- call v9.CheckDefAndScriptFailure(["var x = 0.1 ? 'one' : 'two'"], 'E805:', 1)
- endif
+ call v9.CheckDefAndScriptFailure(["var x = 0.1 ? 'one' : 'two'"], 'E805:', 1)
" missing argument detected even when common type is used
call v9.CheckDefAndScriptFailure([
assert_equal('yes', 'yes' ?? 456)
assert_equal([1], [1] ?? 456)
assert_equal({one: 1}, {one: 1} ?? 456)
- if has('float')
- assert_equal(0.1, 0.1 ?? 456)
- endif
+ assert_equal(0.1, 0.1 ?? 456)
assert_equal(456, v:false ?? 456)
assert_equal(456, 0 ?? 456)
assert_equal(456, '' ?? 456)
assert_equal(456, [] ?? 456)
assert_equal(456, {} ?? 456)
- if has('float')
- assert_equal(456, 0.0 ?? 456)
- endif
+ assert_equal(456, 0.0 ?? 456)
END
v9.CheckDefAndScriptSuccess(lines)
let anint = 10
let theone = 1
let thefour = 4
-if has('float')
- let afloat = 0.1
-endif
+let afloat = 0.1
let astring = 'asdf'
let ablob = 0z01ab
let alist = [2, 3, 4]
assert_equal(true, g:anint == 10)
assert_equal(false, 61 == g:anint)
- if has('float')
- var ff = 0.3
- assert_equal(true, ff == 0.3)
- assert_equal(false, 0.4 == ff)
- assert_equal(true, 0.1 == g:afloat)
- assert_equal(false, g:afloat == 0.3)
-
- ff = 3.0
- assert_equal(true, ff == 3)
- assert_equal(true, 3 == ff)
- ff = 3.1
- assert_equal(false, ff == 3)
- assert_equal(false, 3 == ff)
- endif
+ var ff = 0.3
+ assert_equal(true, ff == 0.3)
+ assert_equal(false, 0.4 == ff)
+ assert_equal(true, 0.1 == g:afloat)
+ assert_equal(false, g:afloat == 0.3)
+
+ ff = 3.0
+ assert_equal(true, ff == 3)
+ assert_equal(true, 3 == ff)
+ ff = 3.1
+ assert_equal(false, ff == 3)
+ assert_equal(false, 3 == ff)
assert_equal(true, 'abc' == 'abc')
assert_equal(false, 'xyz' == 'abc')
v9.CheckScriptFailure(lines, 'E1030: Using a String as a Number: "3"')
assert_true(g:notReached)
- if has('float')
- lines =<< trim END
- vim9script
- var n: any = 2.2
- def Compare()
- eval n == '3'
- g:notReached = false
- enddef
- g:notReached = true
- Compare()
- END
- v9.CheckScriptFailure(lines, 'E892: Using a String as a Float')
- assert_true(g:notReached)
- endif
+ lines =<< trim END
+ vim9script
+ var n: any = 2.2
+ def Compare()
+ eval n == '3'
+ g:notReached = false
+ enddef
+ g:notReached = true
+ Compare()
+ END
+ v9.CheckScriptFailure(lines, 'E892: Using a String as a Float')
+ assert_true(g:notReached)
unlet g:notReached
enddef
assert_true(null != 123)
assert_true(null != 0)
- if has('float')
- assert_false(12.3 == null)
- assert_false(0.0 == null)
- assert_false(null == 12.3)
- assert_false(null == 0.0)
- assert_true(12.3 != null)
- assert_true(0.0 != null)
- assert_true(null != 12.3)
- assert_true(null != 0.0)
- endif
+ assert_false(12.3 == null)
+ assert_false(0.0 == null)
+ assert_false(null == 12.3)
+ assert_false(null == 0.0)
+ assert_true(12.3 != null)
+ assert_true(0.0 != null)
+ assert_true(null != 12.3)
+ assert_true(null != 0.0)
assert_true(test_null_blob() == v:null)
assert_true(null_blob == null)
assert_equal(false, g:anint != 10)
assert_equal(true, 61 != g:anint)
- if has('float')
- var ff = 0.3
- assert_equal(false, 0.3 != ff)
- assert_equal(true, 0.4 != ff)
- assert_equal(false, 0.1 != g:afloat)
- assert_equal(true, g:afloat != 0.3)
-
- ff = 3.0
- assert_equal(false, ff != 3)
- assert_equal(false, 3 != ff)
- ff = 3.1
- assert_equal(true, ff != 3)
- assert_equal(true, 3 != ff)
- endif
+ var ff = 0.3
+ assert_equal(false, 0.3 != ff)
+ assert_equal(true, 0.4 != ff)
+ assert_equal(false, 0.1 != g:afloat)
+ assert_equal(true, g:afloat != 0.3)
+
+ ff = 3.0
+ assert_equal(false, ff != 3)
+ assert_equal(false, 3 != ff)
+ ff = 3.1
+ assert_equal(true, ff != 3)
+ assert_equal(true, 3 != ff)
assert_equal(false, 'abc' != 'abc')
assert_equal(true, 'xyz' != 'abc')
assert_false(nr2 > 2)
assert_false(nr2
> 3)
- if has('float')
- var ff = 2.0
- assert_true(ff > 0.0)
- assert_true(ff > 1.0)
- assert_false(ff > 2.0)
- assert_false(ff > 3.0)
- endif
+ var ff = 2.0
+ assert_true(ff > 0.0)
+ assert_true(ff > 1.0)
+ assert_false(ff > 2.0)
+ assert_false(ff > 3.0)
END
v9.CheckDefAndScriptSuccess(lines)
enddef
assert_true(nr2 >= 0)
assert_true(nr2 >= 2)
assert_false(nr2 >= 3)
- if has('float')
- var ff = 2.0
- assert_true(ff >= 0.0)
- assert_true(ff >= 2.0)
- assert_false(ff >= 3.0)
- endif
+ var ff = 2.0
+ assert_true(ff >= 0.0)
+ assert_true(ff >= 2.0)
+ assert_false(ff >= 3.0)
END
v9.CheckDefAndScriptSuccess(lines)
enddef
assert_false(nr2 < 0)
assert_false(nr2 < 2)
assert_true(nr2 < 3)
- if has('float')
- var ff = 2.0
- assert_false(ff < 0.0)
- assert_false(ff < 2.0)
- assert_true(ff < 3.0)
- endif
+ var ff = 2.0
+ assert_false(ff < 0.0)
+ assert_false(ff < 2.0)
+ assert_true(ff < 3.0)
END
v9.CheckDefAndScriptSuccess(lines)
enddef
assert_false(nr2 <= 1)
assert_true(nr2 <= 2)
assert_true(nr2 <= 3)
- if has('float')
- var ff = 2.0
- assert_false(ff <= 0.0)
- assert_false(ff <= 1.0)
- assert_true(ff <= 2.0)
- assert_true(ff <= 3.0)
- endif
+ var ff = 2.0
+ assert_false(ff <= 0.0)
+ assert_false(ff <= 1.0)
+ assert_true(ff <= 2.0)
+ assert_true(ff <= 3.0)
END
v9.CheckDefAndScriptSuccess(lines)
enddef
call v9.CheckDefAndScriptFailure(["var x = v:none isnot v:null"], 'Cannot use "isnot" with special', 1)
call v9.CheckDefAndScriptFailure(["var x = 123 is 123"], 'Cannot use "is" with number', 1)
call v9.CheckDefAndScriptFailure(["var x = 123 isnot 123"], 'Cannot use "isnot" with number', 1)
- if has('float')
- call v9.CheckDefAndScriptFailure(["var x = 1.3 is 1.3"], 'Cannot use "is" with float', 1)
- call v9.CheckDefAndScriptFailure(["var x = 1.3 isnot 1.3"], 'Cannot use "isnot" with float', 1)
- endif
+ call v9.CheckDefAndScriptFailure(["var x = 1.3 is 1.3"], 'Cannot use "is" with float', 1)
+ call v9.CheckDefAndScriptFailure(["var x = 1.3 isnot 1.3"], 'Cannot use "isnot" with float', 1)
call v9.CheckDefAndScriptFailure(["var x = 0za1 > 0z34"], 'Cannot compare blob with blob', 1)
call v9.CheckDefAndScriptFailure(["var x = 0za1 >= 0z34"], 'Cannot compare blob with blob', 1)
assert_equal('afalse', 'a' .. false)
assert_equal('anull', 'a' .. v:null)
assert_equal('av:none', 'a' .. v:none)
- if has('float')
- assert_equal('a0.123', 'a' .. 0.123)
- endif
+ assert_equal('a0.123', 'a' .. 0.123)
assert_equal(3, 1 + [2, 3, 4][0])
assert_equal(5, 2 + {key: 3}['key'])
enddef
def Test_expr6_float()
- if !has('float')
- MissingFeature 'float'
- else
- var lines =<< trim END
- assert_equal(66.0, 60.0 + 6.0)
- assert_equal(66.0, 60.0 + 6)
- assert_equal(66.0, 60 +
- 6.0)
- assert_equal(5.1, g:afloat
- + 5)
- assert_equal(8.1, 8 + g:afloat)
- assert_equal(10.1, g:anint + g:afloat)
- assert_equal(10.1, g:afloat + g:anint)
-
- assert_equal(54.0, 60.0 - 6.0)
- assert_equal(54.0, 60.0
- - 6)
- assert_equal(54.0, 60 - 6.0)
- assert_equal(-4.9, g:afloat - 5)
- assert_equal(7.9, 8 - g:afloat)
- assert_equal(9.9, g:anint - g:afloat)
- assert_equal(-9.9, g:afloat - g:anint)
- END
- v9.CheckDefAndScriptSuccess(lines)
- endif
+ var lines =<< trim END
+ assert_equal(66.0, 60.0 + 6.0)
+ assert_equal(66.0, 60.0 + 6)
+ assert_equal(66.0, 60 +
+ 6.0)
+ assert_equal(5.1, g:afloat
+ + 5)
+ assert_equal(8.1, 8 + g:afloat)
+ assert_equal(10.1, g:anint + g:afloat)
+ assert_equal(10.1, g:afloat + g:anint)
+
+ assert_equal(54.0, 60.0 - 6.0)
+ assert_equal(54.0, 60.0
+ - 6)
+ assert_equal(54.0, 60 - 6.0)
+ assert_equal(-4.9, g:afloat - 5)
+ assert_equal(7.9, 8 - g:afloat)
+ assert_equal(9.9, g:anint - g:afloat)
+ assert_equal(-9.9, g:afloat - g:anint)
+ END
+ v9.CheckDefAndScriptSuccess(lines)
enddef
func Test_expr6_fails()
var y = [3]
assert_equal(5, x[0] + y[0])
assert_equal(6, x[0] * y[0])
- if has('float')
- var xf = [2.0]
- var yf = [3.0]
- assert_equal(5.0, xf[0]
- + yf[0])
- assert_equal(6.0, xf[0]
- * yf[0])
- endif
+ var xf = [2.0]
+ var yf = [3.0]
+ assert_equal(5.0, xf[0]
+ + yf[0])
+ assert_equal(6.0, xf[0]
+ * yf[0])
END
v9.CheckDefAndScriptSuccess(lines)
v9.CheckDefExecFailure(['echo 123 / g:zero'], 'E1154: Divide by zero')
v9.CheckDefExecFailure(['echo 123 % g:zero'], 'E1154: Divide by zero')
- if has('float')
- v9.CheckDefExecAndScriptFailure([
- 'g:one = 1.0',
- 'g:two = 2.0',
- 'echo g:one % g:two',
- ], 'E804', 3)
- endif
+ v9.CheckDefExecAndScriptFailure([
+ 'g:one = 1.0',
+ 'g:two = 2.0',
+ 'echo g:one % g:two',
+ ], 'E804', 3)
lines =<< trim END
var n = 0
enddef
def Test_expr7_float()
- if !has('float')
- MissingFeature 'float'
- else
- var lines =<< trim END
- assert_equal(36.0, 6.0 * 6)
- assert_equal(36.0, 6 *
- 6.0)
- assert_equal(36.0, 6.0 * 6.0)
- assert_equal(1.0, g:afloat * g:anint)
-
- assert_equal(10.0, 60 / 6.0)
- assert_equal(10.0, 60.0 /
- 6)
- assert_equal(10.0, 60.0 / 6.0)
- assert_equal(0.01, g:afloat / g:anint)
-
- assert_equal(4.0, 6.0 * 4 / 6)
- assert_equal(4.0, 6 *
- 4.0 /
- 6)
- assert_equal(4.0, 6 * 4 / 6.0)
- assert_equal(4.0, 6.0 * 4.0 / 6)
- assert_equal(4.0, 6 * 4.0 / 6.0)
- assert_equal(4.0, 6.0 * 4 / 6.0)
- assert_equal(4.0, 6.0 * 4.0 / 6.0)
-
- assert_equal(4.0, 6.0 * 4.0 / 6.0)
- END
- v9.CheckDefAndScriptSuccess(lines)
- endif
+ var lines =<< trim END
+ assert_equal(36.0, 6.0 * 6)
+ assert_equal(36.0, 6 *
+ 6.0)
+ assert_equal(36.0, 6.0 * 6.0)
+ assert_equal(1.0, g:afloat * g:anint)
+
+ assert_equal(10.0, 60 / 6.0)
+ assert_equal(10.0, 60.0 /
+ 6)
+ assert_equal(10.0, 60.0 / 6.0)
+ assert_equal(0.01, g:afloat / g:anint)
+
+ assert_equal(4.0, 6.0 * 4 / 6)
+ assert_equal(4.0, 6 *
+ 4.0 /
+ 6)
+ assert_equal(4.0, 6 * 4 / 6.0)
+ assert_equal(4.0, 6.0 * 4.0 / 6)
+ assert_equal(4.0, 6 * 4.0 / 6.0)
+ assert_equal(4.0, 6.0 * 4 / 6.0)
+ assert_equal(4.0, 6.0 * 4.0 / 6.0)
+
+ assert_equal(4.0, 6.0 * 4.0 / 6.0)
+ END
+ v9.CheckDefAndScriptSuccess(lines)
enddef
func Test_expr7_fails()
call v9.CheckDefAndScriptFailure(["var x = {one: 1} % {two: 2}"], ['E1035:', 'E728:'], 1)
call v9.CheckDefAndScriptFailure(["var x = 0xff[1]"], ['E1107:', 'E1062:'], 1)
- if has('float')
- call v9.CheckDefAndScriptFailure(["var x = 0.7[1]"], ['E1107:', 'E806:'], 1)
- endif
+ call v9.CheckDefAndScriptFailure(["var x = 0.7[1]"], ['E1107:', 'E806:'], 1)
for op in ['*', '/', '%']
let lines = ['var x = 1', op .. '2', '# comment']
endfunc
func Test_expr7_float_fails()
- CheckFeature float
call v9.CheckDefAndScriptFailure(["var x = 1.0 % 2"], ['E1035:', 'E804:'], 1)
endfunc
" define here to use old style parsing
-if has('float')
- let g:float_zero = 0.0
- let g:float_neg = -9.8
- let g:float_big = 9.9e99
-endif
+let g:float_zero = 0.0
+let g:float_neg = -9.8
+let g:float_big = 9.9e99
+
let g:blob_empty = 0z
let g:blob_one = 0z01
let g:blob_long = 0z0102.0304
def Test_expr9_float()
# float constant
- if !has('float')
- MissingFeature 'float'
- else
- var lines =<< trim END
- assert_equal(g:float_zero, .0)
- assert_equal(g:float_zero, 0.0)
- assert_equal(g:float_neg, -9.8)
- assert_equal(g:float_big, 9.9e99)
- END
- v9.CheckDefAndScriptSuccess(lines)
- endif
+ var lines =<< trim END
+ assert_equal(g:float_zero, .0)
+ assert_equal(g:float_zero, 0.0)
+ assert_equal(g:float_neg, -9.8)
+ assert_equal(g:float_big, 9.9e99)
+ END
+ v9.CheckDefAndScriptSuccess(lines)
enddef
def Test_expr9_blob()
assert_equal('numberexpr', dkeys[12])
assert_equal('number', dkeys[34])
assert_equal('bool', dkeys[true])
- if has('float')
- dkeys = {[1.2]: 'floatexpr', [3.4]: 'float'}
- assert_equal('floatexpr', dkeys[1.2])
- assert_equal('float', dkeys[3.4])
- endif
+ dkeys = {[1.2]: 'floatexpr', [3.4]: 'float'}
+ assert_equal('floatexpr', dkeys[1.2])
+ assert_equal('float', dkeys[3.4])
# automatic conversion from number to string
var n = 123
call assert_equal(2, type(function("tr", [8])))
call assert_equal(3, type([]))
call assert_equal(4, type({}))
- if has('float')
- call assert_equal(5, type(0.0))
- endif
+ call assert_equal(5, type(0.0))
call assert_equal(6, type(v:false))
call assert_equal(6, type(v:true))
call assert_equal(7, type(v:none))
call assert_equal(v:t_func, type(function("tr", [8])))
call assert_equal(v:t_list, type([]))
call assert_equal(v:t_dict, type({}))
- if has('float')
- call assert_equal(v:t_float, type(0.0))
- endif
+ call assert_equal(v:t_float, type(0.0))
call assert_equal(v:t_bool, type(v:false))
call assert_equal(v:t_bool, type(v:true))
call assert_equal(v:t_none, type(v:none))
call assert_true(v:none == 0)
call assert_false(v:none == 1)
call assert_false(v:none != 0)
- if has('float')
- call assert_true(v:null == 0.0)
- call assert_false(v:null == 0.1)
- call assert_false(v:null != 0.0)
- endif
+ call assert_true(v:null == 0.0)
+ call assert_false(v:null == 0.1)
+ call assert_false(v:null != 0.0)
call assert_true(v:false is v:false)
call assert_true(v:true is v:true)
\ "'foo bar'"], l)
" Float
- if has('float')
- let a = -1.2e0
- redir => result
- echo a
- echo string(a)
- redir END
- let l = split(result, "\n")
- call assert_equal(["-1.2",
- \ "-1.2"], l)
- endif
+ let a = -1.2e0
+ redir => result
+ echo a
+ echo string(a)
+ redir END
+ let l = split(result, "\n")
+ call assert_equal(["-1.2",
+ \ "-1.2"], l)
" Funcref
redir => result
call assert_equal(-9223372036854775807, -1 / 0)
call assert_equal(-9223372036854775807 - 1, 0 / 0)
- if has('float')
- call assert_equal( 0x7FFFffffFFFFffff, float2nr( 1.0e150))
- call assert_equal(-0x7FFFffffFFFFffff, float2nr(-1.0e150))
- endif
+ call assert_equal( 0x7FFFffffFFFFffff, float2nr( 1.0e150))
+ call assert_equal(-0x7FFFffffFFFFffff, float2nr(-1.0e150))
let rng = range(0xFFFFffff, 0x100000001)
call assert_equal([0xFFFFffff, 0x100000000, 0x100000001], rng)
call assert_equal(0, and(127, 128))
call assert_fails("call and([], 1)", 'E745:')
call assert_fails("call and({}, 1)", 'E728:')
- if has('float')
- call assert_fails("call and(1.0, 1)", 'E805:')
- call assert_fails("call and(1, 1.0)", 'E805:')
- endif
+ call assert_fails("call and(1.0, 1)", 'E805:')
+ call assert_fails("call and(1, 1.0)", 'E805:')
call assert_fails("call and(1, [])", 'E745:')
call assert_fails("call and(1, {})", 'E728:')
" or
call assert_equal(123, or(0, 123))
call assert_fails("call or([], 1)", 'E745:')
call assert_fails("call or({}, 1)", 'E728:')
- if has('float')
- call assert_fails("call or(1.0, 1)", 'E805:')
- call assert_fails("call or(1, 1.0)", 'E805:')
- endif
+ call assert_fails("call or(1.0, 1)", 'E805:')
+ call assert_fails("call or(1, 1.0)", 'E805:')
call assert_fails("call or(1, [])", 'E745:')
call assert_fails("call or(1, {})", 'E728:')
" xor
call assert_equal(111, xor(127, 16))
eval 127->xor(16)->assert_equal(111)
call assert_equal(255, xor(127, 128))
- if has('float')
- call assert_fails("call xor(1.0, 1)", 'E805:')
- call assert_fails("call xor(1, 1.0)", 'E805:')
- endif
+ call assert_fails("call xor(1.0, 1)", 'E805:')
+ call assert_fails("call xor(1, 1.0)", 'E805:')
call assert_fails("call xor([], 1)", 'E745:')
call assert_fails("call xor({}, 1)", 'E728:')
call assert_fails("call xor(1, [])", 'E745:')
eval 127->invert()->and(65535)->assert_equal(65408)
call assert_equal(65519, and(invert(16), 65535))
call assert_equal(65407, and(invert(128), 65535))
- if has('float')
- call assert_fails("call invert(1.0)", 'E805:')
- endif
+ call assert_fails("call invert(1.0)", 'E805:')
call assert_fails("call invert([])", 'E745:')
call assert_fails("call invert({})", 'E728:')
endfunc
let x += 1
call assert_equal(1, x)
- if has('float')
- " Test for float
- let x -= 1.5
- call assert_equal(-0.5, x)
- let x = 0.5
- let x += 4.5
- call assert_equal(5.0, x)
- let x -= 1.5
- call assert_equal(3.5, x)
- let x *= 3.0
- call assert_equal(10.5, x)
- let x /= 2.5
- call assert_equal(4.2, x)
- call assert_fails('let x %= 0.5', 'E734:')
- call assert_fails('let x .= "f"', 'E734:')
- let x = !3.14
- call assert_equal(0.0, x)
-
- " integer and float operations
- let x = 1
- let x *= 2.1
- call assert_equal(2.1, x)
- let x = 1
- let x /= 0.25
- call assert_equal(4.0, x)
- let x = 1
- call assert_fails('let x %= 0.25', 'E734:')
- let x = 1
- call assert_fails('let x .= 0.25', 'E734:')
- let x = 1.0
- call assert_fails('let x += [1.1]', 'E734:')
- endif
+ " Test for float
+ let x -= 1.5
+ call assert_equal(-0.5, x)
+ let x = 0.5
+ let x += 4.5
+ call assert_equal(5.0, x)
+ let x -= 1.5
+ call assert_equal(3.5, x)
+ let x *= 3.0
+ call assert_equal(10.5, x)
+ let x /= 2.5
+ call assert_equal(4.2, x)
+ call assert_fails('let x %= 0.5', 'E734:')
+ call assert_fails('let x .= "f"', 'E734:')
+ let x = !3.14
+ call assert_equal(0.0, x)
+
+ " integer and float operations
+ let x = 1
+ let x *= 2.1
+ call assert_equal(2.1, x)
+ let x = 1
+ let x /= 0.25
+ call assert_equal(4.0, x)
+ let x = 1
+ call assert_fails('let x %= 0.25', 'E734:')
+ let x = 1
+ call assert_fails('let x .= 0.25', 'E734:')
+ let x = 1.0
+ call assert_fails('let x += [1.1]', 'E734:')
" Test for environment variable
let $FOO = 1
call assert_equal(0, test_refcount({}))
call assert_equal(0, test_refcount(0zff))
call assert_equal(0, test_refcount({-> line('.')}))
- if has('float')
- call assert_equal(-1, test_refcount(0.1))
- endif
+ call assert_equal(-1, test_refcount(0.1))
if has('job')
call assert_equal(0, test_refcount(job_start([&shell, &shellcmdflag, 'echo .'])))
endif
call assert_equal(-1, test_refcount(x))
let x = v:true
call assert_equal(-1, test_refcount(x))
- if has('float')
- let x = 0.1
- call assert_equal(-1, test_refcount(x))
- endif
+ let x = 0.1
+ call assert_equal(-1, test_refcount(x))
" Check refcount
let x = []
" Test for errors in converting to float from various types {{{1
func Test_float_conversion_errors()
- if has('float')
- call assert_fails('let x = 4.0 % 2.0', 'E804:')
- call assert_fails('echo 1.1[0]', 'E806:')
- call assert_fails('echo sort([function("min"), 1], "f")', 'E891:')
- call assert_fails('echo 3.2 == "vim"', 'E892:')
- call assert_fails('echo sort([[], 1], "f")', 'E893:')
- call assert_fails('echo sort([{}, 1], "f")', 'E894:')
- call assert_fails('echo 3.2 == v:true', 'E362:')
- call assert_fails('echo 3.2 == v:none', 'E907:')
- endif
+ call assert_fails('let x = 4.0 % 2.0', 'E804:')
+ call assert_fails('echo 1.1[0]', 'E806:')
+ call assert_fails('echo sort([function("min"), 1], "f")', 'E891:')
+ call assert_fails('echo 3.2 == "vim"', 'E892:')
+ call assert_fails('echo sort([[], 1], "f")', 'E893:')
+ call assert_fails('echo sort([{}, 1], "f")', 'E894:')
+ call assert_fails('echo 3.2 == v:true', 'E362:')
+ call assert_fails('echo 3.2 == v:none', 'E907:')
endfunc
" invalid function names {{{1
char msg[200];
char_u numbuf[NUMBUFLEN];
-#ifdef FEAT_FLOAT
if (argvars[0].v_type == VAR_FLOAT
|| argvars[1].v_type == VAR_FLOAT
|| argvars[2].v_type == VAR_FLOAT)
}
}
else
-#endif
{
varnumber_T lower = tv_get_number_chk(&argvars[0], &error);
varnumber_T upper = tv_get_number_chk(&argvars[1], &error);
# endif
}
-# ifdef FEAT_FLOAT
/*
* "reltimefloat()" function
*/
void
f_reltimefloat(typval_T *argvars UNUSED, typval_T *rettv)
{
-# ifdef FEAT_RELTIME
+# ifdef FEAT_RELTIME
proftime_T tm;
-# endif
+# endif
rettv->v_type = VAR_FLOAT;
rettv->vval.v_float = 0;
-# ifdef FEAT_RELTIME
+# ifdef FEAT_RELTIME
if (in_vim9script() && check_for_list_arg(argvars, 0) == FAIL)
return;
rettv->vval.v_float = profile_float(&tm);
else if (in_vim9script())
emsg(_(e_invalid_argument));
-# endif
-}
# endif
+}
/*
* "reltimestr()" function
varp->vval.v_number = 0;
break;
case VAR_FLOAT:
-#ifdef FEAT_FLOAT
varp->vval.v_float = 0.0;
break;
-#endif
case VAR_JOB:
#ifdef FEAT_JOB_CHANNEL
job_unref(varp->vval.v_job);
}
return varp->vval.v_number;
case VAR_FLOAT:
-#ifdef FEAT_FLOAT
emsg(_(e_using_float_as_number));
break;
-#endif
case VAR_FUNC:
case VAR_PARTIAL:
emsg(_(e_using_funcref_as_number));
return tv_get_bool_or_number_chk(varp, denote, TRUE);
}
-#if defined(FEAT_FLOAT) || defined(PROTO)
static float_T
tv_get_float_chk(typval_T *varp, int *error)
{
{
return tv_get_float_chk(varp, NULL);
}
-#endif
/*
* Give an error and return FAIL unless "args[idx]" is unknown
emsg(_(e_using_dictionary_as_string));
break;
case VAR_FLOAT:
-#ifdef FEAT_FLOAT
if (strict)
{
emsg(_(e_using_float_as_string));
}
vim_snprintf((char *)buf, NUMBUFLEN, "%g", varp->vval.v_float);
return buf;
-#endif
case VAR_STRING:
if (varp->vval.v_string != NULL)
return varp->vval.v_string;
to->vval.v_number = from->vval.v_number;
break;
case VAR_FLOAT:
-#ifdef FEAT_FLOAT
to->vval.v_float = from->vval.v_float;
break;
-#endif
case VAR_JOB:
#ifdef FEAT_JOB_CHANNEL
to->vval.v_job = from->vval.v_job;
n1 = res;
}
-#ifdef FEAT_FLOAT
// If one of the two variables is a float, compare as a float.
// When using "=~" or "!~", always compare as string.
else if ((tv1->v_type == VAR_FLOAT || tv2->v_type == VAR_FLOAT)
default: break; // avoid gcc warning
}
}
-#endif
// If one of the two variables is a number, compare as a number.
// When using "=~" or "!~", always compare as string.
case VAR_NUMBER: if (!in_vim9script())
return tv->vval.v_number == 0;
break;
-#ifdef FEAT_FLOAT
case VAR_FLOAT: if (!in_vim9script())
return tv->vval.v_float == 0.0;
break;
-#endif
default: break;
}
}
return ((ic ? MB_STRICMP(s1, s2) : STRCMP(s1, s2)) == 0);
case VAR_FLOAT:
-#ifdef FEAT_FLOAT
return tv1->vval.v_float == tv2->vval.v_float;
-#endif
case VAR_JOB:
#ifdef FEAT_JOB_CHANNEL
return tv1->vval.v_job == tv2->vval.v_job;
{
int len;
int skip_quotes = !in_old_script(4);
-#ifdef FEAT_FLOAT
char_u *p;
int get_float = FALSE;
}
}
else
-#endif
if (**arg == '0' && ((*arg)[1] == 'z' || (*arg)[1] == 'Z'))
{
char_u *bp;
#else
"-find_in_path",
#endif
-#ifdef FEAT_FLOAT
"+float",
-#else
- "-float",
-#endif
#ifdef FEAT_FOLDING
"+folding",
#else
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 491,
/**/
490,
/**/
varnumber_T number;
blob_T *blob;
vartype_T vartype;
-#ifdef FEAT_FLOAT
float_T fnumber;
-#endif
channel_T *channel;
job_T *job;
partial_T *partial;
r = generate_PUSHBOOL(cctx, VVAL_FALSE);
break;
case VAR_FLOAT:
-#ifdef FEAT_FLOAT
r = generate_PUSHF(cctx, 0.0);
-#endif
break;
case VAR_STRING:
r = generate_PUSHS(cctx, NULL);
expected = lhs.lhs_member_type;
stacktype = get_type_on_stack(cctx, 0);
if (
-#ifdef FEAT_FLOAT
// If variable is float operation with number is OK.
!(expected == &t_float && (stacktype == &t_number
|| stacktype == &t_number_bool)) &&
-#endif
need_type(stacktype, expected, -1, 0, cctx,
FALSE, FALSE) == FAIL)
goto theend;
tv->v_type = VAR_SPECIAL;
tv->vval.v_number = iptr->isn_arg.number;
break;
-#ifdef FEAT_FLOAT
case ISN_PUSHF:
tv->v_type = VAR_FLOAT;
tv->vval.v_float = iptr->isn_arg.fnumber;
break;
-#endif
case ISN_PUSHBLOB:
blob_copy(iptr->isn_arg.blob, tv);
break;
// Computation with two float arguments
case ISN_OPFLOAT:
case ISN_COMPAREFLOAT:
-#ifdef FEAT_FLOAT
{
typval_T *tv1 = STACK_TV_BOT(-2);
typval_T *tv2 = STACK_TV_BOT(-1);
else
tv1->vval.v_float = res;
}
-#endif
break;
case ISN_COMPARELIST:
typval_T *tv1 = STACK_TV_BOT(-2);
typval_T *tv2 = STACK_TV_BOT(-1);
varnumber_T n1, n2;
-#ifdef FEAT_FLOAT
float_T f1 = 0, f2 = 0;
-#endif
int error = FALSE;
if (iptr->isn_arg.op.op_type == EXPR_ADD)
break;
}
}
-#ifdef FEAT_FLOAT
if (tv1->v_type == VAR_FLOAT)
{
f1 = tv1->vval.v_float;
n1 = 0;
}
else
-#endif
{
SOURCING_LNUM = iptr->isn_lnum;
n1 = tv_get_number_chk(tv1, &error);
if (error)
goto on_error;
-#ifdef FEAT_FLOAT
if (tv2->v_type == VAR_FLOAT)
f1 = n1;
-#endif
}
-#ifdef FEAT_FLOAT
if (tv2->v_type == VAR_FLOAT)
{
f2 = tv2->vval.v_float;
n2 = 0;
}
else
-#endif
{
n2 = tv_get_number_chk(tv2, &error);
if (error)
goto on_error;
-#ifdef FEAT_FLOAT
if (tv1->v_type == VAR_FLOAT)
f2 = n2;
-#endif
}
-#ifdef FEAT_FLOAT
// if there is a float on either side the result is a float
if (tv1->v_type == VAR_FLOAT || tv2->v_type == VAR_FLOAT)
{
--ectx->ec_stack.ga_len;
}
else
-#endif
{
int failed = FALSE;
case ISN_NEGATENR:
tv = STACK_TV_BOT(-1);
// CHECKTYPE should have checked the variable type
-#ifdef FEAT_FLOAT
if (tv->v_type == VAR_FLOAT)
tv->vval.v_float = -tv->vval.v_float;
else
-#endif
tv->vval.v_number = -tv->vval.v_number;
break;
get_var_special_name(iptr->isn_arg.number));
break;
case ISN_PUSHF:
-#ifdef FEAT_FLOAT
smsg("%s%4d PUSHF %g", pfx, current, iptr->isn_arg.fnumber);
-#endif
break;
case ISN_PUSHS:
smsg("%s%4d PUSHS \"%s\"", pfx, current, iptr->isn_arg.string);
case VAR_NUMBER:
return tv->vval.v_number != 0;
case VAR_FLOAT:
-#ifdef FEAT_FLOAT
return tv->vval.v_float != 0.0;
-#else
- break;
-#endif
case VAR_PARTIAL:
return tv->vval.v_partial != NULL;
case VAR_FUNC:
if (*p == '-' || *p == '+')
{
// only '-' has an effect, for '+' we only check the type
-#ifdef FEAT_FLOAT
if (rettv->v_type == VAR_FLOAT)
{
if (*p == '-')
rettv->vval.v_float = -rettv->vval.v_float;
}
else
-#endif
{
varnumber_T val;
int error = FALSE;
vartype == VAR_NUMBER ? ISN_OPNR
: vartype == VAR_LIST ? ISN_ADDLIST
: vartype == VAR_BLOB ? ISN_ADDBLOB
-#ifdef FEAT_FLOAT
: vartype == VAR_FLOAT ? ISN_OPFLOAT
-#endif
: ISN_OPANY, 1);
if (vartype != VAR_LIST && vartype != VAR_BLOB
if (type1->tt_type == type2->tt_type
&& (type1->tt_type == VAR_NUMBER
|| type1->tt_type == VAR_LIST
-#ifdef FEAT_FLOAT
|| type1->tt_type == VAR_FLOAT
-#endif
|| type1->tt_type == VAR_BLOB))
return type1->tt_type;
return VAR_ANY;
return FAIL;
if (vartype == VAR_NUMBER)
isn = generate_instr_drop(cctx, ISN_OPNR, 1);
-#ifdef FEAT_FLOAT
else if (vartype == VAR_FLOAT)
isn = generate_instr_drop(cctx, ISN_OPFLOAT, 1);
-#endif
else
isn = generate_instr_drop(cctx, ISN_OPANY, 1);
if (isn != NULL)
{
type_T *type = &t_any;
-#ifdef FEAT_FLOAT
// float+number and number+float results in float
if ((type1->tt_type == VAR_NUMBER || type1->tt_type == VAR_FLOAT)
- && (type2->tt_type == VAR_NUMBER || type2->tt_type == VAR_FLOAT))
+ && (type2->tt_type == VAR_NUMBER || type2->tt_type == VAR_FLOAT))
type = &t_float;
-#endif
set_type_on_stack(cctx, type, 0);
}
case VAR_NUMBER:
generate_PUSHNR(cctx, tv->vval.v_number);
break;
-#ifdef FEAT_FLOAT
case VAR_FLOAT:
generate_PUSHF(cctx, tv->vval.v_float);
break;
-#endif
case VAR_BLOB:
generate_PUSHBLOB(cctx, tv->vval.v_blob);
tv->vval.v_blob = NULL;
return OK;
}
-#if defined(FEAT_FLOAT) || defined(PROTO)
/*
* Generate an ISN_PUSHF instruction.
*/
return OK;
}
-#endif
/*
* Generate an ISN_PUSHS instruction.
case 'f':
if (len == 5 && STRNCMP(*arg, "float", len) == 0)
{
-#ifdef FEAT_FLOAT
*arg += len;
return &t_float;
-#else
- if (give_error)
- emsg(_(e_this_vim_is_not_compiled_with_float_support));
- return NULL;
-#endif
}
if (len == 4 && STRNCMP(*arg, "func", len) == 0)
{
switch (*tab)
{
case 'S': type = VAR_STRING; break;
-#ifdef FEAT_FLOAT
case 'F': type = VAR_FLOAT; break;
-#endif
case 'D': type = VAR_DICT; break;
case 'L': type = VAR_LIST; break;
case 'B': type = VAR_BLOB; break;
|| type == VAR_LIST || type == VAR_BLOB)
tv.vval.v_string = viminfo_readstring(virp,
(int)(tab - virp->vir_line + 1), TRUE);
-#ifdef FEAT_FLOAT
else if (type == VAR_FLOAT)
(void)string2float(tab + 1, &tv.vval.v_float, FALSE);
-#endif
else
{
tv.vval.v_number = atol((char *)tab + 1);
projects / vim / commitdiff