diff options
author | Michael Reed <m.reed@mykolab.com> | 2015-01-16 16:44:32 -0500 |
---|---|---|
committer | Michael Reed <m.reed@mykolab.com> | 2015-01-24 16:50:42 -0500 |
commit | 5b8d84d2c2c10e74e9b4959871b4e4d04acdea18 (patch) | |
tree | cefa3948d98264b2b65d7ac6ffb70e4f2013a4ec | |
parent | f4ad8e875cf45e170bc4518aef6112fcfa9435d5 (diff) | |
download | rneovim-5b8d84d2c2c10e74e9b4959871b4e4d04acdea18.tar.gz rneovim-5b8d84d2c2c10e74e9b4959871b4e4d04acdea18.tar.bz2 rneovim-5b8d84d2c2c10e74e9b4959871b4e4d04acdea18.zip |
Remove '+float' references
The corresponding code was already removed in
b4ca3abc9f6676ea250e42c834716a5f66d8ec30
-rw-r--r-- | runtime/doc/eval.txt | 47 | ||||
-rw-r--r-- | runtime/doc/mlang.txt | 12 | ||||
-rw-r--r-- | runtime/doc/various.txt | 1 | ||||
-rw-r--r-- | src/nvim/testdir/test65.in | 4 | ||||
-rw-r--r-- | src/nvim/testdir/test86.in | 20 | ||||
-rw-r--r-- | src/nvim/testdir/test87.in | 20 | ||||
-rw-r--r-- | src/nvim/version.c | 1 |
7 files changed, 29 insertions, 76 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index faf22b718e..d8dee5726b 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -43,7 +43,6 @@ Number A 32 or 64 bit signed number. |expr-number| *Number* Examples: -123 0x10 0177 Float A floating point number. |floating-point-format| *Float* - {only when compiled with the |+float| feature} Examples: 123.456 1.15e-6 -1.1e3 String A NUL terminated string of 8-bit unsigned characters (bytes). @@ -964,7 +963,6 @@ contain digits. {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 @@ -2067,7 +2065,6 @@ abs({expr}) *abs()* < 5.456 > echo abs(-4) < 4 - {only available when compiled with the |+float| feature} acos({expr}) *acos()* @@ -2080,7 +2077,6 @@ acos({expr}) *acos()* < 1.570796 > :echo acos(-0.5) < 2.094395 - {only available when compiled with the |+float| feature} add({list}, {expr}) *add()* @@ -2154,7 +2150,6 @@ asin({expr}) *asin()* < 0.927295 > :echo asin(-0.5) < -0.523599 - {only available when compiled with the |+float| feature} atan({expr}) *atan()* @@ -2166,7 +2161,6 @@ atan({expr}) *atan()* < 1.560797 > :echo atan(-4.01) < -1.326405 - {only available when compiled with the |+float| feature} atan2({expr1}, {expr2}) *atan2()* @@ -2178,7 +2172,6 @@ atan2({expr1}, {expr2}) *atan2()* < -0.785398 > :echo atan2(1, -1) < 2.356194 - {only available when compiled with the |+float| feature} *browse()* @@ -2362,7 +2355,6 @@ ceil({expr}) *ceil()* < -5.0 > echo ceil(4.0) < 4.0 - {only available when compiled with the |+float| feature} changenr() *changenr()* Return the number of the most recent change. This is the same @@ -2547,7 +2539,6 @@ cos({expr}) *cos()* < 0.862319 > :echo cos(-4.01) < -0.646043 - {only available when compiled with the |+float| feature} cosh({expr}) *cosh()* @@ -2559,9 +2550,8 @@ cosh({expr}) *cosh()* < 1.127626 > :echo cosh(-0.5) < -1.127626 - {only available when compiled with the |+float| feature} - + count({comp}, {expr} [, {ic} [, {start}]]) *count()* Return the number of times an item with value {expr} appears in |List| or |Dictionary| {comp}. @@ -2849,7 +2839,6 @@ exp({expr}) *exp()* < 7.389056 > :echo exp(-1) < 0.367879 - {only available when compiled with the |+float| feature} expand({expr} [, {nosuf} [, {list}]]) *expand()* @@ -3074,7 +3063,6 @@ float2nr({expr}) *float2nr()* < -2147483647 > echo float2nr(1.0e-100) < 0 - {only available when compiled with the |+float| feature} floor({expr}) *floor()* @@ -3088,8 +3076,7 @@ floor({expr}) *floor()* < -6.0 > echo floor(4.0) < 4.0 - {only available when compiled with the |+float| feature} - + fmod({expr1}, {expr2}) *fmod()* Return the remainder of {expr1} / {expr2}, even if the @@ -3104,7 +3091,6 @@ fmod({expr1}, {expr2}) *fmod()* < 0.13 > :echo fmod(-12.33, 1.22) < -0.13 - {only available when compiled with |+float| feature} fnameescape({string}) *fnameescape()* @@ -4195,7 +4181,6 @@ log({expr}) *log()* < 2.302585 > :echo log(exp(5)) < 5.0 - {only available when compiled with the |+float| feature} log10({expr}) *log10()* @@ -4206,16 +4191,15 @@ log10({expr}) *log10()* < 3.0 > :echo log10(0.01) < -2.0 - {only available when compiled with the |+float| feature} - + + luaeval({expr}[, {expr}]) *luaeval()* Evaluate Lua expression {expr} and return its result converted to Vim data structures. Second {expr} may hold additional 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. @@ -4649,8 +4633,7 @@ pow({x}, {y}) *pow()* < 65536.0 > :echo pow(32, 0.20) < 2.0 - {only available when compiled with the |+float| feature} - + prevnonblank({lnum}) *prevnonblank()* Return the line number of the first line at or above {lnum} that is not blank. Example: > @@ -5089,7 +5072,6 @@ round({expr}) *round()* < 5.0 > echo round(-4.5) < -5.0 - {only available when compiled with the |+float| feature} rpcnotify({channel}, {event}[, {args}...]) {Nvim} *rpcnotify()* Sends {event} to {channel} via |msgpack-rpc| and returns @@ -5682,8 +5664,7 @@ sin({expr}) *sin()* < -0.506366 > :echo sin(-4.01) < 0.763301 - {only available when compiled with the |+float| feature} - + sinh({expr}) *sinh()* Return the hyperbolic sine of {expr} as a |Float| in the range @@ -5694,7 +5675,6 @@ sinh({expr}) *sinh()* < 0.521095 > :echo sinh(-0.9) < -1.026517 - {only available when compiled with the |+float| feature} sort({list} [, {func} [, {dict}]]) *sort()* *E702* @@ -5836,8 +5816,7 @@ sqrt({expr}) *sqrt()* :echo sqrt(-4.01) < nan "nan" may be different, it depends on system libraries. - {only available when compiled with the |+float| feature} - + str2float( {expr}) *str2float()* Convert String {expr} to a Float. This mostly works the same @@ -5851,7 +5830,6 @@ str2float( {expr}) *str2float()* 12.0. You can strip out thousands separators with |substitute()|: > let f = str2float(substitute(text, ',', '', 'g')) -< {only available when compiled with the |+float| feature} str2nr( {expr} [, {base}]) *str2nr()* @@ -6304,7 +6282,6 @@ tan({expr}) *tan()* < 0.648361 > :echo tan(-4.01) < -1.181502 - {only available when compiled with the |+float| feature} tanh({expr}) *tanh()* @@ -6316,7 +6293,6 @@ tanh({expr}) *tanh()* < 0.462117 > :echo tanh(-1) < -0.761594 - {only available when compiled with the |+float| feature} tolower({expr}) *tolower()* @@ -6354,10 +6330,9 @@ trunc({expr}) *trunc()* < -5.0 > echo trunc(4.0) < 4.0 - {only available when compiled with the |+float| feature} - - *type()* -type({expr}) The result is a Number, depending on the type of {expr}: + +type({expr}) *type()* + The result is a Number, depending on the type of {expr}: Number: 0 String: 1 Funcref: 2 diff --git a/runtime/doc/mlang.txt b/runtime/doc/mlang.txt index eb95660d00..ac615b48de 100644 --- a/runtime/doc/mlang.txt +++ b/runtime/doc/mlang.txt @@ -75,12 +75,12 @@ use of "-" and "_". This sets $LC_TIME. Without an argument both 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. - This will make a difference for items that depend on - the language (some messages, time and date format). - Not fully supported on all systems + 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. If this fails there will be an error message. If it succeeds there is no message. Example: > :language diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index 1df529cf73..2e61079805 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -340,7 +340,6 @@ N *+find_in_path* include file searches: |[I|, |:isearch|, N *+folding* |folding| *+footer* |gui-footer| *+fork* Unix only: |fork| shell commands - *+float* Floating point support N *+gettext* message translations |multi-lang| *+GUI_Athena* Unix only: Athena |GUI| *+GUI_neXtaw* Unix only: neXtaw |GUI| diff --git a/src/nvim/testdir/test65.in b/src/nvim/testdir/test65.in index ca53f27555..2fc5aacdcc 100644 --- a/src/nvim/testdir/test65.in +++ b/src/nvim/testdir/test65.in @@ -2,10 +2,6 @@ Test for floating point and logical operators. STARTTEST :so small.vim -:if !has("float") -: e! test.ok -: wq! test.out -:endif :" :$put =printf('%f', 123.456) :$put =printf('%e', 123.456) diff --git a/src/nvim/testdir/test86.in b/src/nvim/testdir/test86.in index 99102c4d89..958bd57e29 100644 --- a/src/nvim/testdir/test86.in +++ b/src/nvim/testdir/test86.in @@ -255,14 +255,10 @@ EOF :py f=l[0] :delfunction New :py ee('f(1, 2, 3)') -:if has('float') -: let l=[0.0] -: py l=vim.bindeval('l') -: py l.extend([0.0]) -: $put =string(l) -:else -: $put ='[0.0, 0.0]' -:endif +:let l=[0.0] +:py l=vim.bindeval('l') +:py l.extend([0.0]) +:$put =string(l) :let messages=[] :delfunction DictNew py <<EOF @@ -328,12 +324,8 @@ EOF :$put =string(l) :let d=pyeval('{"a": "b", "c": 1, "d": ["e"]}') :$put =sort(items(d)) -:if has('float') -: let f=pyeval('0.0') -: $put =string(f) -:else -: $put ='0.0' -:endif +:let f=pyeval('0.0') +:$put =string(f) :" Invalid values: :for e in ['"\0"', '{"\0": 1}', 'undefined_name', 'vim'] : try diff --git a/src/nvim/testdir/test87.in b/src/nvim/testdir/test87.in index 0bb5119624..cad778e858 100644 --- a/src/nvim/testdir/test87.in +++ b/src/nvim/testdir/test87.in @@ -252,14 +252,10 @@ EOF :py3 f=l[0] :delfunction New :py3 ee('f(1, 2, 3)') -:if has('float') -: let l=[0.0] -: py3 l=vim.bindeval('l') -: py3 l.extend([0.0]) -: $put =string(l) -:else -: $put ='[0.0, 0.0]' -:endif +:let l=[0.0] +:py3 l=vim.bindeval('l') +:py3 l.extend([0.0]) +:$put =string(l) :let messages=[] :delfunction DictNew py3 <<EOF @@ -325,12 +321,8 @@ EOF :$put =string(l) :let d=py3eval('{"a": "b", "c": 1, "d": ["e"]}') :$put =sort(items(d)) -:if has('float') -: let f=py3eval('0.0') -: $put =string(f) -:else -: $put ='0.0' -:endif +:let f=py3eval('0.0') +:$put =string(f) :" Invalid values: :for e in ['"\0"', '{"\0": 1}', 'undefined_name', 'vim'] : try diff --git a/src/nvim/version.c b/src/nvim/version.c index b0bd38b7de..6ca226b45f 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -68,7 +68,6 @@ static char *(features[]) = { "+farsi", "+file_in_path", "+find_in_path", - "+float", "+folding", "-footer", |