Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 05:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change how math rounds integer results

Browse source 
We need our `math` builtin to behave like `bc` with respect to rounding
floating point values to integer to avoid breaking to many existing
uses. So when scale is zero round down to the nearest integer.

Another change for #3157.
This commit is contained in:
Kurtis Rader 2017-08-23 17:31:04 -07:00
parent 24d251ff4b
commit b816cd6d50
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc_src/math.txt
View file

@ -15,7 +15,7 @@ The `math` command can evaluate multiple expressions separated by commas. The re
The following options are available: The following options are available:
- `-sN` or `--scale=N` sets the scale of the result. `N` must be an integer and defaults to zero (rounded to the nearest integer). - `-sN` or `--scale=N` sets the scale of the result. `N` must be an integer and defaults to zero. A scale of zero causes results to be rounded down to the nearest integer. So `3/2` returns `1` rather than `2` which `1.5` would normally round to. This is for compatibility with `bc` which was the basis for this command prior to fish 3.0.0. Scale values greater than zero causes the result to be rounded using the usual rules to the specified number of decimal places.
\subsection return-values Return Values \subsection return-values Return Values

4
src/builtin_math.cpp
View file

@ -133,8 +133,12 @@ static int evaluate_expression(wchar_t *cmd, parser_t &parser, io_streams_t &str
int nNum; int nNum;
mu::value_type *v = p.Eval(nNum); mu::value_type *v = p.Eval(nNum);
for (int i = 0; i < nNum; ++i) { for (int i = 0; i < nNum; ++i) {
if (opts.scale == 0) {
streams.out.append_format(L"%ld\n", static_cast<long>(v[i]));
} else {
streams.out.append_format(L"%.*lf\n", opts.scale, v[i]); streams.out.append_format(L"%.*lf\n", opts.scale, v[i]);
} }
}
return STATUS_CMD_OK; return STATUS_CMD_OK;
} catch (mu::Parser::exception_type &e) { } catch (mu::Parser::exception_type &e) {