mirror of
https://github.com/storytold/gridcraft.git
synced 2026-10-31 07:38:32 +00:00
G708: retain dollar sign when rounding to zero
This commit is contained in:
1 parent
11bb67386c
commit
11b54ebe40
2 files changed
+19
-2
No files matched your search
@@ -399,8 +399,9 @@ fn fixed(a: &[Arg], _c: &mut dyn Ctx) -> R<Value> {
|
||||
|
||||
fn dollar(a: &[Arg], _c: &mut dyn Ctx) -> R<Value> {
|
||||
let (r, d) = rounded(a, 2.0)?;
|
||||
let negative = r < 0.0 || (r == 0.0 && d >= 0 && num(a, 0)? < 0.0);
|
||||
let body = format_fixed(r, d, true);
|
||||
text_val(if r < 0.0 { format!("(${body})") } else { format!("${body}") })
|
||||
text_val(if negative { format!("(${body})") } else { format!("${body}") })
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------------------------
|
||||
@@ -1241,6 +1242,21 @@ mod tests {
|
||||
is_text(ev("T", vec![n(1.0)]), "");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn dollar_keeps_negative_sign_when_nonnegative_precision_rounds_to_zero() {
|
||||
is_text(ev("DOLLAR", vec![n(-0.0001), n(0.0)]), "($0)");
|
||||
is_text(ev("DOLLAR", vec![n(-0.0001), n(2.0)]), "($0.00)");
|
||||
is_text(ev("DOLLAR", vec![n(0.0), n(0.0)]), "$0");
|
||||
is_text(ev("DOLLAR", vec![n(-0.0), n(0.0)]), "$0");
|
||||
is_text(ev("DOLLAR", vec![n(0.0001), n(0.0)]), "$0");
|
||||
is_text(ev("DOLLAR", vec![n(-0.0001), n(-1.0)]), "$0");
|
||||
is_text(ev("DOLLAR", vec![n(-4.0), n(-1.0)]), "$0");
|
||||
is_text(ev("DOLLAR", vec![n(-5.0), n(-1.0)]), "($10)");
|
||||
is_text(ev("DOLLAR", vec![n(-0.4), n(0.0)]), "($0)");
|
||||
is_text(ev("DOLLAR", vec![n(-0.5), n(0.0)]), "($1)");
|
||||
is_text(ev("FIXED", vec![n(-0.0001), n(0.0)]), "0");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn before_after() {
|
||||
is_text(ev("TEXTBEFORE", vec![t("Red riding hood"), t(" ")]), "Red");
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Function parity: worksheet functions and formulas
|
||||
|
||||
> **Last reviewed:** 2026-10-15 · **Last updated:** 2026-10-25 · **Change:** minor (the LAMBDA row lists the recursion limit and its `#NUM!`, and the error a defined name holding an error gives when called; earlier: number text with accounting parentheses coerces like Excel 365; INDEX with one index on a 2-D reference is #REF! as in Excel; earlier: SUBTOTAL and AGGREGATE cap the cells they visit, #2175) · **Target:** Microsoft Excel (Microsoft 365), Excel for Mac 16.113.4
|
||||
> **Last reviewed:** 2026-10-31 · **Last updated:** 2026-10-31 · **Change:** minor (DOLLAR keeps the negative layout when a negative input rounds to zero at nonnegative precision; negative precision that rounds to zero retains the positive layout, as measured in Windows Excel 16.0 build 20527, LCID 1033) · **Target:** Microsoft Excel (Microsoft 365), Excel for Mac 16.113.4
|
||||
|
||||
Excel's worksheet functions, category by category, against GridCraft's function library. Part of
|
||||
[target-app-parity.md](target-app-parity.md); gaps feed [gaps.md](gaps.md).
|
||||
@@ -123,6 +123,7 @@ workbooks; results checked in as data, not Excel files) and fixing what it finds
|
||||
|
||||
| Date | Change | Summary |
|
||||
|---|---|---|
|
||||
| 2026-10-31 | minor | DOLLAR uses the input sign for negative amounts that round to zero at nonnegative decimal places (`DOLLAR(-0.0001,0)` is `($0)`); when negative decimal places round to zero, Excel returns `$0`. Exact zero and negative zero stay unsigned; FIXED still returns `0` for `FIXED(-0.0001,0)` |
|
||||
| 2026-10-25 | minor | LAMBDA row: a LAMBDA that calls itself more than 140 times, and a formula nested past the depth limit, give `#NUM!` (#1809; nesting gave `#CALC!` before). `=Foo(1)` where the defined name Foo holds `#N/A` gives `#N/A`, not `#NAME?` |
|
||||
| 2026-10-23 | minor | Number text coercion (VALUE, arithmetic, typed entry): a dollar sign before accounting parentheses (`$(1,234)`, `$ (5)`) and a percent sign after them (`(5)%`) read as negatives; `(-5)`, `((5))`, `($-5)`, `$5%`, `$(5)%` and dates or times in parentheses are `#VALUE!`, as observed in Excel 365 |
|
||||
| 2026-10-23 | minor | INDEX with only a row index on a reference of several rows and columns (`INDEX(A1:C3,2)`, `INDEX(A1:C3,0)`) is `#REF!`, as observed in Excel, so it also fails as a range endpoint and inside other functions; an empty column argument (`INDEX(A1:C3,2,)`) still gives the row. Checked that a column array with one index stays a 1×1 array (`TYPE` 64), which is what Excel returns |
|
||||
|
||||
Reference in new issue
Block a user