Merge pull request #1834 from Pyrohh/misc-float-double

Factor out float usage & remove '+float' references

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

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

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|

src/nvim/hardcopy.c

@@ -181,9 +181,9 @@ typedef struct {
 } prt_pos_T;
 
 struct prt_mediasize_S {
-  char        *name;
-  float width;                  /* width and height in points for portrait */
-  float height;
+  char *name;
+  double width;                  /* width and height in points for portrait */
+  double height;
 };
 
 /* PS font names, must be in Roman, Bold, Italic, Bold-Italic order */
@@ -1991,8 +1991,8 @@ static void prt_page_margins(double width, double height, double *left, double *
 
 static void prt_font_metrics(int font_scale)
 {
-  prt_line_height = (float)font_scale;
-  prt_char_width = (float)PRT_PS_FONT_TO_USER(font_scale, prt_ps_font->wx);
+  prt_line_height = (double)font_scale;
+  prt_char_width = (double)PRT_PS_FONT_TO_USER(font_scale, prt_ps_font->wx);
 }
 
 
@@ -2031,10 +2031,10 @@ static int prt_get_lpp(void)
    * font height (based on its bounding box) and the line height, handling the
    * case where the font height can exceed the line height.
    */
-  prt_bgcol_offset = (float)PRT_PS_FONT_TO_USER(prt_line_height,
+  prt_bgcol_offset = (double)PRT_PS_FONT_TO_USER(prt_line_height,
       prt_ps_font->bbox_min_y);
   if ((prt_ps_font->bbox_max_y - prt_ps_font->bbox_min_y) < 1000.0) {
-    prt_bgcol_offset -= (float)PRT_PS_FONT_TO_USER(prt_line_height,
+    prt_bgcol_offset -= (double)PRT_PS_FONT_TO_USER(prt_line_height,
         (1000.0 - (prt_ps_font->bbox_max_y -
                    prt_ps_font->bbox_min_y)) / 2);
   }
@@ -2099,10 +2099,6 @@ int mch_print_init(prt_settings_T *psettings, char_u *jobname, int forceit)
   int paper_strlen;
   int fontsize;
   char_u      *p;
-  double left;
-  double right;
-  double top;
-  double bottom;
   int props;
   int cmap = 0;
   char_u      *p_encoding;
@@ -2260,16 +2256,15 @@ int mch_print_init(prt_settings_T *psettings, char_u *jobname, int forceit)
     prt_page_height = prt_mediasize[i].width;
   }
 
-  /*
-   * Set PS page margins based on the PS pagesize, not the mediasize - this
-   * needs to be done before the cpl and lpp are calculated.
-   */
+  // Set PS page margins based on the PS pagesize, not the mediasize - this
+  // needs to be done before the cpl and lpp are calculated.
+  double left, right, top, bottom;
   prt_page_margins(prt_page_width, prt_page_height, &left, &right, &top,
       &bottom);
-  prt_left_margin = (float)left;
-  prt_right_margin = (float)right;
-  prt_top_margin = (float)top;
-  prt_bottom_margin = (float)bottom;
+  prt_left_margin = left;
+  prt_right_margin = right;
+  prt_top_margin = top;
+  prt_bottom_margin = bottom;
 
   /*
    * Set up the font size.

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)

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

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

src/nvim/version.c

@@ -68,7 +68,6 @@ static char *(features[]) = {
   "+farsi",
   "+file_in_path",
   "+find_in_path",
-  "+float",
   "+folding",
   "-footer",