From ac371be50de68e0544b9d667b74ba30ed32144c9 Mon Sep 17 00:00:00 2001 From: Maciej Malinowski <231036771+webglobecontact-ui@users.noreply.github.com> Date: Mon, 19 Oct 2026 21:15:00 +0200 Subject: [PATCH] calc: LET and LAMBDA names ignore case in any script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Excel matches LET and LAMBDA names case-insensitively in every script, so =LET(dług,100,DŁUG*2) is 200. The evaluator compared them ASCII-only and returned #NAME?. The three lookups (name evaluation, ISOMITTED, a LET variable shadowing a function name) now fold Unicode case. --- crates/calc/src/eval.rs | 11 ++++++++--- crates/calc/src/tests.rs | 13 +++++++++++++ docs/function-parity.md | 3 ++- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/crates/calc/src/eval.rs b/crates/calc/src/eval.rs index 0f9cfb03d..da15977fd 100644 --- a/crates/calc/src/eval.rs +++ b/crates/calc/src/eval.rs @@ -256,7 +256,7 @@ impl<'h> Evaluator<'h> { } fn name(&mut self, n: &str) -> Ev { - if let Some((_, v)) = self.env.iter().rev().find(|(k, _)| k.eq_ignore_ascii_case(n)) { + if let Some((_, v)) = self.env.iter().rev().find(|(k, _)| same_name(k, n)) { return v.clone(); } let wb = self.host.workbook(); @@ -772,7 +772,7 @@ impl<'h> Evaluator<'h> { Ev::L(Arc::new(Lambda { params, body: body.clone(), env: self.env.clone() })) } "ISOMITTED" => { - let r = matches!(args.first(), Some(Expr::Name(n)) if self.env.iter().rev().find(|(k, _)| k.eq_ignore_ascii_case(n)).is_some_and(|(_, v)| matches!(v, Ev::V(Value::Empty)))); + let r = matches!(args.first(), Some(Expr::Name(n)) if self.env.iter().rev().find(|(k, _)| same_name(k, n)).is_some_and(|(_, v)| matches!(v, Ev::V(Value::Empty)))); Ev::V(Value::Bool(r)) } "MAP" | "REDUCE" | "SCAN" | "BYROW" | "BYCOL" | "MAKEARRAY" => self.higher_order(name, args), @@ -975,7 +975,7 @@ impl<'h> Evaluator<'h> { /// that name. fn function_by_name(&self, e: &Expr) -> Option { let Expr::Name(n) = e else { return None }; - if self.env.iter().any(|(k, _)| k.eq_ignore_ascii_case(n)) || self.host.workbook().name(n, self.sheet).is_some() { + if self.env.iter().any(|(k, _)| same_name(k, n)) || self.host.workbook().name(n, self.sheet).is_some() { return None; } let u = n.to_ascii_uppercase(); @@ -1868,5 +1868,10 @@ pub fn is_known_function(n: &str) -> bool { is_special(&n.to_ascii_uppercase()) || gridcraft_functions::lookup(n).is_some() } +/// LET and LAMBDA names compare case-insensitively in any script, as in Excel (`dług` = `DŁUG`). +fn same_name(a: &str, b: &str) -> bool { + a.chars().flat_map(char::to_uppercase).eq(b.chars().flat_map(char::to_uppercase)) +} + #[allow(dead_code)] fn unused(_: RefKind) {} diff --git a/crates/calc/src/tests.rs b/crates/calc/src/tests.rs index 97f7a8350..2910e96a1 100644 --- a/crates/calc/src/tests.rs +++ b/crates/calc/src/tests.rs @@ -590,6 +590,19 @@ fn let_lambda() { assert_eq!(t.num("A4"), 14.0); } +#[test] +fn let_lambda_names_ignore_case_in_any_script() { + let mut t = T::new(); + t.set("A1", "=LET(dług,100,DŁUG*2)"); + assert_eq!(t.num("A1"), 200.0); + t.set("A3", "=LAMBDA(ćma,ĆMA+1)(1)"); + assert_eq!(t.num("A3"), 2.0); + t.set("A4", "=LET(ŻAR,LAMBDA(x,x*3),żar(2))"); + assert_eq!(t.num("A4"), 6.0); + t.set("A5", "=LET(λ,LAMBDA(x,x+1),SUM(MAP({1,2},Λ)))"); + assert_eq!(t.num("A5"), 5.0); +} + #[test] fn functions_given_by_name() { let mut t = T::new(); diff --git a/docs/function-parity.md b/docs/function-parity.md index 2343e0de9..10588e94d 100644 --- a/docs/function-parity.md +++ b/docs/function-parity.md @@ -1,6 +1,6 @@ # Function parity: worksheet functions and formulas -> **Last reviewed:** 2026-10-15 · **Last updated:** 2026-10-15 · **Change:** minor (MEDIAN and AGGREGATE median avoid intermediate overflow) · **Target:** Microsoft Excel (Microsoft 365), Excel for Mac 16.113.4 +> **Last reviewed:** 2026-10-15 · **Last updated:** 2026-10-19 · **Change:** minor (LET and LAMBDA names ignore case in any script) · **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). @@ -114,6 +114,7 @@ workbooks; results checked in as data, not Excel files) and fixing what it finds | Date | Change | Summary | |---|---|---| +| 2026-10-19 | minor | LET and LAMBDA names compare case-insensitively in any script, as in Excel: `=LET(dług,100,DŁUG*2)` is 200 (was #NAME?); also LET-bound lambdas called or passed by name (`żar(2)`, `MAP(…,Λ)`) | | 2026-10-15 | minor | MEDIAN and AGGREGATE median use an overflow-safe midpoint (#1579); regressions cover finite extremes, tiny values and dependent recalculation | | 2026-10-13 | minor | Clear reports changed stored cells sparsely, including those beyond the first million coordinates; dependent formulas and removed spills update, while clearing empty merges still unblocks spills (#1032) | | 2026-10-12 | minor | USDOLLAR added as a Compatibility function (not on Microsoft's list, so the counts don't change); MIRR with no positive flow is -1, COUNTIF's bare `"<="` / `">="` skip empty strings, INDIRECT with `a1` = FALSE gives `#REF!` for A1-style text (#738) |