WIP

Cargo.lock

@@ -43,15 +43,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "approx"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "arrayvec"
 version = "0.7.6"
@@ -423,7 +414,7 @@ dependencies = [
 
 [[package]]
 name = "ironcalc"
-version = "0.6.0"
+version = "0.5.0"
 dependencies = [
  "bitcode",
  "chrono",
@@ -439,7 +430,7 @@ dependencies = [
 
 [[package]]
 name = "ironcalc_base"
-version = "0.6.0"
+version = "0.5.0"
 dependencies = [
  "bitcode",
  "chrono",
@@ -452,12 +443,11 @@ dependencies = [
  "ryu",
  "serde",
  "serde_json",
- "statrs",
 ]
 
 [[package]]
 name = "ironcalc_nodejs"
-version = "0.6.0"
+version = "0.5.0"
 dependencies = [
  "ironcalc",
  "napi",
@@ -792,7 +782,7 @@ dependencies = [
 
 [[package]]
 name = "pyroncalc"
-version = "0.6.0"
+version = "0.5.7"
 dependencies = [
  "bitcode",
  "ironcalc",
@@ -975,16 +965,6 @@ version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
 
-[[package]]
-name = "statrs"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a3fe7c28c6512e766b0874335db33c94ad7b8f9054228ae1c2abd47ce7d335e"
-dependencies = [
- "approx",
- "num-traits",
-]
-
 [[package]]
 name = "subtle"
 version = "2.5.0"
@@ -1095,7 +1075,7 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm"
-version = "0.6.0"
+version = "0.5.0"
 dependencies = [
  "ironcalc_base",
  "serde",

Dockerfile

@@ -1,93 +0,0 @@
-FROM rust:latest AS builder
-
-WORKDIR /app
-COPY . .
-
-# Tools + wasm toolchain + Node via nvm
-RUN apt-get update && apt-get install -y --no-install-recommends \
-      bash curl ca-certificates make \
-    && rustup target add wasm32-unknown-unknown \
-    && cargo install wasm-pack \
-    && bash -lc "curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash -" \
-    && bash -lc '\
-         export NVM_DIR="$HOME/.nvm" && \
-         source "$NVM_DIR/nvm.sh" && \
-         nvm install 22 && nvm alias default 22 && \
-         nroot="$NVM_DIR/versions/node/$(nvm version default)/bin" && \
-         ln -sf "$nroot/node" /usr/local/bin/node && \
-         ln -sf "$nroot/npm"  /usr/local/bin/npm  && \
-         ln -sf "$nroot/npx"  /usr/local/bin/npx \
-       ' \
-    && npm install typescript \
-    && rm -rf /var/lib/apt/lists/*
-
-# build the server
-RUN cargo build --release --manifest-path webapp/app.ironcalc.com/server/Cargo.toml
-
-# build the wasm
-RUN make -C bindings/wasm
-
-# build the widget
-WORKDIR /app/webapp/IronCalc
-RUN npm install && npm run build
-
-# build the frontend app
-WORKDIR /app/webapp/app.ironcalc.com/frontend
-RUN npm install && npm run build
-
-# build the xlsx_2_icalc binary (we don't need the release version here)
-WORKDIR /app/xlsx
-RUN cargo build
-
-WORKDIR /app
-# copy the artifacts to a dist/ directory
-RUN mkdir dist
-RUN mkdir dist/frontend
-RUN cp -r webapp/app.ironcalc.com/frontend/dist/* dist/frontend/
-RUN mkdir dist/server
-RUN cp webapp/app.ironcalc.com/server/target/release/ironcalc_server dist/server/
-RUN cp webapp/app.ironcalc.com/server/Rocket.toml dist/server/
-RUN cp webapp/app.ironcalc.com/server/ironcalc.sqlite dist/server/
-
-# Create ic files in docs
-RUN mkdir -p dist/frontend/models
-
-# Loop over all xlsx files in xlsx/tests/docs & templates and convert them to .ic
-RUN bash -lc 'set -euo pipefail; \
-  mkdir -p dist/frontend/models; \
-  shopt -s nullglob; \
-  for xlsx_file in xlsx/tests/docs/*.xlsx; do \
-    base_name="${xlsx_file##*/}"; base_name="${base_name%.xlsx}"; \
-    ./target/debug/xlsx_2_icalc "$xlsx_file" "dist/frontend/models/${base_name}.ic"; \
-  done; \
-  for xlsx_file in xlsx/tests/templates/*.xlsx; do \
-    base_name="${xlsx_file##*/}"; base_name="${base_name%.xlsx}"; \
-    ./target/debug/xlsx_2_icalc "$xlsx_file" "dist/frontend/models/${base_name}.ic"; \
-  done'
-
-# ---------- server runtime ----------
-FROM debian:bookworm-slim AS server-runtime
-RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates && \
-    rm -rf /var/lib/apt/lists/*
-WORKDIR /app
-# Copy EVERYTHING you put in dist/server (binary + Rocket.toml + DB)
-COPY --from=builder /app/dist/server/ ./
-# Make sure Rocket binds to the container IP; explicitly point to the config file
-ENV ROCKET_ADDRESS=0.0.0.0 \
-    ROCKET_PORT=8000 \
-    ROCKET_CONFIG=/app/Rocket.toml
-EXPOSE 8000
-# Run from /app so relative paths in Rocket.toml/DB work
-CMD ["./ironcalc_server"]
-
-# ---------- caddy runtime (serves frontend + reverse-proxy /api) ----------
-FROM caddy:latest AS caddy-runtime
-
-WORKDIR /srv
-
-# Copy the frontend build output to /srv
-COPY --from=builder /app/dist/frontend/ /srv/
-
-# Copy the Caddyfile
-COPY --from=builder /app/webapp/app.ironcalc.com/Caddyfile.compose /etc/caddy/Caddyfile
-

Makefile

@@ -31,7 +31,12 @@ clean: remove-artifacts
 	rm -r -f base/target
 	rm -r -f xlsx/target
 	rm -r -f bindings/python/target
-	rm -r -f bindings/wasm/targets
+	rm -r -f bindings/wasm/target
+	rm -r -f bindings/wasm/pkg
+	rm -r -f webapp/IronCalc/node_modules
+	rm -r -f webapp/IronCalc/dist
+	rm -r -f webapp/app.ironcalc.com/frontend/node_modules
+	rm -r -f webapp/app.ironcalc.com/frontend/dist
 	rm -f cargo-test-*
 	rm -f base/cargo-test-*
 	rm -f xlsx/cargo-test-*

README.md

@@ -31,17 +31,7 @@ This repository contains the main engine and the xlsx reader and writer.
 
 Programmed in Rust, you will be able to use it from a variety of programming languages like Python, JavaScript (wasm), nodejs and possibly R, Julia or Go.
 
-We will build different _skins_: in the terminal, as a desktop application or use it in your own web application.
+We will build different _skins_: in the terminal, as a desktop application or use it in you own web application.
-
-# Docker
-
-If you have docker installed just run:
-
-```bash
-docker compose up --build
-```
-
-head over to <http://localhost:2080> to test the application.
 
 # Building
 
@@ -94,7 +84,7 @@ And then use this code in `main.rs`:
 
 ```rust
 use ironcalc::{
-    base::{expressions::utils::number_to_column, Model},
+    base::{expressions::utils::number_to_column, model::Model},
     export::save_to_xlsx,
 };
 

base/CALC.md

@@ -0,0 +1,61 @@
+# Evaluation Strategy
+
+
+We have a list of the spill cells:
+
+```
+// Checks if the array starting at cell will cover cells whose values
+// has been requested
+def CheckSpill(cell, array):
+    for c in cell+array:
+        support CellHasBeenRequested(c):
+        if support is not empty:
+            return support
+    return []
+
+// Fills cells with the result (an array)
+def FillCells(cell, result):
+
+
+def EvaluateNodeInContext(node, context):
+    match node:
+        case OP(left, right, op):
+            l = EvaluateNodeInContext(left, context)?
+            r = EvaluateNodeInContext(left, context)?
+            return op(l, r)
+        case FUNCTION(args, fn):
+            ...
+        case CELL(cell):
+            EvaluateCell(cell)
+        case RANGE(start, end):
+            ...
+
+
+
+def EvaluateCell(cell):
+    if IsCellEvaluating(cell):
+        return CIRC
+    MarkEvaluating(cell)
+    result = EvaluateNodeInContext(cell.formula, cell)
+    if isSpill(result):
+        CheckSpill(cell, array)?
+        FillCells(result)
+
+
+def EvaluateWorkbook():
+    spill_cells = [cell_1, ...., cell_n];
+
+
+    for cell in spill_cells:
+        result = evaluate(cell)
+```   
+
+
+
+
+
+
+
+# When updating a cell value
+
+If it was a spill cell we nee

base/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ironcalc_base"
-version = "0.6.0"
+version = "0.5.0"
 authors = ["Nicolás Hatcher <nicolas@theuniverse.today>"]
 edition = "2021"
 homepage = "https://www.ironcalc.com"
@@ -19,7 +19,6 @@ regex = { version = "1.0", optional = true}
 regex-lite = { version = "0.1.6", optional = true}
 bitcode = "0.6.3"
 csv = "1.3.0"
-statrs = { version = "0.18.0", default-features = false, features = [] }
 
 [features]
 default = ["use_regex_full"]

base/examples/formulas_and_errors.rs

@@ -1,7 +1,7 @@
 use ironcalc_base::{types::CellType, Model};
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let mut model = Model::new_empty("formulas-and-errors", "en", "UTC", "en")?;
+    let mut model = Model::new_empty("formulas-and-errors", "en", "UTC")?;
     // A1
     model.set_user_input(0, 1, 1, "1".to_string())?;
     // A2

base/examples/hello_world.rs

@@ -1,7 +1,7 @@
 use ironcalc_base::{cell::CellValue, Model};
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let mut model = Model::new_empty("hello-world", "en", "UTC", "en")?;
+    let mut model = Model::new_empty("hello-world", "en", "UTC")?;
     // A1
     model.set_user_input(0, 1, 1, "Hello".to_string())?;
     // B1

base/src/actions.rs

@@ -1,7 +1,5 @@
 use crate::constants::{LAST_COLUMN, LAST_ROW};
-use crate::expressions::parser::stringify::{
+use crate::expressions::parser::stringify::{to_string, to_string_displaced, DisplaceData};
-    to_localized_string, to_string_displaced, DisplaceData,
-};
 use crate::expressions::types::CellReferenceRC;
 use crate::model::Model;
 
@@ -10,7 +8,7 @@ use crate::model::Model;
 // In IronCalc, if one of the edges of the range is deleted will replace the edge with #REF!
 // I feel this is unimportant for now.
 
-impl<'a> Model<'a> {
+impl Model {
     fn shift_cell_formula(
         &mut self,
         sheet: u32,
@@ -24,14 +22,14 @@ impl<'a> Model<'a> {
             .cell(row, column)
             .and_then(|c| c.get_formula())
         {
-            let node = &self.parsed_formulas[sheet as usize][f as usize].clone();
+            let node = &self.parsed_formulas[sheet as usize][f as usize].0.clone();
             let cell_reference = CellReferenceRC {
                 sheet: self.workbook.worksheets[sheet as usize].get_name(),
                 row,
                 column,
             };
             // FIXME: This is not a very performant way if the formula has changed :S.
-            let formula = to_localized_string(node, &cell_reference, self.locale, self.language);
+            let formula = to_string(node, &cell_reference);
             let formula_displaced = to_string_displaced(node, &cell_reference, displace_data);
             if formula != formula_displaced {
                 self.update_cell_with_formula(sheet, row, column, format!("={formula_displaced}"))?;
@@ -110,9 +108,7 @@ impl<'a> Model<'a> {
         // FIXME: we need some user_input getter instead of get_text
         let formula_or_value = self
             .get_cell_formula(sheet, source_row, source_column)?
-            .unwrap_or_else(|| {
+            .unwrap_or_else(|| source_cell.get_text(&self.workbook.shared_strings, &self.language));
-                source_cell.get_localized_text(&self.workbook.shared_strings, self.language)
-            });
         self.set_user_input(sheet, target_row, target_column, formula_or_value)?;
         self.workbook
             .worksheet_mut(sheet)?
@@ -494,11 +490,9 @@ impl<'a> Model<'a> {
                 .cell(r.row, column)
                 .ok_or("Expected Cell to exist")?;
             let style_idx = cell.get_style();
-            let formula_or_value =
+            let formula_or_value = self
-                self.get_cell_formula(sheet, r.row, column)?
+                .get_cell_formula(sheet, r.row, column)?
-                    .unwrap_or_else(|| {
+                .unwrap_or_else(|| cell.get_text(&self.workbook.shared_strings, &self.language));
-                        cell.get_localized_text(&self.workbook.shared_strings, self.language)
-                    });
             original_cells.push((r.row, formula_or_value, style_idx));
             self.cell_clear_all(sheet, r.row, column)?;
         }
@@ -583,9 +577,9 @@ impl<'a> Model<'a> {
                 .cell(row, *c)
                 .ok_or("Expected Cell to exist")?;
             let style_idx = cell.get_style();
-            let formula_or_value = self.get_cell_formula(sheet, row, *c)?.unwrap_or_else(|| {
+            let formula_or_value = self
-                cell.get_localized_text(&self.workbook.shared_strings, self.language)
+                .get_cell_formula(sheet, row, *c)?
-            });
+                .unwrap_or_else(|| cell.get_text(&self.workbook.shared_strings, &self.language));
             original_cells.push((*c, formula_or_value, style_idx));
             self.cell_clear_all(sheet, row, *c)?;
         }

base/src/arithmetic.rs

@@ -22,7 +22,7 @@ fn to_f64(value: &ArrayNode) -> Result<f64, Error> {
     }
 }
 
-impl<'a> Model<'a> {
+impl Model {
     /// Applies `op` element‐wise for arrays/numbers.
     pub(crate) fn handle_arithmetic(
         &mut self,
@@ -77,8 +77,6 @@ impl<'a> Model<'a> {
                         match to_f64(&node) {
                             Ok(f2) => match op(f1, f2) {
                                 Ok(x) => data_row.push(ArrayNode::Number(x)),
-                                Err(Error::DIV) => data_row.push(ArrayNode::Error(Error::DIV)),
-                                Err(Error::VALUE) => data_row.push(ArrayNode::Error(Error::VALUE)),
                                 Err(e) => data_row.push(ArrayNode::Error(e)),
                             },
                             Err(err) => data_row.push(ArrayNode::Error(err)),
@@ -100,8 +98,6 @@ impl<'a> Model<'a> {
                         match to_f64(&node) {
                             Ok(f1) => match op(f1, f2) {
                                 Ok(x) => data_row.push(ArrayNode::Number(x)),
-                                Err(Error::DIV) => data_row.push(ArrayNode::Error(Error::DIV)),
-                                Err(Error::VALUE) => data_row.push(ArrayNode::Error(Error::VALUE)),
                                 Err(e) => data_row.push(ArrayNode::Error(e)),
                             },
                             Err(err) => data_row.push(ArrayNode::Error(err)),
@@ -137,10 +133,6 @@ impl<'a> Model<'a> {
                             (Some(v1), Some(v2)) => match (to_f64(v1), to_f64(v2)) {
                                 (Ok(f1), Ok(f2)) => match op(f1, f2) {
                                     Ok(x) => data_row.push(ArrayNode::Number(x)),
-                                    Err(Error::DIV) => data_row.push(ArrayNode::Error(Error::DIV)),
-                                    Err(Error::VALUE) => {
-                                        data_row.push(ArrayNode::Error(Error::VALUE))
-                                    }
                                     Err(e) => data_row.push(ArrayNode::Error(e)),
                                 },
                                 (Err(e), _) | (_, Err(e)) => data_row.push(ArrayNode::Error(e)),

base/src/cast.rs

@@ -5,7 +5,6 @@ use crate::{
         token::Error,
         types::CellReferenceIndex,
     },
-    formatter::format::parse_formatted_number,
     model::Model,
 };
 
@@ -14,32 +13,7 @@ pub(crate) enum NumberOrArray {
     Array(Vec<Vec<ArrayNode>>),
 }
 
-impl<'a> Model<'a> {
+impl Model {
-    pub(crate) fn cast_number(&self, s: &str) -> Option<f64> {
-        match s.trim().parse::<f64>() {
-            Ok(f) => Some(f),
-            _ => {
-                let currency = &self.locale.currency.symbol;
-                let mut currencies = vec!["$", "€"];
-                if !currencies.iter().any(|e| *e == currency) {
-                    currencies.push(currency);
-                }
-                let (decimal_separator, group_separator) =
-                    if self.locale.numbers.symbols.decimal == "," {
-                        (b',', b'.')
-                    } else {
-                        (b'.', b',')
-                    };
-                // Try to parse as a formatted number (e.g., dates, currencies, percentages)
-                if let Ok((v, _number_format)) =
-                    parse_formatted_number(s, &currencies, decimal_separator, group_separator)
-                {
-                    return Some(v);
-                }
-                None
-            }
-        }
-    }
     pub(crate) fn get_number_or_array(
         &mut self,
         node: &Node,
@@ -47,9 +21,9 @@ impl<'a> Model<'a> {
     ) -> Result<NumberOrArray, CalcResult> {
         match self.evaluate_node_in_context(node, cell) {
             CalcResult::Number(f) => Ok(NumberOrArray::Number(f)),
-            CalcResult::String(s) => match self.cast_number(&s) {
+            CalcResult::String(s) => match s.parse::<f64>() {
-                Some(f) => Ok(NumberOrArray::Number(f)),
+                Ok(f) => Ok(NumberOrArray::Number(f)),
-                None => Err(CalcResult::new_error(
+                _ => Err(CalcResult::new_error(
                     Error::VALUE,
                     cell,
                     "Expecting number".to_string(),
@@ -115,16 +89,16 @@ impl<'a> Model<'a> {
         self.cast_to_number(result, cell)
     }
 
-    pub(crate) fn cast_to_number(
+    fn cast_to_number(
         &mut self,
         result: CalcResult,
         cell: CellReferenceIndex,
     ) -> Result<f64, CalcResult> {
         match result {
             CalcResult::Number(f) => Ok(f),
-            CalcResult::String(s) => match self.cast_number(&s) {
+            CalcResult::String(s) => match s.parse::<f64>() {
-                Some(f) => Ok(f),
+                Ok(f) => Ok(f),
-                None => Err(CalcResult::new_error(
+                _ => Err(CalcResult::new_error(
                     Error::VALUE,
                     cell,
                     "Expecting number".to_string(),

base/src/cell.rs

@@ -64,12 +64,50 @@ impl Cell {
     /// Returns the formula of a cell if any.
     pub fn get_formula(&self) -> Option<i32> {
         match self {
-            Cell::CellFormula { f, .. } => Some(*f),
+            Cell::CellFormula { f, .. }
-            Cell::CellFormulaBoolean { f, .. } => Some(*f),
+            | Cell::CellFormulaBoolean { f, .. }
-            Cell::CellFormulaNumber { f, .. } => Some(*f),
+            | Cell::CellFormulaNumber { f, .. }
-            Cell::CellFormulaString { f, .. } => Some(*f),
+            | Cell::CellFormulaString { f, .. }
-            Cell::CellFormulaError { f, .. } => Some(*f),
+            | Cell::CellFormulaError { f, .. }
-            _ => None,
+            | Cell::DynamicCellFormula { f, .. }
+            | Cell::DynamicCellFormulaBoolean { f, .. }
+            | Cell::DynamicCellFormulaNumber { f, .. }
+            | Cell::DynamicCellFormulaString { f, .. }
+            | Cell::DynamicCellFormulaError { f, .. } => Some(*f),
+            Cell::EmptyCell { .. }
+            | Cell::BooleanCell { .. }
+            | Cell::NumberCell { .. }
+            | Cell::ErrorCell { .. }
+            | Cell::SharedString { .. }
+            | Cell::SpillNumberCell { .. }
+            | Cell::SpillBooleanCell { .. }
+            | Cell::SpillErrorCell { .. }
+            | Cell::SpillStringCell { .. } => None,
+        }
+    }
+
+    /// Returns the dynamic range of a cell if any.
+    pub fn get_dynamic_range(&self) -> Option<(i32, i32)> {
+        match self {
+            Cell::DynamicCellFormula { r, .. } => Some(*r),
+            Cell::DynamicCellFormulaBoolean { r, .. } => Some(*r),
+            Cell::DynamicCellFormulaNumber { r, .. } => Some(*r),
+            Cell::DynamicCellFormulaString { r, .. } => Some(*r),
+            Cell::DynamicCellFormulaError { r, .. } => Some(*r),
+            Cell::EmptyCell { .. }
+            | Cell::BooleanCell { .. }
+            | Cell::NumberCell { .. }
+            | Cell::ErrorCell { .. }
+            | Cell::SharedString { .. }
+            | Cell::CellFormula { .. }
+            | Cell::CellFormulaBoolean { .. }
+            | Cell::CellFormulaNumber { .. }
+            | Cell::CellFormulaString { .. }
+            | Cell::CellFormulaError { .. }
+            | Cell::SpillNumberCell { .. }
+            | Cell::SpillBooleanCell { .. }
+            | Cell::SpillErrorCell { .. }
+            | Cell::SpillStringCell { .. } => None,
         }
     }
 
@@ -89,6 +127,15 @@ impl Cell {
             Cell::CellFormulaNumber { s, .. } => *s = style,
             Cell::CellFormulaString { s, .. } => *s = style,
             Cell::CellFormulaError { s, .. } => *s = style,
+            Cell::SpillBooleanCell { s, .. } => *s = style,
+            Cell::SpillNumberCell { s, .. } => *s = style,
+            Cell::SpillStringCell { s, .. } => *s = style,
+            Cell::SpillErrorCell { s, .. } => *s = style,
+            Cell::DynamicCellFormula { s, .. } => *s = style,
+            Cell::DynamicCellFormulaBoolean { s, .. } => *s = style,
+            Cell::DynamicCellFormulaNumber { s, .. } => *s = style,
+            Cell::DynamicCellFormulaString { s, .. } => *s = style,
+            Cell::DynamicCellFormulaError { s, .. } => *s = style,
         };
     }
 
@@ -104,6 +151,15 @@ impl Cell {
             Cell::CellFormulaNumber { s, .. } => *s,
             Cell::CellFormulaString { s, .. } => *s,
             Cell::CellFormulaError { s, .. } => *s,
+            Cell::SpillBooleanCell { s, .. } => *s,
+            Cell::SpillNumberCell { s, .. } => *s,
+            Cell::SpillStringCell { s, .. } => *s,
+            Cell::SpillErrorCell { s, .. } => *s,
+            Cell::DynamicCellFormula { s, .. } => *s,
+            Cell::DynamicCellFormulaBoolean { s, .. } => *s,
+            Cell::DynamicCellFormulaNumber { s, .. } => *s,
+            Cell::DynamicCellFormulaString { s, .. } => *s,
+            Cell::DynamicCellFormulaError { s, .. } => *s,
         }
     }
 
@@ -119,20 +175,23 @@ impl Cell {
             Cell::CellFormulaNumber { .. } => CellType::Number,
             Cell::CellFormulaString { .. } => CellType::Text,
             Cell::CellFormulaError { .. } => CellType::ErrorValue,
+            Cell::SpillBooleanCell { .. } => CellType::LogicalValue,
+            Cell::SpillNumberCell { .. } => CellType::Number,
+            Cell::SpillStringCell { .. } => CellType::Text,
+            Cell::SpillErrorCell { .. } => CellType::ErrorValue,
+            Cell::DynamicCellFormula { .. } => CellType::Number,
+            Cell::DynamicCellFormulaBoolean { .. } => CellType::LogicalValue,
+            Cell::DynamicCellFormulaNumber { .. } => CellType::Number,
+            Cell::DynamicCellFormulaString { .. } => CellType::Text,
+            Cell::DynamicCellFormulaError { .. } => CellType::ErrorValue,
         }
     }
 
-    pub fn get_localized_text(&self, shared_strings: &[String], language: &Language) -> String {
+    pub fn get_text(&self, shared_strings: &[String], language: &Language) -> String {
         match self.value(shared_strings, language) {
             CellValue::None => "".to_string(),
             CellValue::String(v) => v,
-            CellValue::Boolean(v) => {
+            CellValue::Boolean(v) => v.to_string().to_uppercase(),
-                if v {
-                    language.booleans.r#true.to_string()
-                } else {
-                    language.booleans.r#false.to_string()
-                }
-            }
             CellValue::Number(v) => to_excel_precision_str(v),
         }
     }
@@ -142,7 +201,7 @@ impl Cell {
             Cell::EmptyCell { .. } => CellValue::None,
             Cell::BooleanCell { v, s: _ } => CellValue::Boolean(*v),
             Cell::NumberCell { v, s: _ } => CellValue::Number(*v),
-            Cell::ErrorCell { ei, .. } => {
+            Cell::ErrorCell { ei, .. } | Cell::SpillErrorCell { ei, .. } => {
                 let v = ei.to_localized_error_string(language);
                 CellValue::String(v)
             }
@@ -154,14 +213,25 @@ impl Cell {
                 };
                 CellValue::String(v)
             }
-            Cell::CellFormula { .. } => CellValue::String("#ERROR!".to_string()),
+            Cell::DynamicCellFormula { .. } | Cell::CellFormula { .. } => {
-            Cell::CellFormulaBoolean { v, .. } => CellValue::Boolean(*v),
+                CellValue::String("#ERROR!".to_string())
-            Cell::CellFormulaNumber { v, .. } => CellValue::Number(*v),
+            }
-            Cell::CellFormulaString { v, .. } => CellValue::String(v.clone()),
+            Cell::DynamicCellFormulaBoolean { v, .. } | Cell::CellFormulaBoolean { v, .. } => {
-            Cell::CellFormulaError { ei, .. } => {
+                CellValue::Boolean(*v)
+            }
+            Cell::DynamicCellFormulaNumber { v, .. } | Cell::CellFormulaNumber { v, .. } => {
+                CellValue::Number(*v)
+            }
+            Cell::DynamicCellFormulaString { v, .. } | Cell::CellFormulaString { v, .. } => {
+                CellValue::String(v.clone())
+            }
+            Cell::DynamicCellFormulaError { ei, .. } | Cell::CellFormulaError { ei, .. } => {
                 let v = ei.to_localized_error_string(language);
                 CellValue::String(v)
             }
+            Cell::SpillBooleanCell { v, .. } => CellValue::Boolean(*v),
+            Cell::SpillNumberCell { v, .. } => CellValue::Number(*v),
+            Cell::SpillStringCell { v, .. } => CellValue::String(v.clone()),
         }
     }
 
@@ -177,13 +247,7 @@ impl Cell {
         match self.value(shared_strings, language) {
             CellValue::None => "".to_string(),
             CellValue::String(value) => value,
-            CellValue::Boolean(value) => {
+            CellValue::Boolean(value) => value.to_string().to_uppercase(),
-                if value {
-                    language.booleans.r#true.to_string()
-                } else {
-                    language.booleans.r#false.to_string()
-                }
-            }
             CellValue::Number(value) => format_number(value),
         }
     }

base/src/constants.rs

@@ -12,9 +12,6 @@ pub(crate) const DEFAULT_WINDOW_WIDTH: i64 = 800;
 pub(crate) const LAST_COLUMN: i32 = 16_384;
 pub(crate) const LAST_ROW: i32 = 1_048_576;
 
-// Excel uses 15 significant digits of precision for all numeric calculations.
-pub(crate) const EXCEL_PRECISION: usize = 15;
-
 // 693_594 is computed as:
 // NaiveDate::from_ymd(1900, 1, 1).num_days_from_ce() - 2
 // The 2 days offset is because of Excel 1900 bug

base/src/expressions/lexer/mod.rs

@@ -79,24 +79,19 @@ pub enum LexerMode {
 
 /// Tokenize an input
 #[derive(Clone)]
-pub struct Lexer<'a> {
+pub struct Lexer {
     position: usize,
     next_token_position: Option<usize>,
     len: usize,
     chars: Vec<char>,
     mode: LexerMode,
-    locale: &'a Locale,
+    locale: Locale,
-    language: &'a Language,
+    language: Language,
 }
 
-impl<'a> Lexer<'a> {
+impl Lexer {
     /// Creates a new `Lexer` that returns the tokens of a formula.
-    pub fn new(
+    pub fn new(formula: &str, mode: LexerMode, locale: &Locale, language: &Language) -> Lexer {
-        formula: &str,
-        mode: LexerMode,
-        locale: &'a Locale,
-        language: &'a Language,
-    ) -> Lexer<'a> {
         let chars: Vec<char> = formula.chars().collect();
         let len = chars.len();
         Lexer {
@@ -105,8 +100,8 @@ impl<'a> Lexer<'a> {
             next_token_position: None,
             len,
             mode,
-            locale,
+            locale: locale.clone(),
-            language,
+            language: language.clone(),
         }
     }
 
@@ -115,16 +110,6 @@ impl<'a> Lexer<'a> {
         self.mode = mode;
     }
 
-    /// Sets the locale
-    pub fn set_locale(&mut self, locale: &'a Locale) {
-        self.locale = locale;
-    }
-
-    /// Sets the language
-    pub fn set_language(&mut self, language: &'a Language) {
-        self.language = language;
-    }
-
     // FIXME: I don't think we should have `is_a1_mode` and   `get_formula`.
     // The caller already knows those two
 
@@ -203,7 +188,6 @@ impl<'a> Lexer<'a> {
                     ':' => TokenType::Colon,
                     ';' => TokenType::Semicolon,
                     '@' => TokenType::At,
-                    '\\' => TokenType::Backslash,
                     ',' => {
                         if self.locale.numbers.symbols.decimal == "," {
                             match self.consume_number(',') {

base/src/expressions/lexer/ranges.rs

@@ -4,7 +4,7 @@ use crate::expressions::{token::TokenType, utils::column_to_number};
 use super::Lexer;
 use super::{ParsedRange, ParsedReference, Result};
 
-impl<'a> Lexer<'a> {
+impl Lexer {
     /// Consumes a reference in A1 style like:
     /// AS23, $AS23, AS$23, $AS$23, R12
     /// Or returns an error

base/src/expressions/lexer/structured_references.rs

@@ -16,7 +16,7 @@ use crate::expressions::token::{TableReference, TableSpecifier};
 use super::Result;
 use super::{Lexer, LexerError};
 
-impl<'a> Lexer<'a> {
+impl Lexer {
     fn consume_table_specifier(&mut self) -> Result<Option<TableSpecifier>> {
         if self.peek_char() == Some('#') {
             // It's a specifier

base/src/expressions/lexer/test/test_common.rs

@@ -11,7 +11,7 @@ use crate::expressions::{
     types::ParsedReference,
 };
 
-fn new_lexer(formula: &str, a1_mode: bool) -> Lexer<'_> {
+fn new_lexer(formula: &str, a1_mode: bool) -> Lexer {
     let locale = get_locale("en").unwrap();
     let language = get_language("en").unwrap();
     let mode = if a1_mode {
@@ -655,9 +655,7 @@ fn test_comma() {
 
     // Used for testing locales where the comma is the decimal separator
     let mut lx = new_lexer("12,34", false);
-    let locale = get_locale("de").unwrap();
+    lx.locale.numbers.symbols.decimal = ",".to_string();
-    lx.locale = locale;
-
     assert_eq!(lx.next_token(), Number(12.34));
     assert_eq!(lx.next_token(), EOF);
 }

base/src/expressions/lexer/test/test_implicit_intersection.rs

@@ -7,7 +7,7 @@ use crate::expressions::{
 use crate::language::get_language;
 use crate::locale::get_locale;
 
-fn new_lexer(formula: &str) -> Lexer<'_> {
+fn new_lexer(formula: &str) -> Lexer {
     let locale = get_locale("en").unwrap();
     let language = get_language("en").unwrap();
     Lexer::new(formula, LexerMode::A1, locale, language)

base/src/expressions/lexer/test/test_language.rs

@@ -6,11 +6,11 @@ use crate::{
         token::{Error, TokenType},
     },
     language::get_language,
-    locale::get_default_locale,
+    locale::get_locale,
 };
 
-fn new_language_lexer<'a>(formula: &str, language: &str) -> Lexer<'a> {
+fn new_language_lexer(formula: &str, language: &str) -> Lexer {
-    let locale = get_default_locale();
+    let locale = get_locale("en").unwrap();
     let language = get_language(language).unwrap();
     Lexer::new(formula, LexerMode::A1, locale, language)
 }

base/src/expressions/lexer/test/test_locale.rs

@@ -9,7 +9,7 @@ use crate::{
     locale::get_locale,
 };
 
-fn new_language_lexer<'a>(formula: &str, locale: &str, language: &str) -> Lexer<'a> {
+fn new_language_lexer(formula: &str, locale: &str, language: &str) -> Lexer {
     let locale = get_locale(locale).unwrap();
     let language = get_language(language).unwrap();
     Lexer::new(formula, LexerMode::A1, locale, language)

base/src/expressions/lexer/test/test_ranges.rs

@@ -10,7 +10,7 @@ use crate::expressions::{
 use crate::language::get_language;
 use crate::locale::get_locale;
 
-fn new_lexer(formula: &str) -> Lexer<'_> {
+fn new_lexer(formula: &str) -> Lexer {
     let locale = get_locale("en").unwrap();
     let language = get_language("en").unwrap();
     Lexer::new(formula, LexerMode::A1, locale, language)

base/src/expressions/lexer/test/test_tables.rs

@@ -7,7 +7,7 @@ use crate::expressions::{
 use crate::language::get_language;
 use crate::locale::get_locale;
 
-fn new_lexer(formula: &str) -> Lexer<'_> {
+fn new_lexer(formula: &str) -> Lexer {
     let locale = get_locale("en").unwrap();
     let language = get_language("en").unwrap();
     Lexer::new(formula, LexerMode::A1, locale, language)

base/src/expressions/parser/mod.rs

@@ -31,12 +31,8 @@ f_args  => e (',' e)*
 use std::collections::HashMap;
 
 use crate::functions::Function;
-use crate::language::get_default_language;
 use crate::language::get_language;
-use crate::language::Language;
-use crate::locale::get_default_locale;
 use crate::locale::get_locale;
-use crate::locale::Locale;
 use crate::types::Table;
 
 use super::lexer;
@@ -206,35 +202,28 @@ pub enum Node {
 }
 
 #[derive(Clone)]
-pub struct Parser<'a> {
+pub struct Parser {
-    lexer: lexer::Lexer<'a>,
+    lexer: lexer::Lexer,
     worksheets: Vec<String>,
     defined_names: Vec<DefinedNameS>,
     context: CellReferenceRC,
     tables: HashMap<String, Table>,
-    locale: &'a Locale,
-    language: &'a Language,
 }
 
-pub fn new_parser_english<'a>(
+impl Parser {
-    worksheets: Vec<String>,
-    defined_names: Vec<DefinedNameS>,
-    tables: HashMap<String, Table>,
-) -> Parser<'a> {
-    let locale = get_default_locale();
-    let language = get_default_language();
-    Parser::new(worksheets, defined_names, tables, locale, language)
-}
-
-impl<'a> Parser<'a> {
     pub fn new(
         worksheets: Vec<String>,
         defined_names: Vec<DefinedNameS>,
         tables: HashMap<String, Table>,
-        locale: &'a Locale,
+    ) -> Parser {
-        language: &'a Language,
+        let lexer = lexer::Lexer::new(
-    ) -> Parser<'a> {
+            "",
-        let lexer = lexer::Lexer::new("", lexer::LexerMode::A1, locale, language);
+            lexer::LexerMode::A1,
+            #[allow(clippy::expect_used)]
+            get_locale("en").expect(""),
+            #[allow(clippy::expect_used)]
+            get_language("en").expect(""),
+        );
         let context = CellReferenceRC {
             sheet: worksheets.first().map_or("", |v| v).to_string(),
             column: 1,
@@ -246,24 +235,12 @@ impl<'a> Parser<'a> {
             defined_names,
             context,
             tables,
-            locale,
-            language,
         }
     }
     pub fn set_lexer_mode(&mut self, mode: lexer::LexerMode) {
         self.lexer.set_lexer_mode(mode)
     }
 
-    pub fn set_locale(&mut self, locale: &'a Locale) {
-        self.locale = locale;
-        self.lexer.set_locale(locale);
-    }
-
-    pub fn set_language(&mut self, language: &'a Language) {
-        self.language = language;
-        self.lexer.set_language(language);
-    }
-
     pub fn set_worksheets_and_names(
         &mut self,
         worksheets: Vec<String>,
@@ -279,27 +256,6 @@ impl<'a> Parser<'a> {
         self.parse_expr()
     }
 
-    // Returns the token used to separate arguments in functions and arrays
-    // If the locale decimal separator is '.', then it is a comma ','
-    // Otherwise, it is a semicolon ';'
-    fn get_argument_separator_token(&self) -> TokenType {
-        if self.locale.numbers.symbols.decimal == "." {
-            TokenType::Comma
-        } else {
-            TokenType::Semicolon
-        }
-    }
-
-    // Returns the token used to separate columns in arrays
-    // If the locale decimal separator is '.', then it is a semicolon ';'
-    fn get_column_separator_token(&self) -> TokenType {
-        if self.locale.numbers.symbols.decimal == "." {
-            TokenType::Semicolon
-        } else {
-            TokenType::Backslash
-        }
-    }
-
     fn get_sheet_index_by_name(&self, name: &str) -> Option<u32> {
         let worksheets = &self.worksheets;
         for (i, sheet) in worksheets.iter().enumerate() {
@@ -508,7 +464,6 @@ impl<'a> Parser<'a> {
 
     fn parse_array_row(&mut self) -> Result<Vec<ArrayNode>, Node> {
         let mut row = Vec::new();
-        let column_separator_token = self.get_argument_separator_token();
         // and array can only have numbers, string or booleans
         // otherwise it is a syntax error
         let first_element = match self.parse_expr() {
@@ -516,20 +471,6 @@ impl<'a> Parser<'a> {
             Node::NumberKind(s) => ArrayNode::Number(s),
             Node::StringKind(s) => ArrayNode::String(s),
             Node::ErrorKind(kind) => ArrayNode::Error(kind),
-            Node::UnaryKind {
-                kind: OpUnary::Minus,
-                right,
-            } => {
-                if let Node::NumberKind(n) = *right {
-                    ArrayNode::Number(-n)
-                } else {
-                    return Err(Node::ParseErrorKind {
-                        formula: self.lexer.get_formula(),
-                        message: "Invalid value in array".to_string(),
-                        position: self.lexer.get_position() as usize,
-                    });
-                }
-            }
             error @ Node::ParseErrorKind { .. } => return Err(error),
             _ => {
                 return Err(Node::ParseErrorKind {
@@ -541,27 +482,14 @@ impl<'a> Parser<'a> {
         };
         row.push(first_element);
         let mut next_token = self.lexer.peek_token();
-        while next_token == column_separator_token {
+        // FIXME: this is not respecting the locale
+        while next_token == TokenType::Comma {
             self.lexer.advance_token();
             let value = match self.parse_expr() {
                 Node::BooleanKind(s) => ArrayNode::Boolean(s),
                 Node::NumberKind(s) => ArrayNode::Number(s),
                 Node::StringKind(s) => ArrayNode::String(s),
                 Node::ErrorKind(kind) => ArrayNode::Error(kind),
-                Node::UnaryKind {
-                    kind: OpUnary::Minus,
-                    right,
-                } => {
-                    if let Node::NumberKind(n) = *right {
-                        ArrayNode::Number(-n)
-                    } else {
-                        return Err(Node::ParseErrorKind {
-                            formula: self.lexer.get_formula(),
-                            message: "Invalid value in array".to_string(),
-                            position: self.lexer.get_position() as usize,
-                        });
-                    }
-                }
                 error @ Node::ParseErrorKind { .. } => return Err(error),
                 _ => {
                     return Err(Node::ParseErrorKind {
@@ -599,7 +527,6 @@ impl<'a> Parser<'a> {
             TokenType::String(s) => Node::StringKind(s),
             TokenType::LeftBrace => {
                 // It's an array. It's a collection of rows all of the same dimension
-                let column_separator_token = self.get_column_separator_token();
 
                 let first_row = match self.parse_array_row() {
                     Ok(s) => s,
@@ -609,8 +536,9 @@ impl<'a> Parser<'a> {
 
                 let mut matrix = Vec::new();
                 matrix.push(first_row);
+                // FIXME: this is not respecting the locale
                 let mut next_token = self.lexer.peek_token();
-                while next_token == column_separator_token {
+                while next_token == TokenType::Semicolon {
                     self.lexer.advance_token();
                     let row = match self.parse_array_row() {
                         Ok(s) => s,
@@ -759,7 +687,12 @@ impl<'a> Parser<'a> {
                             message: err.message,
                         };
                     }
-                    // We should do this *only* importing functions from xlsx
+                    if let Some(function_kind) = Function::get_function(&name) {
+                        return Node::FunctionKind {
+                            kind: function_kind,
+                            args,
+                        };
+                    }
                     if &name == "_xlfn.SINGLE" {
                         if args.len() != 1 {
                             return Node::ParseErrorKind {
@@ -774,17 +707,6 @@ impl<'a> Parser<'a> {
                             child: Box::new(args[0].clone()),
                         };
                     }
-                    // We should do this *only* importing functions from xlsx
-                    if let Some(function_kind) = self
-                        .language
-                        .functions
-                        .lookup(name.trim_start_matches("_xlfn."))
-                    {
-                        return Node::FunctionKind {
-                            kind: function_kind,
-                            args,
-                        };
-                    }
                     return Node::InvalidFunctionKind { name, args };
                 }
                 let context = &self.context;
@@ -795,7 +717,7 @@ impl<'a> Parser<'a> {
                         return Node::ParseErrorKind {
                             formula: self.lexer.get_formula(),
                             position: 0,
-                            message: format!("sheet not found: {}", context.sheet),
+                            message: "sheet not found".to_string(),
                         };
                     }
                 };
@@ -899,7 +821,6 @@ impl<'a> Parser<'a> {
             | TokenType::RightBracket
             | TokenType::Colon
             | TokenType::Semicolon
-            | TokenType::Backslash
             | TokenType::RightBrace
             | TokenType::Comma
             | TokenType::Bang
@@ -929,7 +850,7 @@ impl<'a> Parser<'a> {
                         return Node::ParseErrorKind {
                             formula: self.lexer.get_formula(),
                             position: 0,
-                            message: format!("sheet not found: {}", context.sheet),
+                            message: "sheet not found".to_string(),
                         };
                     }
                 };
@@ -957,7 +878,7 @@ impl<'a> Parser<'a> {
                         return Node::ParseErrorKind {
                             formula: self.lexer.get_formula(),
                             position: 0,
-                            message: format!("table sheet not found: {}", table.sheet_name),
+                            message: "sheet not found".to_string(),
                         };
                     }
                 };
@@ -1099,13 +1020,12 @@ impl<'a> Parser<'a> {
     }
 
     fn parse_function_args(&mut self) -> Result<Vec<Node>, Node> {
-        let arg_separator_token = &self.get_argument_separator_token();
         let mut args: Vec<Node> = Vec::new();
         let mut next_token = self.lexer.peek_token();
         if next_token == TokenType::RightParenthesis {
             return Ok(args);
         }
-        if &self.lexer.peek_token() == arg_separator_token {
+        if self.lexer.peek_token() == TokenType::Comma {
             args.push(Node::EmptyArgKind);
         } else {
             let t = self.parse_expr();
@@ -1115,11 +1035,11 @@ impl<'a> Parser<'a> {
             args.push(t);
         }
         next_token = self.lexer.peek_token();
-        while &next_token == arg_separator_token {
+        while next_token == TokenType::Comma {
             self.lexer.advance_token();
-            if &self.lexer.peek_token() == arg_separator_token {
+            if self.lexer.peek_token() == TokenType::Comma {
                 args.push(Node::EmptyArgKind);
-                next_token = arg_separator_token.clone();
+                next_token = TokenType::Comma;
             } else if self.lexer.peek_token() == TokenType::RightParenthesis {
                 args.push(Node::EmptyArgKind);
                 return Ok(args);

base/src/expressions/parser/move_formula.rs

@@ -5,8 +5,6 @@ use super::{
 use crate::{
     constants::{LAST_COLUMN, LAST_ROW},
     expressions::token::OpUnary,
-    language::Language,
-    locale::Locale,
 };
 use crate::{
     expressions::types::{Area, CellReferenceRC},
@@ -40,78 +38,38 @@ pub(crate) struct MoveContext<'a> {
 /// We are moving a formula in (row, column) to (row+row_delta, column + column_delta).
 /// All references that do not point to a cell in area will be left untouched.
 /// All references that point to a cell in area will be displaced
-pub(crate) fn move_formula(
+pub(crate) fn move_formula(node: &Node, move_context: &MoveContext) -> String {
-    node: &Node,
+    to_string_moved(node, move_context)
-    move_context: &MoveContext,
-    locale: &Locale,
-    language: &Language,
-) -> String {
-    to_string_moved(node, move_context, locale, language)
 }
 
-fn move_function(
+fn move_function(name: &str, args: &Vec<Node>, move_context: &MoveContext) -> String {
-    name: &str,
-    args: &Vec<Node>,
-    move_context: &MoveContext,
-    locale: &Locale,
-    language: &Language,
-) -> String {
     let mut first = true;
     let mut arguments = "".to_string();
     for el in args {
         if !first {
-            arguments = format!(
+            arguments = format!("{},{}", arguments, to_string_moved(el, move_context));
-                "{},{}",
-                arguments,
-                to_string_moved(el, move_context, locale, language)
-            );
         } else {
             first = false;
-            arguments = to_string_moved(el, move_context, locale, language);
+            arguments = to_string_moved(el, move_context);
         }
     }
     format!("{name}({arguments})")
 }
 
-fn format_number_locale(number: f64, locale: &Locale) -> String {
+pub(crate) fn to_string_array_node(node: &ArrayNode) -> String {
-    let s = to_excel_precision_str(number);
-    let decimal = &locale.numbers.symbols.decimal;
-    if decimal == "." {
-        s
-    } else {
-        s.replace('.', decimal)
-    }
-}
-
-pub(crate) fn to_string_array_node(
-    node: &ArrayNode,
-    locale: &Locale,
-    language: &Language,
-) -> String {
     match node {
-        ArrayNode::Boolean(value) => {
+        ArrayNode::Boolean(value) => format!("{value}").to_ascii_uppercase(),
-            if *value {
+        ArrayNode::Number(number) => to_excel_precision_str(*number),
-                language.booleans.r#true.to_ascii_uppercase()
-            } else {
-                language.booleans.r#false.to_ascii_uppercase()
-            }
-        }
-        ArrayNode::Number(number) => format_number_locale(*number, locale),
         ArrayNode::String(value) => format!("\"{value}\""),
         ArrayNode::Error(kind) => format!("{kind}"),
     }
 }
 
-fn to_string_moved(
+fn to_string_moved(node: &Node, move_context: &MoveContext) -> String {
-    node: &Node,
-    move_context: &MoveContext,
-    locale: &Locale,
-    language: &Language,
-) -> String {
     use self::Node::*;
     match node {
         BooleanKind(value) => format!("{value}").to_ascii_uppercase(),
-        NumberKind(number) => format_number_locale(*number, locale),
+        NumberKind(number) => to_excel_precision_str(*number),
         StringKind(value) => format!("\"{value}\""),
         ReferenceKind {
             sheet_name,
@@ -371,81 +329,55 @@ fn to_string_moved(
         }
         OpRangeKind { left, right } => format!(
             "{}:{}",
-            to_string_moved(left, move_context, locale, language),
+            to_string_moved(left, move_context),
-            to_string_moved(right, move_context, locale, language),
+            to_string_moved(right, move_context),
         ),
         OpConcatenateKind { left, right } => format!(
             "{}&{}",
-            to_string_moved(left, move_context, locale, language),
+            to_string_moved(left, move_context),
-            to_string_moved(right, move_context, locale, language),
+            to_string_moved(right, move_context),
         ),
         OpSumKind { kind, left, right } => format!(
             "{}{}{}",
-            to_string_moved(left, move_context, locale, language),
+            to_string_moved(left, move_context),
             kind,
-            to_string_moved(right, move_context, locale, language),
+            to_string_moved(right, move_context),
         ),
         OpProductKind { kind, left, right } => {
             let x = match **left {
-                OpSumKind { .. } => format!(
+                OpSumKind { .. } => format!("({})", to_string_moved(left, move_context)),
-                    "({})",
+                CompareKind { .. } => format!("({})", to_string_moved(left, move_context)),
-                    to_string_moved(left, move_context, locale, language)
+                _ => to_string_moved(left, move_context),
-                ),
-                CompareKind { .. } => format!(
-                    "({})",
-                    to_string_moved(left, move_context, locale, language)
-                ),
-                _ => to_string_moved(left, move_context, locale, language),
             };
             let y = match **right {
-                OpSumKind { .. } => format!(
+                OpSumKind { .. } => format!("({})", to_string_moved(right, move_context)),
-                    "({})",
+                CompareKind { .. } => format!("({})", to_string_moved(right, move_context)),
-                    to_string_moved(right, move_context, locale, language)
+                OpProductKind { .. } => format!("({})", to_string_moved(right, move_context)),
-                ),
-                CompareKind { .. } => format!(
-                    "({})",
-                    to_string_moved(right, move_context, locale, language)
-                ),
-                OpProductKind { .. } => format!(
-                    "({})",
-                    to_string_moved(right, move_context, locale, language)
-                ),
                 UnaryKind { .. } => {
-                    format!(
+                    format!("({})", to_string_moved(right, move_context))
-                        "({})",
-                        to_string_moved(right, move_context, locale, language)
-                    )
                 }
-                _ => to_string_moved(right, move_context, locale, language),
+                _ => to_string_moved(right, move_context),
             };
             format!("{x}{kind}{y}")
         }
         OpPowerKind { left, right } => format!(
             "{}^{}",
-            to_string_moved(left, move_context, locale, language),
+            to_string_moved(left, move_context),
-            to_string_moved(right, move_context, locale, language),
+            to_string_moved(right, move_context),
         ),
-        InvalidFunctionKind { name, args } => {
+        InvalidFunctionKind { name, args } => move_function(name, args, move_context),
-            move_function(name, args, move_context, locale, language)
-        }
         FunctionKind { kind, args } => {
-            let name = &kind.to_localized_name(language);
+            let name = &kind.to_string();
-            move_function(name, args, move_context, locale, language)
+            move_function(name, args, move_context)
         }
         ArrayKind(args) => {
             let mut first_row = true;
             let mut matrix_string = String::new();
 
             // Each element in `args` is assumed to be one "row" (itself a `Vec<T>`).
-            let row_separator = if locale.numbers.symbols.decimal == "." {
-                ';'
-            } else {
-                '/'
-            };
-            let col_separator = if row_separator == ';' { ',' } else { ';' };
             for row in args {
                 if !first_row {
-                    matrix_string.push(col_separator);
+                    matrix_string.push(',');
                 } else {
                     first_row = false;
                 }
@@ -455,13 +387,13 @@ fn to_string_moved(
                 let mut row_string = String::new();
                 for el in row {
                     if !first_col {
-                        row_string.push(row_separator);
+                        row_string.push(',');
                     } else {
                         first_col = false;
                     }
 
                     // Reuse your existing element-stringification function
-                    row_string.push_str(&to_string_array_node(el, locale, language));
+                    row_string.push_str(&to_string_array_node(el));
                 }
 
                 // Enclose the row in braces
@@ -478,19 +410,13 @@ fn to_string_moved(
         WrongVariableKind(name) => name.to_string(),
         CompareKind { kind, left, right } => format!(
             "{}{}{}",
-            to_string_moved(left, move_context, locale, language),
+            to_string_moved(left, move_context),
             kind,
-            to_string_moved(right, move_context, locale, language),
+            to_string_moved(right, move_context),
         ),
         UnaryKind { kind, right } => match kind {
-            OpUnary::Minus => format!(
+            OpUnary::Minus => format!("-{}", to_string_moved(right, move_context)),
-                "-{}",
+            OpUnary::Percentage => format!("{}%", to_string_moved(right, move_context)),
-                to_string_moved(right, move_context, locale, language)
-            ),
-            OpUnary::Percentage => format!(
-                "{}%",
-                to_string_moved(right, move_context, locale, language)
-            ),
         },
         ErrorKind(kind) => format!("{kind}"),
         ParseErrorKind {
@@ -503,10 +429,7 @@ fn to_string_moved(
             automatic: _,
             child,
         } => {
-            format!(
+            format!("@{}", to_string_moved(child, move_context))
-                "@{}",
-                to_string_moved(child, move_context, locale, language)
-            )
         }
     }
 }

base/src/expressions/parser/static_analysis.rs

@@ -186,7 +186,8 @@ pub fn add_implicit_intersection(node: &mut Node, add: bool) {
     };
 }
 
-pub(crate) enum StaticResult {
+#[derive(Clone)]
+pub enum StaticResult {
     Scalar,
     Array(i32, i32),
     Range(i32, i32),
@@ -222,7 +223,7 @@ fn static_analysis_op_nodes(left: &Node, right: &Node) -> StaticResult {
 //  * Array(a, b) if we know it will be an a x b array.
 //  * Range(a, b) if we know it will be a a x b range.
 //  * Unknown if we cannot guaranty either
-fn run_static_analysis_on_node(node: &Node) -> StaticResult {
+pub(crate) fn run_static_analysis_on_node(node: &Node) -> StaticResult {
     match node {
         Node::BooleanKind(_)
         | Node::NumberKind(_)
@@ -341,8 +342,7 @@ fn static_analysis_offset(args: &[Node]) -> StaticResult {
         }
         _ => return StaticResult::Unknown,
     };
-    // Both height and width are explicitly 1, so OFFSET will return a single cell
+    StaticResult::Unknown
-    StaticResult::Scalar
 }
 
 // fn static_analysis_choose(_args: &[Node]) -> StaticResult {
@@ -576,37 +576,6 @@ fn args_signature_xnpv(arg_count: usize) -> Vec<Signature> {
     }
 }
 
-// NETWORKDAYS(start_date, end_date, [holidays])
-// Parameters: start_date (scalar), end_date (scalar), holidays (optional vector)
-fn args_signature_networkdays(arg_count: usize) -> Vec<Signature> {
-    if arg_count == 2 {
-        vec![Signature::Scalar, Signature::Scalar]
-    } else if arg_count == 3 {
-        vec![Signature::Scalar, Signature::Scalar, Signature::Vector]
-    } else {
-        vec![Signature::Error; arg_count]
-    }
-}
-
-// NETWORKDAYS.INTL(start_date, end_date, [weekend], [holidays])
-// Parameters: start_date (scalar), end_date (scalar), weekend (optional scalar), holidays (optional vector)
-fn args_signature_networkdays_intl(arg_count: usize) -> Vec<Signature> {
-    if arg_count == 2 {
-        vec![Signature::Scalar, Signature::Scalar]
-    } else if arg_count == 3 {
-        vec![Signature::Scalar, Signature::Scalar, Signature::Scalar]
-    } else if arg_count == 4 {
-        vec![
-            Signature::Scalar,
-            Signature::Scalar,
-            Signature::Scalar,
-            Signature::Vector,
-        ]
-    } else {
-        vec![Signature::Error; arg_count]
-    }
-}
-
 // FIXME: This is terrible duplications of efforts. We use the signature in at least three different places:
 // 1. When computing the function
 // 2. Checking the arguments to see if we need to insert the implicit intersection operator
@@ -711,7 +680,6 @@ fn get_function_args_signature(kind: &Function, arg_count: usize) -> Vec<Signatu
         Function::Value => args_signature_scalars(arg_count, 1, 0),
         Function::Valuetotext => args_signature_scalars(arg_count, 1, 1),
         Function::Average => vec![Signature::Vector; arg_count],
-        Function::Avedev => vec![Signature::Vector; arg_count],
         Function::Averagea => vec![Signature::Vector; arg_count],
         Function::Averageif => args_signature_sumif(arg_count),
         Function::Averageifs => vec![Signature::Vector; arg_count],
@@ -723,28 +691,13 @@ fn get_function_args_signature(kind: &Function, arg_count: usize) -> Vec<Signatu
         Function::Maxifs => vec![Signature::Vector; arg_count],
         Function::Minifs => vec![Signature::Vector; arg_count],
         Function::Date => args_signature_scalars(arg_count, 3, 0),
-        Function::Datedif => args_signature_scalars(arg_count, 3, 0),
-        Function::Datevalue => args_signature_scalars(arg_count, 1, 0),
         Function::Day => args_signature_scalars(arg_count, 1, 0),
         Function::Edate => args_signature_scalars(arg_count, 2, 0),
         Function::Eomonth => args_signature_scalars(arg_count, 2, 0),
         Function::Month => args_signature_scalars(arg_count, 1, 0),
-        Function::Time => args_signature_scalars(arg_count, 3, 0),
-        Function::Timevalue => args_signature_scalars(arg_count, 1, 0),
-        Function::Hour => args_signature_scalars(arg_count, 1, 0),
-        Function::Minute => args_signature_scalars(arg_count, 1, 0),
-        Function::Second => args_signature_scalars(arg_count, 1, 0),
         Function::Now => args_signature_no_args(arg_count),
         Function::Today => args_signature_no_args(arg_count),
         Function::Year => args_signature_scalars(arg_count, 1, 0),
-        Function::Days => args_signature_scalars(arg_count, 2, 0),
-        Function::Days360 => args_signature_scalars(arg_count, 2, 1),
-        Function::Weekday => args_signature_scalars(arg_count, 1, 1),
-        Function::Weeknum => args_signature_scalars(arg_count, 1, 1),
-        Function::Workday => args_signature_scalars(arg_count, 2, 1),
-        Function::WorkdayIntl => args_signature_scalars(arg_count, 2, 2),
-        Function::Yearfrac => args_signature_scalars(arg_count, 2, 1),
-        Function::Isoweeknum => args_signature_scalars(arg_count, 1, 0),
         Function::Cumipmt => args_signature_scalars(arg_count, 6, 0),
         Function::Cumprinc => args_signature_scalars(arg_count, 6, 0),
         Function::Db => args_signature_scalars(arg_count, 4, 1),
@@ -833,180 +786,6 @@ fn get_function_args_signature(kind: &Function, arg_count: usize) -> Vec<Signatu
         Function::Formulatext => args_signature_scalars(arg_count, 1, 0),
         Function::Unicode => args_signature_scalars(arg_count, 1, 0),
         Function::Geomean => vec![Signature::Vector; arg_count],
-        Function::Networkdays => args_signature_networkdays(arg_count),
-        Function::NetworkdaysIntl => args_signature_networkdays_intl(arg_count),
-        Function::Acot => args_signature_scalars(arg_count, 1, 0),
-        Function::Acoth => args_signature_scalars(arg_count, 1, 0),
-        Function::Cot => args_signature_scalars(arg_count, 1, 0),
-        Function::Coth => args_signature_scalars(arg_count, 1, 0),
-        Function::Csc => args_signature_scalars(arg_count, 1, 0),
-        Function::Csch => args_signature_scalars(arg_count, 1, 0),
-        Function::Sec => args_signature_scalars(arg_count, 1, 0),
-        Function::Sech => args_signature_scalars(arg_count, 1, 0),
-        Function::Exp => args_signature_scalars(arg_count, 1, 0),
-        Function::Fact => args_signature_scalars(arg_count, 1, 0),
-        Function::Factdouble => args_signature_scalars(arg_count, 1, 0),
-        Function::Sign => args_signature_scalars(arg_count, 1, 0),
-        Function::Radians => args_signature_scalars(arg_count, 1, 0),
-        Function::Degrees => args_signature_scalars(arg_count, 1, 0),
-        Function::Int => args_signature_scalars(arg_count, 1, 0),
-        Function::Even => args_signature_scalars(arg_count, 1, 0),
-        Function::Odd => args_signature_scalars(arg_count, 1, 0),
-        Function::Ceiling => args_signature_scalars(arg_count, 2, 0),
-        Function::CeilingMath => args_signature_scalars(arg_count, 1, 2),
-        Function::CeilingPrecise => args_signature_scalars(arg_count, 1, 1),
-        Function::Floor => args_signature_scalars(arg_count, 2, 0),
-        Function::FloorMath => args_signature_scalars(arg_count, 1, 2),
-        Function::FloorPrecise => args_signature_scalars(arg_count, 1, 1),
-        Function::IsoCeiling => args_signature_scalars(arg_count, 1, 1),
-        Function::Mod => args_signature_scalars(arg_count, 2, 0),
-        Function::Quotient => args_signature_scalars(arg_count, 2, 0),
-        Function::Mround => args_signature_scalars(arg_count, 2, 0),
-        Function::Trunc => args_signature_scalars(arg_count, 1, 1),
-        Function::Gcd => vec![Signature::Vector; arg_count],
-        Function::Lcm => vec![Signature::Vector; arg_count],
-        Function::Base => args_signature_scalars(arg_count, 2, 1),
-        Function::Decimal => args_signature_scalars(arg_count, 2, 0),
-        Function::Roman => args_signature_scalars(arg_count, 1, 1),
-        Function::Arabic => args_signature_scalars(arg_count, 1, 0),
-        Function::Combin => args_signature_scalars(arg_count, 2, 0),
-        Function::Combina => args_signature_scalars(arg_count, 2, 0),
-        Function::Sumsq => vec![Signature::Vector; arg_count],
-        Function::N => args_signature_scalars(arg_count, 1, 0),
-        Function::Sheets => args_signature_scalars(arg_count, 0, 1),
-        Function::Cell => args_signature_scalars(arg_count, 1, 1),
-        Function::Info => args_signature_scalars(arg_count, 1, 1),
-        Function::Daverage => vec![Signature::Vector, Signature::Scalar, Signature::Vector],
-        Function::Dcount => vec![Signature::Vector, Signature::Scalar, Signature::Vector],
-        Function::Dget => vec![Signature::Vector, Signature::Scalar, Signature::Vector],
-        Function::Dmax => vec![Signature::Vector, Signature::Scalar, Signature::Vector],
-        Function::Dmin => vec![Signature::Vector, Signature::Scalar, Signature::Vector],
-        Function::Dsum => vec![Signature::Vector, Signature::Scalar, Signature::Vector],
-        Function::Dcounta => vec![Signature::Vector, Signature::Scalar, Signature::Vector],
-        Function::Dproduct => vec![Signature::Vector, Signature::Scalar, Signature::Vector],
-        Function::Dstdev => vec![Signature::Vector, Signature::Scalar, Signature::Vector],
-        Function::Dvar => vec![Signature::Vector, Signature::Scalar, Signature::Vector],
-        Function::Dvarp => vec![Signature::Vector, Signature::Scalar, Signature::Vector],
-        Function::Dstdevp => vec![Signature::Vector, Signature::Scalar, Signature::Vector],
-        Function::BetaDist => args_signature_scalars(arg_count, 4, 2),
-        Function::BetaInv => args_signature_scalars(arg_count, 3, 2),
-        Function::BinomDist => args_signature_scalars(arg_count, 4, 0),
-        Function::BinomDistRange => args_signature_scalars(arg_count, 3, 1),
-        Function::BinomInv => args_signature_scalars(arg_count, 3, 0),
-        Function::ChisqDist => args_signature_scalars(arg_count, 4, 0),
-        Function::ChisqDistRT => args_signature_scalars(arg_count, 3, 0),
-        Function::ChisqInv => args_signature_scalars(arg_count, 3, 0),
-        Function::ChisqInvRT => args_signature_scalars(arg_count, 2, 0),
-        Function::ChisqTest => {
-            if arg_count == 2 {
-                vec![Signature::Vector, Signature::Vector]
-            } else {
-                vec![Signature::Error; arg_count]
-            }
-        }
-        Function::ConfidenceNorm => args_signature_scalars(arg_count, 3, 0),
-        Function::ConfidenceT => args_signature_scalars(arg_count, 3, 0),
-        Function::CovarianceP => {
-            if arg_count == 2 {
-                vec![Signature::Vector, Signature::Vector]
-            } else {
-                vec![Signature::Error; arg_count]
-            }
-        }
-        Function::CovarianceS => {
-            if arg_count == 2 {
-                vec![Signature::Vector, Signature::Vector]
-            } else {
-                vec![Signature::Error; arg_count]
-            }
-        }
-        Function::Devsq => vec![Signature::Vector; arg_count],
-        Function::ExponDist => args_signature_scalars(arg_count, 3, 0),
-        Function::FDist => args_signature_scalars(arg_count, 4, 0),
-        Function::FDistRT => args_signature_scalars(arg_count, 3, 0),
-        Function::FInv => args_signature_scalars(arg_count, 3, 0),
-        Function::FInvRT => args_signature_scalars(arg_count, 3, 0),
-        Function::FTest => vec![Signature::Vector; 2],
-        Function::Fisher => args_signature_scalars(arg_count, 1, 0),
-        Function::FisherInv => args_signature_scalars(arg_count, 1, 0),
-        Function::Gamma => args_signature_scalars(arg_count, 1, 0),
-        Function::GammaDist => args_signature_scalars(arg_count, 4, 0),
-        Function::GammaInv => args_signature_scalars(arg_count, 3, 0),
-        Function::GammaLn => args_signature_scalars(arg_count, 1, 0),
-        Function::GammaLnPrecise => args_signature_scalars(arg_count, 1, 0),
-        Function::HypGeomDist => args_signature_scalars(arg_count, 5, 0),
-        Function::LogNormDist => args_signature_scalars(arg_count, 4, 0),
-        Function::LogNormInv => args_signature_scalars(arg_count, 3, 0),
-        Function::NegbinomDist => args_signature_scalars(arg_count, 4, 0),
-        Function::NormDist => args_signature_scalars(arg_count, 4, 0),
-        Function::NormInv => args_signature_scalars(arg_count, 3, 0),
-        Function::NormSdist => args_signature_scalars(arg_count, 2, 0),
-        Function::NormSInv => args_signature_scalars(arg_count, 1, 0),
-        Function::Pearson => {
-            if arg_count == 2 {
-                vec![Signature::Vector, Signature::Vector]
-            } else {
-                vec![Signature::Error; arg_count]
-            }
-        }
-        Function::Phi => args_signature_scalars(arg_count, 1, 0),
-        Function::PoissonDist => args_signature_scalars(arg_count, 3, 0),
-        Function::Standardize => args_signature_scalars(arg_count, 3, 0),
-        Function::StDevP => vec![Signature::Vector; arg_count],
-        Function::StDevS => vec![Signature::Vector; arg_count],
-        Function::Stdeva => vec![Signature::Vector; arg_count],
-        Function::Stdevpa => vec![Signature::Vector; arg_count],
-        Function::TDist => args_signature_scalars(arg_count, 3, 0),
-        Function::TDist2T => args_signature_scalars(arg_count, 2, 0),
-        Function::TDistRT => args_signature_scalars(arg_count, 2, 0),
-        Function::TInv => args_signature_scalars(arg_count, 2, 0),
-        Function::TInv2T => args_signature_scalars(arg_count, 2, 0),
-        Function::TTest => {
-            if arg_count == 4 {
-                vec![
-                    Signature::Vector,
-                    Signature::Vector,
-                    Signature::Scalar,
-                    Signature::Scalar,
-                ]
-            } else {
-                vec![Signature::Error; arg_count]
-            }
-        }
-        Function::VarP => vec![Signature::Vector; arg_count],
-        Function::VarS => vec![Signature::Vector; arg_count],
-        Function::VarpA => vec![Signature::Vector; arg_count],
-        Function::VarA => vec![Signature::Vector; arg_count],
-        Function::WeibullDist => args_signature_scalars(arg_count, 4, 0),
-        Function::ZTest => {
-            if arg_count == 2 {
-                vec![Signature::Vector, Signature::Scalar]
-            } else if arg_count == 3 {
-                vec![Signature::Vector, Signature::Scalar, Signature::Scalar]
-            } else {
-                vec![Signature::Error; arg_count]
-            }
-        }
-        Function::Sumx2my2 => vec![Signature::Vector; 2],
-        Function::Sumx2py2 => vec![Signature::Vector; 2],
-        Function::Sumxmy2 => vec![Signature::Vector; 2],
-        Function::Correl => vec![Signature::Vector; 2],
-        Function::Rsq => vec![Signature::Vector; 2],
-        Function::Intercept => vec![Signature::Vector; 2],
-        Function::Slope => vec![Signature::Vector; 2],
-        Function::Steyx => vec![Signature::Vector; 2],
-        Function::Gauss => args_signature_scalars(arg_count, 1, 0),
-        Function::Harmean => vec![Signature::Vector; arg_count],
-        Function::Kurt => vec![Signature::Vector; arg_count],
-        Function::Large => vec![Signature::Vector, Signature::Scalar],
-        Function::MaxA => vec![Signature::Vector; arg_count],
-        Function::Median => vec![Signature::Vector; arg_count],
-        Function::MinA => vec![Signature::Vector; arg_count],
-        Function::RankAvg => vec![Signature::Scalar, Signature::Vector, Signature::Scalar],
-        Function::RankEq => vec![Signature::Scalar, Signature::Vector, Signature::Scalar],
-        Function::Skew => vec![Signature::Vector; arg_count],
-        Function::SkewP => vec![Signature::Vector; arg_count],
-        Function::Small => vec![Signature::Vector, Signature::Scalar],
     }
 }
 
@@ -1032,7 +811,7 @@ fn static_analysis_on_function(kind: &Function, args: &[Node]) -> StaticResult {
         Function::Atan => scalar_arguments(args),
         Function::Atan2 => scalar_arguments(args),
         Function::Atanh => scalar_arguments(args),
-        Function::Choose => scalar_arguments(args),
+        Function::Choose => scalar_arguments(args), // static_analysis_choose(args, cell),
         Function::Column => not_implemented(args),
         Function::Columns => not_implemented(args),
         Function::Cos => scalar_arguments(args),
@@ -1079,6 +858,7 @@ fn static_analysis_on_function(kind: &Function, args: &[Node]) -> StaticResult {
         Function::Lookup => not_implemented(args),
         Function::Match => not_implemented(args),
         Function::Offset => static_analysis_offset(args),
+        // FIXME: Row could return an array
         Function::Row => StaticResult::Scalar,
         Function::Rows => not_implemented(args),
         Function::Vlookup => not_implemented(args),
@@ -1107,7 +887,6 @@ fn static_analysis_on_function(kind: &Function, args: &[Node]) -> StaticResult {
         Function::Valuetotext => not_implemented(args),
         Function::Average => not_implemented(args),
         Function::Averagea => not_implemented(args),
-        Function::Avedev => not_implemented(args),
         Function::Averageif => not_implemented(args),
         Function::Averageifs => not_implemented(args),
         Function::Count => not_implemented(args),
@@ -1118,27 +897,12 @@ fn static_analysis_on_function(kind: &Function, args: &[Node]) -> StaticResult {
         Function::Maxifs => not_implemented(args),
         Function::Minifs => not_implemented(args),
         Function::Date => not_implemented(args),
-        Function::Datedif => not_implemented(args),
-        Function::Datevalue => not_implemented(args),
         Function::Day => not_implemented(args),
         Function::Edate => not_implemented(args),
         Function::Month => not_implemented(args),
-        Function::Time => not_implemented(args),
-        Function::Timevalue => not_implemented(args),
-        Function::Hour => not_implemented(args),
-        Function::Minute => not_implemented(args),
-        Function::Second => not_implemented(args),
         Function::Now => not_implemented(args),
         Function::Today => not_implemented(args),
         Function::Year => not_implemented(args),
-        Function::Days => not_implemented(args),
-        Function::Days360 => not_implemented(args),
-        Function::Weekday => not_implemented(args),
-        Function::Weeknum => not_implemented(args),
-        Function::Workday => not_implemented(args),
-        Function::WorkdayIntl => not_implemented(args),
-        Function::Yearfrac => not_implemented(args),
-        Function::Isoweeknum => not_implemented(args),
         Function::Cumipmt => not_implemented(args),
         Function::Cumprinc => not_implemented(args),
         Function::Db => not_implemented(args),
@@ -1227,136 +991,5 @@ fn static_analysis_on_function(kind: &Function, args: &[Node]) -> StaticResult {
         Function::Eomonth => scalar_arguments(args),
         Function::Formulatext => not_implemented(args),
         Function::Geomean => not_implemented(args),
-        Function::Networkdays => not_implemented(args),
-        Function::NetworkdaysIntl => not_implemented(args),
-        Function::Acot => scalar_arguments(args),
-        Function::Acoth => scalar_arguments(args),
-        Function::Cot => scalar_arguments(args),
-        Function::Coth => scalar_arguments(args),
-        Function::Csc => scalar_arguments(args),
-        Function::Csch => scalar_arguments(args),
-        Function::Sec => scalar_arguments(args),
-        Function::Sech => scalar_arguments(args),
-        Function::Exp => scalar_arguments(args),
-        Function::Fact => scalar_arguments(args),
-        Function::Factdouble => scalar_arguments(args),
-        Function::Sign => scalar_arguments(args),
-        Function::Radians => scalar_arguments(args),
-        Function::Degrees => scalar_arguments(args),
-        Function::Int => scalar_arguments(args),
-        Function::Even => scalar_arguments(args),
-        Function::Odd => scalar_arguments(args),
-        Function::Ceiling => scalar_arguments(args),
-        Function::CeilingMath => scalar_arguments(args),
-        Function::CeilingPrecise => scalar_arguments(args),
-        Function::Floor => scalar_arguments(args),
-        Function::FloorMath => scalar_arguments(args),
-        Function::FloorPrecise => scalar_arguments(args),
-        Function::IsoCeiling => scalar_arguments(args),
-        Function::Mod => scalar_arguments(args),
-        Function::Quotient => scalar_arguments(args),
-        Function::Mround => scalar_arguments(args),
-        Function::Trunc => scalar_arguments(args),
-        Function::Gcd => not_implemented(args),
-        Function::Lcm => not_implemented(args),
-        Function::Base => scalar_arguments(args),
-        Function::Decimal => scalar_arguments(args),
-        Function::Roman => scalar_arguments(args),
-        Function::Arabic => scalar_arguments(args),
-        Function::Combin => scalar_arguments(args),
-        Function::Combina => scalar_arguments(args),
-        Function::Sumsq => StaticResult::Scalar,
-        Function::N => scalar_arguments(args),
-        Function::Sheets => scalar_arguments(args),
-        Function::Cell => scalar_arguments(args),
-        Function::Info => scalar_arguments(args),
-        Function::Dget => not_implemented(args),
-        Function::Dmax => not_implemented(args),
-        Function::Dmin => not_implemented(args),
-        Function::Dcount => not_implemented(args),
-        Function::Daverage => not_implemented(args),
-        Function::Dsum => not_implemented(args),
-        Function::Dcounta => not_implemented(args),
-        Function::Dproduct => not_implemented(args),
-        Function::Dstdev => not_implemented(args),
-        Function::Dvar => not_implemented(args),
-        Function::Dvarp => not_implemented(args),
-        Function::Dstdevp => not_implemented(args),
-        Function::BetaDist => StaticResult::Scalar,
-        Function::BetaInv => StaticResult::Scalar,
-        Function::BinomDist => StaticResult::Scalar,
-        Function::BinomDistRange => StaticResult::Scalar,
-        Function::BinomInv => StaticResult::Scalar,
-        Function::ChisqDist => StaticResult::Scalar,
-        Function::ChisqDistRT => StaticResult::Scalar,
-        Function::ChisqInv => StaticResult::Scalar,
-        Function::ChisqInvRT => StaticResult::Scalar,
-        Function::ChisqTest => StaticResult::Scalar,
-        Function::ConfidenceNorm => StaticResult::Scalar,
-        Function::ConfidenceT => StaticResult::Scalar,
-        Function::CovarianceP => StaticResult::Scalar,
-        Function::CovarianceS => StaticResult::Scalar,
-        Function::Devsq => StaticResult::Scalar,
-        Function::ExponDist => StaticResult::Scalar,
-        Function::FDist => StaticResult::Scalar,
-        Function::FDistRT => StaticResult::Scalar,
-        Function::FInv => StaticResult::Scalar,
-        Function::FInvRT => StaticResult::Scalar,
-        Function::FTest => StaticResult::Scalar,
-        Function::Fisher => StaticResult::Scalar,
-        Function::FisherInv => StaticResult::Scalar,
-        Function::Gamma => StaticResult::Scalar,
-        Function::GammaDist => StaticResult::Scalar,
-        Function::GammaInv => StaticResult::Scalar,
-        Function::GammaLn => StaticResult::Scalar,
-        Function::GammaLnPrecise => StaticResult::Scalar,
-        Function::HypGeomDist => StaticResult::Scalar,
-        Function::LogNormDist => StaticResult::Scalar,
-        Function::LogNormInv => StaticResult::Scalar,
-        Function::NegbinomDist => StaticResult::Scalar,
-        Function::NormDist => StaticResult::Scalar,
-        Function::NormInv => StaticResult::Scalar,
-        Function::NormSdist => StaticResult::Scalar,
-        Function::NormSInv => StaticResult::Scalar,
-        Function::Pearson => StaticResult::Scalar,
-        Function::Phi => StaticResult::Scalar,
-        Function::PoissonDist => StaticResult::Scalar,
-        Function::Standardize => StaticResult::Scalar,
-        Function::StDevP => StaticResult::Scalar,
-        Function::StDevS => StaticResult::Scalar,
-        Function::Stdeva => StaticResult::Scalar,
-        Function::Stdevpa => StaticResult::Scalar,
-        Function::TDist => StaticResult::Scalar,
-        Function::TDist2T => StaticResult::Scalar,
-        Function::TDistRT => StaticResult::Scalar,
-        Function::TInv => StaticResult::Scalar,
-        Function::TInv2T => StaticResult::Scalar,
-        Function::TTest => StaticResult::Scalar,
-        Function::VarP => StaticResult::Scalar,
-        Function::VarS => StaticResult::Scalar,
-        Function::VarpA => StaticResult::Scalar,
-        Function::VarA => StaticResult::Scalar,
-        Function::WeibullDist => StaticResult::Scalar,
-        Function::ZTest => StaticResult::Scalar,
-        Function::Sumx2my2 => StaticResult::Scalar,
-        Function::Sumx2py2 => StaticResult::Scalar,
-        Function::Sumxmy2 => StaticResult::Scalar,
-        Function::Correl => StaticResult::Scalar,
-        Function::Rsq => StaticResult::Scalar,
-        Function::Intercept => StaticResult::Scalar,
-        Function::Slope => StaticResult::Scalar,
-        Function::Steyx => StaticResult::Scalar,
-        Function::Gauss => StaticResult::Scalar,
-        Function::Harmean => StaticResult::Scalar,
-        Function::Kurt => StaticResult::Scalar,
-        Function::Large => StaticResult::Scalar,
-        Function::MaxA => StaticResult::Scalar,
-        Function::Median => StaticResult::Scalar,
-        Function::MinA => StaticResult::Scalar,
-        Function::RankAvg => StaticResult::Scalar,
-        Function::RankEq => StaticResult::Scalar,
-        Function::Skew => StaticResult::Scalar,
-        Function::SkewP => StaticResult::Scalar,
-        Function::Small => StaticResult::Scalar,
     }
 }

base/src/expressions/parser/stringify.rs

@@ -3,8 +3,6 @@ use crate::constants::{LAST_COLUMN, LAST_ROW};
 use crate::expressions::parser::move_formula::to_string_array_node;
 use crate::expressions::parser::static_analysis::add_implicit_intersection;
 use crate::expressions::token::{OpSum, OpUnary};
-use crate::language::{get_language, Language};
-use crate::locale::{get_locale, Locale};
 use crate::{expressions::types::CellReferenceRC, number_format::to_excel_precision_str};
 
 pub enum DisplaceData {
@@ -45,44 +43,17 @@ pub enum DisplaceData {
 
 /// This is the internal mode in IronCalc
 pub fn to_rc_format(node: &Node) -> String {
-    #[allow(clippy::expect_used)]
+    stringify(node, None, &DisplaceData::None, false)
-    let locale = get_locale("en").expect("");
-    #[allow(clippy::expect_used)]
-    let language = get_language("en").expect("");
-    stringify(node, None, &DisplaceData::None, false, locale, language)
 }
 
 /// This is the mode used to display the formula in the UI
-pub fn to_localized_string(
+pub fn to_string(node: &Node, context: &CellReferenceRC) -> String {
-    node: &Node,
+    stringify(node, Some(context), &DisplaceData::None, false)
-    context: &CellReferenceRC,
-    locale: &Locale,
-    language: &Language,
-) -> String {
-    stringify(
-        node,
-        Some(context),
-        &DisplaceData::None,
-        false,
-        locale,
-        language,
-    )
 }
 
 /// This is the mode used to export the formula to Excel
 pub fn to_excel_string(node: &Node, context: &CellReferenceRC) -> String {
-    #[allow(clippy::expect_used)]
+    stringify(node, Some(context), &DisplaceData::None, true)
-    let locale = get_locale("en").expect("");
-    #[allow(clippy::expect_used)]
-    let language = get_language("en").expect("");
-    stringify(
-        node,
-        Some(context),
-        &DisplaceData::None,
-        true,
-        locale,
-        language,
-    )
 }
 
 pub fn to_string_displaced(
@@ -90,11 +61,7 @@ pub fn to_string_displaced(
     context: &CellReferenceRC,
     displace_data: &DisplaceData,
 ) -> String {
-    #[allow(clippy::expect_used)]
+    stringify(node, Some(context), displace_data, false)
-    let locale = get_locale("en").expect("");
-    #[allow(clippy::expect_used)]
-    let language = get_language("en").expect("");
-    stringify(node, Some(context), displace_data, false, locale, language)
 }
 
 /// Converts a local reference to a string applying some displacement if needed.
@@ -306,41 +273,19 @@ fn format_function(
     context: Option<&CellReferenceRC>,
     displace_data: &DisplaceData,
     export_to_excel: bool,
-    locale: &Locale,
-    language: &Language,
 ) -> String {
     let mut first = true;
     let mut arguments = "".to_string();
-    let arg_separator = if locale.numbers.symbols.decimal == "." {
-        ','
-    } else {
-        ';'
-    };
     for el in args {
         if !first {
             arguments = format!(
-                "{}{}{}",
+                "{},{}",
                 arguments,
-                arg_separator,
+                stringify(el, context, displace_data, export_to_excel)
-                stringify(
-                    el,
-                    context,
-                    displace_data,
-                    export_to_excel,
-                    locale,
-                    language
-                )
             );
         } else {
             first = false;
-            arguments = stringify(
+            arguments = stringify(el, context, displace_data, export_to_excel);
-                el,
-                context,
-                displace_data,
-                export_to_excel,
-                locale,
-                language,
-            );
         }
     }
     format!("{name}({arguments})")
@@ -376,26 +321,11 @@ fn stringify(
     context: Option<&CellReferenceRC>,
     displace_data: &DisplaceData,
     export_to_excel: bool,
-    locale: &Locale,
-    language: &Language,
 ) -> String {
     use self::Node::*;
     match node {
-        BooleanKind(value) => {
+        BooleanKind(value) => format!("{value}").to_ascii_uppercase(),
-            if *value {
+        NumberKind(number) => to_excel_precision_str(*number),
-                language.booleans.r#true.to_string()
-            } else {
-                language.booleans.r#false.to_string()
-            }
-        }
-        NumberKind(number) => {
-            let s = to_excel_precision_str(*number);
-            if locale.numbers.symbols.decimal == "." {
-                s
-            } else {
-                s.replace(".", &locale.numbers.symbols.decimal)
-            }
-        }
         StringKind(value) => format!("\"{value}\""),
         WrongReferenceKind {
             sheet_name,
@@ -539,95 +469,32 @@ fn stringify(
         }
         OpRangeKind { left, right } => format!(
             "{}:{}",
-            stringify(
+            stringify(left, context, displace_data, export_to_excel),
-                left,
+            stringify(right, context, displace_data, export_to_excel)
-                context,
-                displace_data,
-                export_to_excel,
-                locale,
-                language
-            ),
-            stringify(
-                right,
-                context,
-                displace_data,
-                export_to_excel,
-                locale,
-                language
-            )
         ),
         OpConcatenateKind { left, right } => format!(
             "{}&{}",
-            stringify(
+            stringify(left, context, displace_data, export_to_excel),
-                left,
+            stringify(right, context, displace_data, export_to_excel)
-                context,
-                displace_data,
-                export_to_excel,
-                locale,
-                language
-            ),
-            stringify(
-                right,
-                context,
-                displace_data,
-                export_to_excel,
-                locale,
-                language
-            )
         ),
         CompareKind { kind, left, right } => format!(
             "{}{}{}",
-            stringify(
+            stringify(left, context, displace_data, export_to_excel),
-                left,
-                context,
-                displace_data,
-                export_to_excel,
-                locale,
-                language
-            ),
             kind,
-            stringify(
+            stringify(right, context, displace_data, export_to_excel)
-                right,
-                context,
-                displace_data,
-                export_to_excel,
-                locale,
-                language
-            )
         ),
         OpSumKind { kind, left, right } => {
-            let left_str = stringify(
+            let left_str = stringify(left, context, displace_data, export_to_excel);
-                left,
-                context,
-                displace_data,
-                export_to_excel,
-                locale,
-                language,
-            );
             // if kind is minus then we need parentheses in the right side if they are OpSumKind or CompareKind
             let right_str = if (matches!(kind, OpSum::Minus) && matches!(**right, OpSumKind { .. }))
                 | matches!(**right, CompareKind { .. })
             {
                 format!(
                     "({})",
-                    stringify(
+                    stringify(right, context, displace_data, export_to_excel)
-                        right,
-                        context,
-                        displace_data,
-                        export_to_excel,
-                        locale,
-                        language
-                    )
                 )
             } else {
-                stringify(
+                stringify(right, context, displace_data, export_to_excel)
-                    right,
-                    context,
-                    displace_data,
-                    export_to_excel,
-                    locale,
-                    language,
-                )
             };
 
             format!("{left_str}{kind}{right_str}")
@@ -636,44 +503,16 @@ fn stringify(
             let x = match **left {
                 OpSumKind { .. } | CompareKind { .. } => format!(
                     "({})",
-                    stringify(
+                    stringify(left, context, displace_data, export_to_excel)
-                        left,
-                        context,
-                        displace_data,
-                        export_to_excel,
-                        locale,
-                        language
-                    )
-                ),
-                _ => stringify(
-                    left,
-                    context,
-                    displace_data,
-                    export_to_excel,
-                    locale,
-                    language,
                 ),
+                _ => stringify(left, context, displace_data, export_to_excel),
             };
             let y = match **right {
                 OpSumKind { .. } | CompareKind { .. } | OpProductKind { .. } => format!(
                     "({})",
-                    stringify(
+                    stringify(right, context, displace_data, export_to_excel)
-                        right,
-                        context,
-                        displace_data,
-                        export_to_excel,
-                        locale,
-                        language
-                    )
-                ),
-                _ => stringify(
-                    right,
-                    context,
-                    displace_data,
-                    export_to_excel,
-                    locale,
-                    language,
                 ),
+                _ => stringify(right, context, displace_data, export_to_excel),
             };
             format!("{x}{kind}{y}")
         }
@@ -681,7 +520,6 @@ fn stringify(
             let x = match **left {
                 BooleanKind(_)
                 | NumberKind(_)
-                | UnaryKind { .. }
                 | StringKind(_)
                 | ReferenceKind { .. }
                 | RangeKind { .. }
@@ -689,14 +527,7 @@ fn stringify(
                 | DefinedNameKind(_)
                 | TableNameKind(_)
                 | WrongVariableKind(_)
-                | WrongRangeKind { .. } => stringify(
+                | WrongRangeKind { .. } => stringify(left, context, displace_data, export_to_excel),
-                    left,
-                    context,
-                    displace_data,
-                    export_to_excel,
-                    locale,
-                    language,
-                ),
                 OpRangeKind { .. }
                 | OpConcatenateKind { .. }
                 | OpProductKind { .. }
@@ -704,6 +535,7 @@ fn stringify(
                 | FunctionKind { .. }
                 | InvalidFunctionKind { .. }
                 | ArrayKind(_)
+                | UnaryKind { .. }
                 | ErrorKind(_)
                 | ParseErrorKind { .. }
                 | OpSumKind { .. }
@@ -711,14 +543,7 @@ fn stringify(
                 | ImplicitIntersection { .. }
                 | EmptyArgKind => format!(
                     "({})",
-                    stringify(
+                    stringify(left, context, displace_data, export_to_excel)
-                        left,
-                        context,
-                        displace_data,
-                        export_to_excel,
-                        locale,
-                        language
-                    )
                 ),
             };
             let y = match **right {
@@ -731,14 +556,9 @@ fn stringify(
                 | DefinedNameKind(_)
                 | TableNameKind(_)
                 | WrongVariableKind(_)
-                | WrongRangeKind { .. } => stringify(
+                | WrongRangeKind { .. } => {
-                    right,
+                    stringify(right, context, displace_data, export_to_excel)
-                    context,
+                }
-                    displace_data,
-                    export_to_excel,
-                    locale,
-                    language,
-                ),
                 OpRangeKind { .. }
                 | OpConcatenateKind { .. }
                 | OpProductKind { .. }
@@ -754,56 +574,29 @@ fn stringify(
                 | ImplicitIntersection { .. }
                 | EmptyArgKind => format!(
                     "({})",
-                    stringify(
+                    stringify(right, context, displace_data, export_to_excel)
-                        right,
-                        context,
-                        displace_data,
-                        export_to_excel,
-                        locale,
-                        language
-                    )
                 ),
             };
             format!("{x}^{y}")
         }
-        InvalidFunctionKind { name, args } => format_function(
+        InvalidFunctionKind { name, args } => {
-            &name.to_ascii_lowercase(),
+            format_function(name, args, context, displace_data, export_to_excel)
-            args,
+        }
-            context,
-            displace_data,
-            export_to_excel,
-            locale,
-            language,
-        ),
         FunctionKind { kind, args } => {
             let name = if export_to_excel {
                 kind.to_xlsx_string()
             } else {
-                kind.to_localized_name(language)
+                kind.to_string()
             };
-            format_function(
+            format_function(&name, args, context, displace_data, export_to_excel)
-                &name,
-                args,
-                context,
-                displace_data,
-                export_to_excel,
-                locale,
-                language,
-            )
         }
         ArrayKind(args) => {
             let mut first_row = true;
             let mut matrix_string = String::new();
-            let row_separator = if locale.numbers.symbols.decimal == "." {
-                ';'
-            } else {
-                '/'
-            };
-            let col_separator = if row_separator == ';' { ',' } else { ';' };
 
             for row in args {
                 if !first_row {
-                    matrix_string.push(row_separator);
+                    matrix_string.push(';');
                 } else {
                     first_row = false;
                 }
@@ -811,11 +604,11 @@ fn stringify(
                 let mut row_string = String::new();
                 for el in row {
                     if !first_column {
-                        row_string.push(col_separator);
+                        row_string.push(',');
                     } else {
                         first_column = false;
                     }
-                    row_string.push_str(&to_string_array_node(el, locale, language));
+                    row_string.push_str(&to_string_array_node(el));
                 }
                 matrix_string.push_str(&row_string);
             }
@@ -837,6 +630,7 @@ fn stringify(
                     | OpRangeKind { .. }
                     | OpConcatenateKind { .. }
                     | OpProductKind { .. }
+                    | OpPowerKind { .. }
                     | FunctionKind { .. }
                     | InvalidFunctionKind { .. }
                     | ArrayKind(_)
@@ -849,45 +643,24 @@ fn stringify(
                     | ParseErrorKind { .. }
                     | EmptyArgKind => false,
 
-                    OpPowerKind { .. } | OpSumKind { .. } | UnaryKind { .. } => true,
+                    OpSumKind { .. } | UnaryKind { .. } => true,
                 };
                 if needs_parentheses {
                     format!(
                         "-({})",
-                        stringify(
+                        stringify(right, context, displace_data, export_to_excel)
-                            right,
-                            context,
-                            displace_data,
-                            export_to_excel,
-                            locale,
-                            language
-                        )
                     )
                 } else {
                     format!(
                         "-{}",
-                        stringify(
+                        stringify(right, context, displace_data, export_to_excel)
-                            right,
-                            context,
-                            displace_data,
-                            export_to_excel,
-                            locale,
-                            language
-                        )
                     )
                 }
             }
             OpUnary::Percentage => {
                 format!(
                     "{}%",
-                    stringify(
+                    stringify(right, context, displace_data, export_to_excel)
-                        right,
-                        context,
-                        displace_data,
-                        export_to_excel,
-                        locale,
-                        language
-                    )
                 )
             }
         },
@@ -908,38 +681,17 @@ fn stringify(
 
                 add_implicit_intersection(&mut new_node, true);
                 if matches!(&new_node, Node::ImplicitIntersection { .. }) {
-                    return stringify(
+                    return stringify(child, context, displace_data, export_to_excel);
-                        child,
-                        context,
-                        displace_data,
-                        export_to_excel,
-                        locale,
-                        language,
-                    );
                 }
 
                 return format!(
                     "_xlfn.SINGLE({})",
-                    stringify(
+                    stringify(child, context, displace_data, export_to_excel)
-                        child,
-                        context,
-                        displace_data,
-                        export_to_excel,
-                        locale,
-                        language
-                    )
                 );
             }
             format!(
                 "@{}",
-                stringify(
+                stringify(child, context, displace_data, export_to_excel)
-                    child,
-                    context,
-                    displace_data,
-                    export_to_excel,
-                    locale,
-                    language
-                )
             )
         }
     }

base/src/expressions/parser/tests/mod.rs

@@ -3,11 +3,7 @@ mod test_arrays;
 mod test_general;
 mod test_implicit_intersection;
 mod test_issue_155;
-mod test_issue_483;
-mod test_languages;
-mod test_locales;
 mod test_move_formula;
 mod test_ranges;
 mod test_stringify;
 mod test_tables;
-mod utils;

base/src/expressions/parser/tests/test_add_implicit_intersection.rs

@@ -2,8 +2,8 @@ use std::collections::HashMap;
 
 use crate::expressions::{
     parser::{
-        stringify::to_excel_string,
+        stringify::{to_excel_string, to_string},
-        tests::utils::{new_parser, to_english_localized_string},
+        Parser,
     },
     types::CellReferenceRC,
 };
@@ -13,7 +13,7 @@ use crate::expressions::parser::static_analysis::add_implicit_intersection;
 #[test]
 fn simple_test() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -72,7 +72,7 @@ fn simple_test() {
     for (formula, expected) in cases {
         let mut t = parser.parse(formula, &cell_reference);
         add_implicit_intersection(&mut t, true);
-        let r = to_english_localized_string(&t, &cell_reference);
+        let r = to_string(&t, &cell_reference);
         assert_eq!(r, expected);
         let excel_formula = to_excel_string(&t, &cell_reference);
         assert_eq!(excel_formula, formula);

base/src/expressions/parser/tests/test_arrays.rs

@@ -2,15 +2,14 @@
 
 use std::collections::HashMap;
 
-use crate::expressions::parser::stringify::to_rc_format;
+use crate::expressions::parser::stringify::{to_rc_format, to_string};
-use crate::expressions::parser::tests::utils::{new_parser, to_english_localized_string};
+use crate::expressions::parser::{ArrayNode, Node, Parser};
-use crate::expressions::parser::{ArrayNode, Node};
 use crate::expressions::types::CellReferenceRC;
 
 #[test]
 fn simple_horizontal() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -29,16 +28,13 @@ fn simple_horizontal() {
     );
 
     assert_eq!(to_rc_format(&horizontal), "{1,2,3}");
-    assert_eq!(
+    assert_eq!(to_string(&horizontal, &cell_reference), "{1,2,3}");
-        to_english_localized_string(&horizontal, &cell_reference),
-        "{1,2,3}"
-    );
 }
 
 #[test]
 fn simple_vertical() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -56,16 +52,13 @@ fn simple_vertical() {
         ])
     );
     assert_eq!(to_rc_format(&vertical), "{1;2;3}");
-    assert_eq!(
+    assert_eq!(to_string(&vertical, &cell_reference), "{1;2;3}");
-        to_english_localized_string(&vertical, &cell_reference),
-        "{1;2;3}"
-    );
 }
 
 #[test]
 fn simple_matrix() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -95,8 +88,5 @@ fn simple_matrix() {
         ])
     );
     assert_eq!(to_rc_format(&matrix), "{1,2,3;4,5,6;7,8,9}");
-    assert_eq!(
+    assert_eq!(to_string(&matrix, &cell_reference), "{1,2,3;4,5,6;7,8,9}");
-        to_english_localized_string(&matrix, &cell_reference),
-        "{1,2,3;4,5,6;7,8,9}"
-    );
 }

base/src/expressions/parser/tests/test_general.rs

@@ -3,12 +3,12 @@
 use std::collections::HashMap;
 
 use crate::expressions::lexer::LexerMode;
-use crate::expressions::parser::stringify::{to_rc_format, to_string_displaced, DisplaceData};
+use crate::expressions::parser::stringify::{
-use crate::expressions::parser::Node;
+    to_rc_format, to_string, to_string_displaced, DisplaceData,
+};
+use crate::expressions::parser::{Node, Parser};
 use crate::expressions::types::CellReferenceRC;
 
-use crate::expressions::parser::tests::utils::{new_parser, to_english_localized_string};
-
 struct Formula<'a> {
     initial: &'a str,
     expected: &'a str,
@@ -17,7 +17,7 @@ struct Formula<'a> {
 #[test]
 fn test_parser_reference() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -32,7 +32,7 @@ fn test_parser_reference() {
 #[test]
 fn test_parser_absolute_column() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -47,7 +47,7 @@ fn test_parser_absolute_column() {
 #[test]
 fn test_parser_absolute_row_col() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -62,7 +62,7 @@ fn test_parser_absolute_row_col() {
 #[test]
 fn test_parser_absolute_row_col_1() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -77,7 +77,7 @@ fn test_parser_absolute_row_col_1() {
 #[test]
 fn test_parser_simple_formula() {
     let worksheets = vec!["Sheet1".to_string(), "Sheet2".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -93,7 +93,7 @@ fn test_parser_simple_formula() {
 #[test]
 fn test_parser_boolean() {
     let worksheets = vec!["Sheet1".to_string(), "Sheet2".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -109,7 +109,7 @@ fn test_parser_boolean() {
 #[test]
 fn test_parser_bad_formula() {
     let worksheets = vec!["Sheet1".to_string(), "Sheet2".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -138,7 +138,7 @@ fn test_parser_bad_formula() {
 #[test]
 fn test_parser_bad_formula_1() {
     let worksheets = vec!["Sheet1".to_string(), "Sheet2".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -167,7 +167,7 @@ fn test_parser_bad_formula_1() {
 #[test]
 fn test_parser_bad_formula_2() {
     let worksheets = vec!["Sheet1".to_string(), "Sheet2".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -196,7 +196,7 @@ fn test_parser_bad_formula_2() {
 #[test]
 fn test_parser_bad_formula_3() {
     let worksheets = vec!["Sheet1".to_string(), "Sheet2".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -225,7 +225,7 @@ fn test_parser_bad_formula_3() {
 #[test]
 fn test_parser_formulas() {
     let worksheets = vec!["Sheet1".to_string(), "Sheet2".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     let formulas = vec![
         Formula {
@@ -266,17 +266,14 @@ fn test_parser_formulas() {
             },
         );
         assert_eq!(to_rc_format(&t), formula.expected);
-        assert_eq!(
+        assert_eq!(to_string(&t, &cell_reference), formula.initial);
-            to_english_localized_string(&t, &cell_reference),
-            formula.initial
-        );
     }
 }
 
 #[test]
 fn test_parser_r1c1_formulas() {
     let worksheets = vec!["Sheet1".to_string(), "Sheet2".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
     parser.set_lexer_mode(LexerMode::R1C1);
 
     let formulas = vec![
@@ -333,10 +330,7 @@ fn test_parser_r1c1_formulas() {
                 column: 1,
             },
         );
-        assert_eq!(
+        assert_eq!(to_string(&t, &cell_reference), formula.expected);
-            to_english_localized_string(&t, &cell_reference),
-            formula.expected
-        );
         assert_eq!(to_rc_format(&t), formula.initial);
     }
 }
@@ -344,7 +338,7 @@ fn test_parser_r1c1_formulas() {
 #[test]
 fn test_parser_quotes() {
     let worksheets = vec!["Sheet1".to_string(), "Second Sheet".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -360,7 +354,7 @@ fn test_parser_quotes() {
 #[test]
 fn test_parser_escape_quotes() {
     let worksheets = vec!["Sheet1".to_string(), "Second '2' Sheet".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -376,7 +370,7 @@ fn test_parser_escape_quotes() {
 #[test]
 fn test_parser_parenthesis() {
     let worksheets = vec!["Sheet1".to_string(), "Second2".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -392,7 +386,7 @@ fn test_parser_parenthesis() {
 #[test]
 fn test_parser_excel_xlfn() {
     let worksheets = vec!["Sheet1".to_string(), "Second2".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -413,7 +407,7 @@ fn test_to_string_displaced() {
         column: 1,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     let node = parser.parse("C3", context);
     let displace_data = DisplaceData::Column {
@@ -433,7 +427,7 @@ fn test_to_string_displaced_full_ranges() {
         column: 1,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     let node = parser.parse("SUM(3:3)", context);
     let displace_data = DisplaceData::Column {
@@ -466,7 +460,7 @@ fn test_to_string_displaced_too_low() {
         column: 1,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     let node = parser.parse("C3", context);
     let displace_data = DisplaceData::Column {
@@ -486,7 +480,7 @@ fn test_to_string_displaced_too_high() {
         column: 1,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     let node = parser.parse("C3", context);
     let displace_data = DisplaceData::Column {

base/src/expressions/parser/tests/test_implicit_intersection.rs

@@ -1,15 +1,13 @@
 #![allow(clippy::panic)]
 
-use crate::expressions::parser::Node;
+use crate::expressions::parser::{Node, Parser};
 use crate::expressions::types::CellReferenceRC;
 use std::collections::HashMap;
 
-use crate::expressions::parser::tests::utils::new_parser;
-
 #[test]
 fn simple() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!B3
     let cell_reference = CellReferenceRC {
@@ -42,7 +40,7 @@ fn simple() {
 #[test]
 fn simple_add() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!B3
     let cell_reference = CellReferenceRC {

base/src/expressions/parser/tests/test_issue_155.rs

@@ -2,13 +2,14 @@
 
 use std::collections::HashMap;
 
-use crate::expressions::parser::tests::utils::{new_parser, to_english_localized_string};
+use crate::expressions::parser::stringify::to_string;
+use crate::expressions::parser::Parser;
 use crate::expressions::types::CellReferenceRC;
 
 #[test]
 fn issue_155_parser() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -17,13 +18,13 @@ fn issue_155_parser() {
         column: 2,
     };
     let t = parser.parse("A$1:A2", &cell_reference);
-    assert_eq!(to_english_localized_string(&t, &cell_reference), "A$1:A2");
+    assert_eq!(to_string(&t, &cell_reference), "A$1:A2");
 }
 
 #[test]
 fn issue_155_parser_case_2() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -32,13 +33,13 @@ fn issue_155_parser_case_2() {
         column: 20,
     };
     let t = parser.parse("C$1:D2", &cell_reference);
-    assert_eq!(to_english_localized_string(&t, &cell_reference), "C$1:D2");
+    assert_eq!(to_string(&t, &cell_reference), "C$1:D2");
 }
 
 #[test]
 fn issue_155_parser_only_row() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -48,13 +49,13 @@ fn issue_155_parser_only_row() {
     };
     // This is tricky, I am not sure what to do in these cases
     let t = parser.parse("A$2:B1", &cell_reference);
-    assert_eq!(to_english_localized_string(&t, &cell_reference), "A1:B$2");
+    assert_eq!(to_string(&t, &cell_reference), "A1:B$2");
 }
 
 #[test]
 fn issue_155_parser_only_column() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -64,5 +65,5 @@ fn issue_155_parser_only_column() {
     };
     // This is tricky, I am not sure what to do in these cases
     let t = parser.parse("D1:$A3", &cell_reference);
-    assert_eq!(to_english_localized_string(&t, &cell_reference), "$A1:D3");
+    assert_eq!(to_string(&t, &cell_reference), "$A1:D3");
 }

base/src/expressions/parser/tests/test_issue_483.rs

@@ -1,30 +0,0 @@
-#![allow(clippy::panic)]
-
-use std::collections::HashMap;
-
-use crate::expressions::parser::tests::utils::{new_parser, to_english_localized_string};
-use crate::expressions::parser::Node;
-use crate::expressions::types::CellReferenceRC;
-
-#[test]
-fn issue_483_parser() {
-    let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
-
-    // Reference cell is Sheet1!A1
-    let cell_reference = CellReferenceRC {
-        sheet: "Sheet1".to_string(),
-        row: 2,
-        column: 2,
-    };
-    let t = parser.parse("-(A1^1.22)", &cell_reference);
-    assert!(matches!(t, Node::UnaryKind { .. }));
-    assert_eq!(
-        to_english_localized_string(&t, &cell_reference),
-        "-(A1^1.22)"
-    );
-
-    let t = parser.parse("-A1^1.22", &cell_reference);
-    assert!(matches!(t, Node::OpPowerKind { .. }));
-    assert_eq!(to_english_localized_string(&t, &cell_reference), "-A1^1.22");
-}

base/src/expressions/parser/tests/test_languages.rs

@@ -1,58 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use std::collections::HashMap;
-
-use crate::expressions::parser::{DefinedNameS, Node, Parser};
-use crate::expressions::types::CellReferenceRC;
-
-use crate::expressions::parser::stringify::to_localized_string;
-use crate::functions::Function;
-use crate::language::get_language;
-use crate::locale::get_locale;
-use crate::types::Table;
-
-pub fn to_string(t: &Node, cell_reference: &CellReferenceRC) -> String {
-    let locale = get_locale("en").unwrap();
-    let language = get_language("es").unwrap();
-    to_localized_string(t, cell_reference, locale, language)
-}
-
-pub fn new_parser<'a>(
-    worksheets: Vec<String>,
-    defined_names: Vec<DefinedNameS>,
-    tables: HashMap<String, Table>,
-) -> Parser<'a> {
-    let locale = get_locale("en").unwrap();
-    let language = get_language("es").unwrap();
-    Parser::new(worksheets, defined_names, tables, locale, language)
-}
-
-#[test]
-fn simple_language() {
-    let worksheets = vec!["Sheet1".to_string(), "Second Sheet".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
-    // Reference cell is Sheet1!A1
-    let cell_reference = CellReferenceRC {
-        sheet: "Sheet1".to_string(),
-        row: 1,
-        column: 1,
-    };
-    let t = parser.parse("FALSO", &cell_reference);
-    assert!(matches!(t, Node::BooleanKind(false)));
-
-    let t = parser.parse("VERDADERO", &cell_reference);
-    assert!(matches!(t, Node::BooleanKind(true)));
-
-    let t = parser.parse("TRUE()", &cell_reference);
-    assert!(matches!(t, Node::InvalidFunctionKind { ref name, args: _} if name == "TRUE"));
-
-    let t = parser.parse("VERDADERO()", &cell_reference);
-    assert!(matches!(
-        t,
-        Node::FunctionKind {
-            kind: Function::True,
-            args: _
-        }
-    ));
-    assert_eq!(to_string(&t, &cell_reference), "VERDADERO()".to_string());
-}

base/src/expressions/parser/tests/test_locales.rs

@@ -1 +0,0 @@
-

base/src/expressions/parser/tests/test_move_formula.rs

@@ -1,17 +1,8 @@
 use std::collections::HashMap;
 
-use crate::expressions::parser::move_formula::{move_formula as mf, MoveContext};
+use crate::expressions::parser::move_formula::{move_formula, MoveContext};
-use crate::expressions::parser::tests::utils::new_parser;
+use crate::expressions::parser::Parser;
-use crate::expressions::parser::Node;
 use crate::expressions::types::{Area, CellReferenceRC};
-use crate::language::get_default_language;
-use crate::locale::get_default_locale;
-
-fn move_formula(node: &Node, context: &MoveContext) -> String {
-    let locale = get_default_locale();
-    let language = get_default_language();
-    mf(node, context, locale, language)
-}
 
 #[test]
 fn test_move_formula() {
@@ -24,7 +15,7 @@ fn test_move_formula() {
         column,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Area is C2:F6
     let area = &Area {
@@ -111,7 +102,7 @@ fn test_move_formula_context_offset() {
         column,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Area is C2:F6
     let area = &Area {
@@ -149,7 +140,7 @@ fn test_move_formula_area_limits() {
         column,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Area is C2:F6
     let area = &Area {
@@ -204,7 +195,7 @@ fn test_move_formula_ranges() {
         column,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     let area = &Area {
         sheet: 0,
@@ -327,7 +318,7 @@ fn test_move_formula_wrong_reference() {
         height: 5,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Wrong formulas will NOT be displaced
     let node = parser.parse("Sheet3!AB31", context);
@@ -386,7 +377,7 @@ fn test_move_formula_misc() {
         column,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Area is C2:F6
     let area = &Area {
@@ -454,7 +445,7 @@ fn test_move_formula_another_sheet() {
     };
     // we add two sheets and we cut/paste from Sheet1 to Sheet2
     let worksheets = vec!["Sheet1".to_string(), "Sheet2".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Area is C2:F6
     let area = &Area {
@@ -496,7 +487,7 @@ fn move_formula_implicit_intersetion() {
         column,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Area is C2:F6
     let area = &Area {
@@ -533,7 +524,7 @@ fn move_formula_implicit_intersetion_with_ranges() {
         column,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Area is C2:F6
     let area = &Area {

base/src/expressions/parser/tests/test_ranges.rs

@@ -2,8 +2,8 @@ use std::collections::HashMap;
 
 use crate::expressions::lexer::LexerMode;
 
-use crate::expressions::parser::stringify::to_rc_format;
+use crate::expressions::parser::stringify::{to_rc_format, to_string};
-use crate::expressions::parser::tests::utils::{new_parser, to_english_localized_string};
+use crate::expressions::parser::Parser;
 use crate::expressions::types::CellReferenceRC;
 
 struct Formula<'a> {
@@ -14,7 +14,7 @@ struct Formula<'a> {
 #[test]
 fn test_parser_formulas_with_full_ranges() {
     let worksheets = vec!["Sheet1".to_string(), "Second Sheet".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     let formulas = vec![
         Formula {
@@ -59,10 +59,7 @@ fn test_parser_formulas_with_full_ranges() {
             },
         );
         assert_eq!(to_rc_format(&t), formula.formula_r1c1);
-        assert_eq!(
+        assert_eq!(to_string(&t, &cell_reference), formula.formula_a1);
-            to_english_localized_string(&t, &cell_reference),
-            formula.formula_a1
-        );
     }
 
     // Now the inverse
@@ -77,17 +74,14 @@ fn test_parser_formulas_with_full_ranges() {
             },
         );
         assert_eq!(to_rc_format(&t), formula.formula_r1c1);
-        assert_eq!(
+        assert_eq!(to_string(&t, &cell_reference), formula.formula_a1);
-            to_english_localized_string(&t, &cell_reference),
-            formula.formula_a1
-        );
     }
 }
 
 #[test]
 fn test_range_inverse_order() {
     let worksheets = vec!["Sheet1".to_string(), "Sheet2".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -102,7 +96,7 @@ fn test_range_inverse_order() {
         &cell_reference,
     );
     assert_eq!(
-        to_english_localized_string(&t, &cell_reference),
+        to_string(&t, &cell_reference),
         "SUM(C2:D4)*SUM(Sheet2!C4:D20)*SUM($C4:D$20)".to_string()
     );
 }

base/src/expressions/parser/tests/test_stringify.rs

@@ -2,13 +2,14 @@
 
 use std::collections::HashMap;
 
-use crate::expressions::parser::tests::utils::{new_parser, to_english_localized_string};
+use crate::expressions::parser::stringify::to_string;
+use crate::expressions::parser::Parser;
 use crate::expressions::types::CellReferenceRC;
 
 #[test]
 fn exp_order() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -17,34 +18,25 @@ fn exp_order() {
         column: 1,
     };
     let t = parser.parse("(1 + 2)^3  + 4", &cell_reference);
-    assert_eq!(
+    assert_eq!(to_string(&t, &cell_reference), "(1+2)^3+4");
-        to_english_localized_string(&t, &cell_reference),
-        "(1+2)^3+4"
-    );
 
     let t = parser.parse("(C5 + 3)^R4", &cell_reference);
-    assert_eq!(
+    assert_eq!(to_string(&t, &cell_reference), "(C5+3)^R4");
-        to_english_localized_string(&t, &cell_reference),
-        "(C5+3)^R4"
-    );
 
     let t = parser.parse("(C5 + 3)^(R4*6)", &cell_reference);
-    assert_eq!(
+    assert_eq!(to_string(&t, &cell_reference), "(C5+3)^(R4*6)");
-        to_english_localized_string(&t, &cell_reference),
-        "(C5+3)^(R4*6)"
-    );
 
     let t = parser.parse("(C5)^(R4)", &cell_reference);
-    assert_eq!(to_english_localized_string(&t, &cell_reference), "C5^R4");
+    assert_eq!(to_string(&t, &cell_reference), "C5^R4");
 
     let t = parser.parse("(5)^(4)", &cell_reference);
-    assert_eq!(to_english_localized_string(&t, &cell_reference), "5^4");
+    assert_eq!(to_string(&t, &cell_reference), "5^4");
 }
 
 #[test]
 fn correct_parenthesis() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = new_parser(worksheets, vec![], HashMap::new());
+    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
 
     let cell_reference = CellReferenceRC {
         sheet: "Sheet1".to_string(),
@@ -53,29 +45,26 @@ fn correct_parenthesis() {
     };
 
     let t = parser.parse("-(1 + 1)", &cell_reference);
-    assert_eq!(to_english_localized_string(&t, &cell_reference), "-(1+1)");
+    assert_eq!(to_string(&t, &cell_reference), "-(1+1)");
 
     let t = parser.parse("1 - (3 + 4)", &cell_reference);
-    assert_eq!(to_english_localized_string(&t, &cell_reference), "1-(3+4)");
+    assert_eq!(to_string(&t, &cell_reference), "1-(3+4)");
 
     let t = parser.parse("-(1.05*(0.0284 + 0.0046) - 0.0284)", &cell_reference);
     assert_eq!(
-        to_english_localized_string(&t, &cell_reference),
+        to_string(&t, &cell_reference),
         "-(1.05*(0.0284+0.0046)-0.0284)"
     );
 
     let t = parser.parse("1 + (3+5)", &cell_reference);
-    assert_eq!(to_english_localized_string(&t, &cell_reference), "1+3+5");
+    assert_eq!(to_string(&t, &cell_reference), "1+3+5");
 
     let t = parser.parse("1 - (3+5)", &cell_reference);
-    assert_eq!(to_english_localized_string(&t, &cell_reference), "1-(3+5)");
+    assert_eq!(to_string(&t, &cell_reference), "1-(3+5)");
 
     let t = parser.parse("(1 - 3) - (3+5)", &cell_reference);
-    assert_eq!(
+    assert_eq!(to_string(&t, &cell_reference), "1-3-(3+5)");
-        to_english_localized_string(&t, &cell_reference),
-        "1-3-(3+5)"
-    );
 
     let t = parser.parse("1 + (3<5)", &cell_reference);
-    assert_eq!(to_english_localized_string(&t, &cell_reference), "1+(3<5)");
+    assert_eq!(to_string(&t, &cell_reference), "1+(3<5)");
 }

base/src/expressions/parser/tests/test_tables.rs

@@ -2,7 +2,8 @@
 
 use std::collections::HashMap;
 
-use crate::expressions::parser::tests::utils::{new_parser, to_english_localized_string};
+use crate::expressions::parser::stringify::to_string;
+use crate::expressions::parser::Parser;
 use crate::expressions::types::CellReferenceRC;
 use crate::expressions::utils::{number_to_column, parse_reference_a1};
 use crate::types::{Table, TableColumn, TableStyleInfo};
@@ -61,7 +62,7 @@ fn simple_table() {
     let row_count = 3;
     let tables = create_test_table("tblIncome", &column_names, "A1", row_count);
 
-    let mut parser = new_parser(worksheets, vec![], tables);
+    let mut parser = Parser::new(worksheets, vec![], tables);
     // Reference cell is 'Sheet One'!F2
     let cell_reference = CellReferenceRC {
         sheet: "Sheet One".to_string(),
@@ -71,10 +72,7 @@ fn simple_table() {
 
     let formula = "SUM(tblIncome[[#This Row],[Jan]:[Dec]])";
     let t = parser.parse(formula, &cell_reference);
-    assert_eq!(
+    assert_eq!(to_string(&t, &cell_reference), "SUM($A$2:$E$2)");
-        to_english_localized_string(&t, &cell_reference),
-        "SUM($A$2:$E$2)"
-    );
 
     // Cell A3
     let cell_reference = CellReferenceRC {
@@ -84,10 +82,7 @@ fn simple_table() {
     };
     let formula = "SUBTOTAL(109, tblIncome[Jan])";
     let t = parser.parse(formula, &cell_reference);
-    assert_eq!(
+    assert_eq!(to_string(&t, &cell_reference), "SUBTOTAL(109,$A$2:$A$3)");
-        to_english_localized_string(&t, &cell_reference),
-        "SUBTOTAL(109,$A$2:$A$3)"
-    );
 
     // Cell A3 in 'Second Sheet'
     let cell_reference = CellReferenceRC {
@@ -98,7 +93,7 @@ fn simple_table() {
     let formula = "SUBTOTAL(109, tblIncome[Jan])";
     let t = parser.parse(formula, &cell_reference);
     assert_eq!(
-        to_english_localized_string(&t, &cell_reference),
+        to_string(&t, &cell_reference),
         "SUBTOTAL(109,'Sheet One'!$A$2:$A$3)"
     );
 }

base/src/expressions/parser/tests/utils.rs

@@ -1,29 +0,0 @@
-use std::collections::HashMap;
-
-use crate::{
-    expressions::{
-        parser::{DefinedNameS, Node, Parser},
-        types::CellReferenceRC,
-    },
-    language::get_default_language,
-    locale::get_default_locale,
-    types::Table,
-};
-
-use crate::expressions::parser::stringify::to_localized_string;
-
-pub fn to_english_localized_string(t: &Node, cell_reference: &CellReferenceRC) -> String {
-    let locale = get_default_locale();
-    let language = get_default_language();
-    to_localized_string(t, cell_reference, locale, language)
-}
-
-pub fn new_parser<'a>(
-    worksheets: Vec<String>,
-    defined_names: Vec<DefinedNameS>,
-    tables: HashMap<String, Table>,
-) -> Parser<'a> {
-    let locale = get_default_locale();
-    let language = get_default_language();
-    Parser::new(worksheets, defined_names, tables, locale, language)
-}

base/src/expressions/token.rs

@@ -241,7 +241,6 @@ pub enum TokenType {
     Percent,            // %
     And,                // &
     At,                 // @
-    Backslash,          // \
     Reference {
         sheet: Option<String>,
         row: i32,

base/src/expressions/utils/mod.rs

@@ -211,19 +211,15 @@ pub fn parse_reference_a1(r: &str) -> Option<ParsedReference> {
 pub fn is_valid_identifier(name: &str) -> bool {
     // https://support.microsoft.com/en-us/office/names-in-formulas-fc2935f9-115d-4bef-a370-3aa8bb4c91f1
     // https://github.com/MartinTrummer/excel-names/
+    // NOTE: We are being much more restrictive than Excel.
+    // In particular we do not support non ascii characters.
     let upper = name.to_ascii_uppercase();
-    // length of chars
+    let bytes = upper.as_bytes();
-    let len = upper.chars().count();
+    let len = bytes.len();
-
-    let mut chars = upper.chars();
-
     if len > 255 || len == 0 {
         return false;
     }
-    let first = match chars.next() {
+    let first = bytes[0] as char;
-        Some(ch) => ch,
-        None => return false,
-    };
     // The first character of a name must be a letter, an underscore character (_), or a backslash (\).
     if !(first.is_ascii_alphabetic() || first == '_' || first == '\\') {
         return false;
@@ -241,10 +237,20 @@ pub fn is_valid_identifier(name: &str) -> bool {
     if parse_reference_r1c1(name).is_some() {
         return false;
     }
-    for ch in chars {
+    let mut i = 1;
-        if !(ch.is_alphanumeric() || ch == '_' || ch == '.') {
+    while i < len {
-            return false;
+        let ch = bytes[i] as char;
+        match ch {
+            'a'..='z' => {}
+            'A'..='Z' => {}
+            '0'..='9' => {}
+            '_' => {}
+            '.' => {}
+            _ => {
+                return false;
+            }
         }
+        i += 1;
     }
 
     true
@@ -253,23 +259,15 @@ pub fn is_valid_identifier(name: &str) -> bool {
 fn name_needs_quoting(name: &str) -> bool {
     let chars = name.chars();
     // it contains any of these characters: ()'$,;-+{} or space
-    for (i, char) in chars.enumerate() {
+    for char in chars {
         if [' ', '(', ')', '\'', '$', ',', ';', '-', '+', '{', '}'].contains(&char) {
             return true;
         }
-        // if it starts with a number
-        if i == 0 && char.is_ascii_digit() {
-            return true;
-        }
-    }
-    if parse_reference_a1(name).is_some() {
-        // cell reference in A1 notation, e.g. B1048576 is quoted, B1048577 is not
-        return true;
-    }
-    if parse_reference_r1c1(name).is_some() {
-        // cell reference in R1C1 notation, e.g. RC, RC2, R5C, R-4C, RC-8, R, C
-        return true;
     }
+    // TODO:
+    // cell reference in A1 notation, e.g. B1048576 is quoted, B1048577 is not
+    // cell reference in R1C1 notation, e.g. RC, RC2, R5C, R-4C, RC-8, R, C
+    // integers
     false
 }
 
@@ -281,32 +279,3 @@ pub fn quote_name(name: &str) -> String {
     };
     name.to_string()
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_quote_name() {
-        assert_eq!(quote_name("Sheet1"), "Sheet1");
-        assert_eq!(quote_name("Sheet 1"), "'Sheet 1'");
-        // escape and quote
-        assert_eq!(quote_name("Sheet1'"), "'Sheet1'''");
-        assert_eq!(quote_name("Data(2024)"), "'Data(2024)'");
-        assert_eq!(quote_name("Data$2024"), "'Data$2024'");
-        assert_eq!(quote_name("Data-2024"), "'Data-2024'");
-        assert_eq!(quote_name("Data+2024"), "'Data+2024'");
-        assert_eq!(quote_name("Data,2024"), "'Data,2024'");
-        assert_eq!(quote_name("Data;2024"), "'Data;2024'");
-        assert_eq!(quote_name("Data{2024}"), "'Data{2024}'");
-
-        assert_eq!(quote_name("2024"), "'2024'");
-        assert_eq!(quote_name("1Data"), "'1Data'");
-        assert_eq!(quote_name("A1"), "'A1'");
-        assert_eq!(quote_name("R1C1"), "'R1C1'");
-        assert_eq!(quote_name("MySheet"), "MySheet");
-
-        assert_eq!(quote_name("B1048576"), "'B1048576'");
-        assert_eq!(quote_name("B1048577"), "B1048577");
-    }
-}

base/src/expressions/utils/test.rs

@@ -196,7 +196,6 @@ fn test_names() {
     assert!(is_valid_identifier("_."));
     assert!(is_valid_identifier("_1"));
     assert!(is_valid_identifier("\\."));
-    assert!(is_valid_identifier("truñe"));
 
     // invalid
     assert!(!is_valid_identifier("true"));
@@ -210,6 +209,7 @@ fn test_names() {
     assert!(!is_valid_identifier("1true"));
 
     assert!(!is_valid_identifier("test€"));
+    assert!(!is_valid_identifier("truñe"));
     assert!(!is_valid_identifier("tr&ue"));
 
     assert!(!is_valid_identifier("LOG10"));

base/src/formatter/dates.rs

@@ -8,8 +8,6 @@ use crate::constants::EXCEL_DATE_BASE;
 use crate::constants::MAXIMUM_DATE_SERIAL_NUMBER;
 use crate::constants::MINIMUM_DATE_SERIAL_NUMBER;
 
-pub const DATE_OUT_OF_RANGE_MESSAGE: &str = "Out of range parameters for date";
-
 #[inline]
 fn convert_to_serial_number(date: NaiveDate) -> i32 {
     date.num_days_from_ce() - EXCEL_DATE_BASE
@@ -39,7 +37,7 @@ pub fn from_excel_date(days: i64) -> Result<NaiveDate, String> {
 pub fn date_to_serial_number(day: u32, month: u32, year: i32) -> Result<i32, String> {
     match NaiveDate::from_ymd_opt(year, month, day) {
         Some(native_date) => Ok(convert_to_serial_number(native_date)),
-        None => Err(DATE_OUT_OF_RANGE_MESSAGE.to_string()),
+        None => Err("Out of range parameters for date".to_string()),
     }
 }
 
@@ -57,7 +55,7 @@ pub fn permissive_date_to_serial_number(day: i32, month: i32, year: i32) -> Resu
         return Ok(MINIMUM_DATE_SERIAL_NUMBER);
     }
     let Some(mut date) = NaiveDate::from_ymd_opt(year, 1, 1) else {
-        return Err(DATE_OUT_OF_RANGE_MESSAGE.to_string());
+        return Err("Out of range parameters for date".to_string());
     };
 
     // One thing to note for example is that even if you started with a year out of range
@@ -70,7 +68,7 @@ pub fn permissive_date_to_serial_number(day: i32, month: i32, year: i32) -> Resu
     // As a result, we have to run range checks as we parse the date from the biggest unit to the
     // smallest unit.
     if !is_date_within_range(date) {
-        return Err(DATE_OUT_OF_RANGE_MESSAGE.to_string());
+        return Err("Out of range parameters for date".to_string());
     }
 
     date = {
@@ -82,7 +80,7 @@ pub fn permissive_date_to_serial_number(day: i32, month: i32, year: i32) -> Resu
             date = date + Months::new(abs_month);
         }
         if !is_date_within_range(date) {
-            return Err(DATE_OUT_OF_RANGE_MESSAGE.to_string());
+            return Err("Out of range parameters for date".to_string());
         }
         date
     };
@@ -96,7 +94,7 @@ pub fn permissive_date_to_serial_number(day: i32, month: i32, year: i32) -> Resu
             date = date + Days::new(abs_day);
         }
         if !is_date_within_range(date) {
-            return Err(DATE_OUT_OF_RANGE_MESSAGE.to_string());
+            return Err("Out of range parameters for date".to_string());
         }
         date
     };

base/src/formatter/format.rs

@@ -15,7 +15,7 @@ pub struct Formatted {
 
 /// Returns the vector of chars of the fractional part of a *positive* number:
 /// 3.1415926 ==> ['1', '4', '1', '5', '9', '2', '6']
-fn get_fract_part(value: f64, precision: i32, int_len: usize) -> Vec<char> {
+fn get_fract_part(value: f64, precision: i32) -> Vec<char> {
     let b = format!("{:.1$}", value.fract(), precision as usize)
         .chars()
         .collect::<Vec<char>>();
@@ -30,12 +30,6 @@ fn get_fract_part(value: f64, precision: i32, int_len: usize) -> Vec<char> {
     if last_non_zero < 2 {
         return vec![];
     }
-    let max_len = if int_len > 15 {
-        2_usize
-    } else {
-        15_usize - int_len + 1
-    };
-    let last_non_zero = usize::min(last_non_zero, max_len + 1);
     b[2..last_non_zero].to_vec()
 }
 
@@ -128,9 +122,6 @@ pub fn format_number(value_original: f64, format: &str, locale: &Locale) -> Form
             if (1.0e-8..1.0e+11).contains(&value_abs) {
                 let mut text = format!("{value:.9}");
                 text = text.trim_end_matches('0').trim_end_matches('.').to_string();
-                if locale.numbers.symbols.decimal != "." {
-                    text = text.replace('.', &locale.numbers.symbols.decimal.to_string());
-                }
                 Formatted {
                     text,
                     color: None,
@@ -148,17 +139,13 @@ pub fn format_number(value_original: f64, format: &str, locale: &Locale) -> Form
                 value /= 10.0_f64.powf(exponent);
                 let sign = if exponent < 0.0 { '-' } else { '+' };
                 let s = format!("{value:.5}");
-                let mut text = format!(
-                    "{}E{}{:02}",
-                    s.trim_end_matches('0').trim_end_matches('.'),
-                    sign,
-                    exponent.abs()
-                );
-                if locale.numbers.symbols.decimal != "." {
-                    text = text.replace('.', &locale.numbers.symbols.decimal.to_string());
-                }
                 Formatted {
-                    text,
+                    text: format!(
+                        "{}E{}{:02}",
+                        s.trim_end_matches('0').trim_end_matches('.'),
+                        sign,
+                        exponent.abs()
+                    ),
                     color: None,
                     error: None,
                 }
@@ -167,11 +154,16 @@ pub fn format_number(value_original: f64, format: &str, locale: &Locale) -> Form
         ParsePart::Date(p) => {
             let tokens = &p.tokens;
             let mut text = "".to_string();
-            let time_fract = value.fract();
+            let date = match from_excel_date(value as i64) {
-            let hours = (time_fract * 24.0).floor();
+                Ok(d) => d,
-            let minutes = ((time_fract * 24.0 - hours) * 60.0).floor();
+                Err(e) => {
-            let seconds = ((((time_fract * 24.0 - hours) * 60.0) - minutes) * 60.0).round();
+                    return Formatted {
-            let date = from_excel_date(value as i64).ok();
+                        text: "#VALUE!".to_owned(),
+                        color: None,
+                        error: Some(e),
+                    }
+                }
+            };
             for token in tokens {
                 match token {
                     TextToken::Literal(c) => {
@@ -195,44 +187,15 @@ pub fn format_number(value_original: f64, format: &str, locale: &Locale) -> Form
                     }
                     TextToken::Digit(_) => {}
                     TextToken::Period => {}
-                    TextToken::Day => match date {
+                    TextToken::Day => {
-                        Some(date) => {
+                        let day = date.day() as usize;
-                            let day = date.day() as usize;
+                        text = format!("{text}{day}");
-                            text = format!("{text}{day}");
+                    }
-                        }
-                        None => {
-                            return Formatted {
-                                text: "#VALUE!".to_owned(),
-                                color: None,
-                                error: Some(format!("Invalid date value: '{value}'")),
-                            }
-                        }
-                    },
                     TextToken::DayPadded => {
-                        let date = match date {
-                            Some(d) => d,
-                            None => {
-                                return Formatted {
-                                    text: "#VALUE!".to_owned(),
-                                    color: None,
-                                    error: Some(format!("Invalid date value: '{value}'")),
-                                }
-                            }
-                        };
                         let day = date.day() as usize;
                         text = format!("{text}{day:02}");
                     }
                     TextToken::DayNameShort => {
-                        let date = match date {
-                            Some(d) => d,
-                            None => {
-                                return Formatted {
-                                    text: "#VALUE!".to_owned(),
-                                    color: None,
-                                    error: Some(format!("Invalid date value: '{value}'")),
-                                }
-                            }
-                        };
                         let mut day = date.weekday().number_from_monday() as usize;
                         if day == 7 {
                             day = 0;
@@ -240,16 +203,6 @@ pub fn format_number(value_original: f64, format: &str, locale: &Locale) -> Form
                         text = format!("{}{}", text, &locale.dates.day_names_short[day]);
                     }
                     TextToken::DayName => {
-                        let date = match date {
-                            Some(d) => d,
-                            None => {
-                                return Formatted {
-                                    text: "#VALUE!".to_owned(),
-                                    color: None,
-                                    error: Some(format!("Invalid date value: '{value}'")),
-                                }
-                            }
-                        };
                         let mut day = date.weekday().number_from_monday() as usize;
                         if day == 7 {
                             day = 0;
@@ -257,144 +210,32 @@ pub fn format_number(value_original: f64, format: &str, locale: &Locale) -> Form
                         text = format!("{}{}", text, &locale.dates.day_names[day]);
                     }
                     TextToken::Month => {
-                        let date = match date {
-                            Some(d) => d,
-                            None => {
-                                return Formatted {
-                                    text: "#VALUE!".to_owned(),
-                                    color: None,
-                                    error: Some(format!("Invalid date value: '{value}'")),
-                                }
-                            }
-                        };
                         let month = date.month() as usize;
                         text = format!("{text}{month}");
                     }
                     TextToken::MonthPadded => {
-                        let date = match date {
-                            Some(d) => d,
-                            None => {
-                                return Formatted {
-                                    text: "#VALUE!".to_owned(),
-                                    color: None,
-                                    error: Some(format!("Invalid date value: '{value}'")),
-                                }
-                            }
-                        };
                         let month = date.month() as usize;
                         text = format!("{text}{month:02}");
                     }
                     TextToken::MonthNameShort => {
-                        let date = match date {
-                            Some(d) => d,
-                            None => {
-                                return Formatted {
-                                    text: "#VALUE!".to_owned(),
-                                    color: None,
-                                    error: Some(format!("Invalid date value: '{value}'")),
-                                }
-                            }
-                        };
                         let month = date.month() as usize;
                         text = format!("{}{}", text, &locale.dates.months_short[month - 1]);
                     }
                     TextToken::MonthName => {
-                        let date = match date {
-                            Some(d) => d,
-                            None => {
-                                return Formatted {
-                                    text: "#VALUE!".to_owned(),
-                                    color: None,
-                                    error: Some(format!("Invalid date value: '{value}'")),
-                                }
-                            }
-                        };
                         let month = date.month() as usize;
                         text = format!("{}{}", text, &locale.dates.months[month - 1]);
                     }
                     TextToken::MonthLetter => {
-                        let date = match date {
-                            Some(d) => d,
-                            None => {
-                                return Formatted {
-                                    text: "#VALUE!".to_owned(),
-                                    color: None,
-                                    error: Some(format!("Invalid date value: '{value}'")),
-                                }
-                            }
-                        };
                         let month = date.month() as usize;
                         let months_letter = &locale.dates.months_letter[month - 1];
                         text = format!("{text}{months_letter}");
                     }
                     TextToken::YearShort => {
-                        let date = match date {
-                            Some(d) => d,
-                            None => {
-                                return Formatted {
-                                    text: "#VALUE!".to_owned(),
-                                    color: None,
-                                    error: Some(format!("Invalid date value: '{value}'")),
-                                }
-                            }
-                        };
                         text = format!("{}{}", text, date.format("%y"));
                     }
                     TextToken::Year => {
-                        let date = match date {
-                            Some(d) => d,
-                            None => {
-                                return Formatted {
-                                    text: "#VALUE!".to_owned(),
-                                    color: None,
-                                    error: Some(format!("Invalid date value: '{value}'")),
-                                }
-                            }
-                        };
                         text = format!("{}{}", text, date.year());
                     }
-                    TextToken::Hour => {
-                        let mut hour = hours as i32;
-                        if p.use_ampm {
-                            if hour == 0 {
-                                hour = 12;
-                            } else if hour > 12 {
-                                hour -= 12;
-                            }
-                        }
-                        text = format!("{text}{hour}");
-                    }
-                    TextToken::HourPadded => {
-                        let mut hour = hours as i32;
-                        if p.use_ampm {
-                            if hour == 0 {
-                                hour = 12;
-                            } else if hour > 12 {
-                                hour -= 12;
-                            }
-                        }
-                        text = format!("{text}{hour:02}");
-                    }
-                    TextToken::Second => {
-                        let second = seconds as i32;
-                        text = format!("{text}{second}");
-                    }
-                    TextToken::SecondPadded => {
-                        let second = seconds as i32;
-                        text = format!("{text}{second:02}");
-                    }
-                    TextToken::AMPM => {
-                        let ampm = if hours < 12.0 { "AM" } else { "PM" };
-                        text = format!("{text}{ampm}");
-                    }
-                    TextToken::Minute => {
-                        let minute = minutes as i32;
-                        text = format!("{text}{minute}");
-                    }
-                    TextToken::MinutePadded => {
-                        let minute = minutes as i32;
-                        text = format!("{text}{minute:02}");
-                    }
                 }
             }
             Formatted {
@@ -436,7 +277,7 @@ pub fn format_number(value_original: f64, format: &str, locale: &Locale) -> Form
             if value_abs as i64 == 0 {
                 int_part = vec![];
             }
-            let fract_part = get_fract_part(value_abs, p.precision, int_part.len());
+            let fract_part = get_fract_part(value_abs, p.precision);
             // ln is the number of digits of the integer part of the value
             let ln = int_part.len() as i32;
             // digit count is the number of digit tokens ('0', '?' and '#') to the left of the decimal point
@@ -581,13 +422,6 @@ pub fn format_number(value_original: f64, format: &str, locale: &Locale) -> Form
                     TextToken::MonthLetter => {}
                     TextToken::YearShort => {}
                     TextToken::Year => {}
-                    TextToken::Hour => {}
-                    TextToken::HourPadded => {}
-                    TextToken::Minute => {}
-                    TextToken::MinutePadded => {}
-                    TextToken::Second => {}
-                    TextToken::SecondPadded => {}
-                    TextToken::AMPM => {}
                 }
             }
             Formatted {
@@ -757,17 +591,15 @@ fn parse_date(value: &str) -> Result<(i32, String), String> {
 /// "30.34%" => (0.3034, "0.00%")
 /// 100€ => (100, "100€")
 pub(crate) fn parse_formatted_number(
-    original: &str,
+    value: &str,
     currencies: &[&str],
-    decimal_separator: u8,
-    group_separator: u8,
 ) -> Result<(f64, Option<String>), String> {
-    let value = original.trim();
+    let value = value.trim();
     let scientific_format = "0.00E+00";
 
     // Check if it is a percentage
     if let Some(p) = value.strip_suffix('%') {
-        let (f, options) = parse_number(p.trim(), decimal_separator, group_separator)?;
+        let (f, options) = parse_number(p.trim())?;
         if options.is_scientific {
             return Ok((f / 100.0, Some(scientific_format.to_string())));
         }
@@ -783,7 +615,7 @@ pub(crate) fn parse_formatted_number(
     // check if it is a currency in currencies
     for currency in currencies {
         if let Some(p) = value.strip_prefix(&format!("-{currency}")) {
-            let (f, options) = parse_number(p.trim(), decimal_separator, group_separator)?;
+            let (f, options) = parse_number(p.trim())?;
             if options.is_scientific {
                 return Ok((f, Some(scientific_format.to_string())));
             }
@@ -792,7 +624,7 @@ pub(crate) fn parse_formatted_number(
             }
             return Ok((-f, Some(format!("{currency}#,##0"))));
         } else if let Some(p) = value.strip_prefix(currency) {
-            let (f, options) = parse_number(p.trim(), decimal_separator, group_separator)?;
+            let (f, options) = parse_number(p.trim())?;
             if options.is_scientific {
                 return Ok((f, Some(scientific_format.to_string())));
             }
@@ -801,7 +633,7 @@ pub(crate) fn parse_formatted_number(
             }
             return Ok((f, Some(format!("{currency}#,##0"))));
         } else if let Some(p) = value.strip_suffix(currency) {
-            let (f, options) = parse_number(p.trim(), decimal_separator, group_separator)?;
+            let (f, options) = parse_number(p.trim())?;
             if options.is_scientific {
                 return Ok((f, Some(scientific_format.to_string())));
             }
@@ -814,13 +646,12 @@ pub(crate) fn parse_formatted_number(
         }
     }
 
-    // check if it is a date. NOTE: we don't trim the original here
+    if let Ok((serial_number, format)) = parse_date(value) {
-    if let Ok((serial_number, format)) = parse_date(original) {
         return Ok((serial_number as f64, Some(format)));
     }
 
     // Lastly we check if it is a number
-    let (f, options) = parse_number(value, decimal_separator, group_separator)?;
+    let (f, options) = parse_number(value)?;
     if options.is_scientific {
         return Ok((f, Some(scientific_format.to_string())));
     }
@@ -843,11 +674,7 @@ struct NumberOptions {
 
 // tries to parse 'value' as a number.
 // If it is a number it either uses commas as thousands separator or it does not
-fn parse_number(
+fn parse_number(value: &str) -> Result<(f64, NumberOptions), String> {
-    value: &str,
-    decimal_separator: u8,
-    group_separator: u8,
-) -> Result<(f64, NumberOptions), String> {
     let mut position = 0;
     let bytes = value.as_bytes();
     let len = bytes.len();
@@ -855,6 +682,8 @@ fn parse_number(
         return Err("Cannot parse number".to_string());
     }
     let mut chars = String::from("");
+    let decimal_separator = b'.';
+    let group_separator = b',';
     let mut group_separator_index = Vec::new();
     // get the sign
     let sign = if bytes[0] == b'-' {

base/src/formatter/lexer.rs

@@ -26,23 +26,19 @@ pub enum Token {
     Scientific,    // E+
     ScientificMinus, // E-
     General,       // General
-    // Dates and time
+    // Dates
     Day,            // d
     DayPadded,      // dd
     DayNameShort,   // ddd
     DayName,        // dddd+
-    Month,          // m (or minute)
+    Month,          // m
-    MonthPadded,    // mm (or minute padded)
+    MonthPadded,    // mm
     MonthNameShort, // mmm
     MonthName,      // mmmm or mmmmmm+
     MonthLetter,    // mmmmm
     YearShort,      // y or yy
     Year,           // yyy+
-    Hour,           // h
+    // TODO: Hours Minutes and Seconds
-    HourPadded,     // hh
-    Second,         // s
-    SecondPadded,   // ss
-    AMPM,           // AM/PM (or A/P)
     ILLEGAL,
     EOF,
 }
@@ -365,8 +361,8 @@ impl Lexer {
                         self.read_next_char();
                     }
                     match m {
-                        1 => Token::Month,       // (or minute)
+                        1 => Token::Month,
-                        2 => Token::MonthPadded, // (or minute padded)
+                        2 => Token::MonthPadded,
                         3 => Token::MonthNameShort,
                         4 => Token::MonthName,
                         5 => Token::MonthLetter,
@@ -385,63 +381,6 @@ impl Lexer {
                         Token::Year
                     }
                 }
-                'h' => {
-                    let mut h = 1;
-                    while let Some('h') = self.peek_char() {
-                        h += 1;
-                        self.read_next_char();
-                    }
-                    if h == 1 {
-                        Token::Hour
-                    } else if h == 2 {
-                        Token::HourPadded
-                    } else {
-                        self.set_error("Unexpected character after 'h'");
-                        Token::ILLEGAL
-                    }
-                }
-                's' => {
-                    let mut s = 1;
-                    while let Some('s') = self.peek_char() {
-                        s += 1;
-                        self.read_next_char();
-                    }
-                    if s == 1 {
-                        Token::Second
-                    } else if s == 2 {
-                        Token::SecondPadded
-                    } else {
-                        self.set_error("Unexpected character after 's'");
-                        Token::ILLEGAL
-                    }
-                }
-                'A' | 'a' => {
-                    if let Some('M') | Some('m') = self.peek_char() {
-                        self.read_next_char();
-                    } else {
-                        self.set_error("Unexpected character after 'A'");
-                        return Token::ILLEGAL;
-                    }
-                    if let Some('/') = self.peek_char() {
-                        self.read_next_char();
-                    } else {
-                        self.set_error("Unexpected character after 'AM'");
-                        return Token::ILLEGAL;
-                    }
-                    if let Some('P') | Some('p') = self.peek_char() {
-                        self.read_next_char();
-                    } else {
-                        self.set_error("Unexpected character after 'AM'");
-                        return Token::ILLEGAL;
-                    }
-                    if let Some('M') | Some('m') = self.peek_char() {
-                        self.read_next_char();
-                    } else {
-                        self.set_error("Unexpected character after 'AMP'");
-                        return Token::ILLEGAL;
-                    }
-                    Token::AMPM
-                }
                 'g' | 'G' => {
                     for c in "eneral".chars() {
                         let cc = self.read_next_char();

base/src/formatter/parser.rs

@@ -27,13 +27,6 @@ pub enum TextToken {
     MonthLetter,
     YearShort,
     Year,
-    Hour,
-    HourPadded,
-    Minute,
-    MinutePadded,
-    Second,
-    SecondPadded,
-    AMPM,
 }
 pub struct NumberPart {
     pub color: Option<i32>,
@@ -52,7 +45,6 @@ pub struct NumberPart {
 
 pub struct DatePart {
     pub color: Option<i32>,
-    pub use_ampm: bool,
     pub tokens: Vec<TextToken>,
 }
 
@@ -109,7 +101,6 @@ impl Parser {
         let mut digit_count = 0;
         let mut precision = 0;
         let mut is_date = false;
-        let mut use_ampm = false;
         let mut is_number = false;
         let mut found_decimal_dot = false;
         let mut use_thousands = false;
@@ -125,7 +116,6 @@ impl Parser {
         let mut number = 'i';
         let mut index = 0;
         let mut currency = None;
-        let mut is_time = false;
 
         while token != Token::EOF && token != Token::Separator {
             let next_token = self.lexer.next_token();
@@ -210,9 +200,6 @@ impl Parser {
                     index += 1;
                 }
                 Token::Literal(value) => {
-                    if value == ':' {
-                        is_time = true;
-                    }
                     tokens.push(TextToken::Literal(value));
                 }
                 Token::Text(value) => {
@@ -249,22 +236,12 @@ impl Parser {
                     tokens.push(TextToken::MonthName);
                 }
                 Token::Month => {
-                    if is_time {
+                    is_date = true;
-                        // minute
+                    tokens.push(TextToken::Month);
-                        tokens.push(TextToken::Minute);
-                    } else {
-                        is_date = true;
-                        tokens.push(TextToken::Month);
-                    }
                 }
                 Token::MonthPadded => {
-                    if is_time {
+                    is_date = true;
-                        // minute padded
+                    tokens.push(TextToken::MonthPadded);
-                        tokens.push(TextToken::MinutePadded);
-                    } else {
-                        is_date = true;
-                        tokens.push(TextToken::MonthPadded);
-                    }
                 }
                 Token::MonthLetter => {
                     is_date = true;
@@ -278,32 +255,6 @@ impl Parser {
                     is_date = true;
                     tokens.push(TextToken::Year);
                 }
-                Token::Hour => {
-                    is_date = true;
-                    is_time = true;
-                    tokens.push(TextToken::Hour);
-                }
-                Token::HourPadded => {
-                    is_date = true;
-                    is_time = true;
-                    tokens.push(TextToken::HourPadded);
-                }
-                Token::Second => {
-                    is_date = true;
-                    is_time = true;
-                    tokens.push(TextToken::Second);
-                }
-                Token::SecondPadded => {
-                    is_date = true;
-                    is_time = true;
-                    tokens.push(TextToken::SecondPadded);
-                }
-
-                Token::AMPM => {
-                    is_date = true;
-                    use_ampm = true;
-                    tokens.push(TextToken::AMPM);
-                }
                 Token::Scientific => {
                     if !is_scientific {
                         index = 0;
@@ -331,11 +282,7 @@ impl Parser {
             if is_number {
                 return ParsePart::Error(ErrorPart {});
             }
-            ParsePart::Date(DatePart {
+            ParsePart::Date(DatePart { color, tokens })
-                color,
-                use_ampm,
-                tokens,
-            })
         } else {
             ParsePart::Number(NumberPart {
                 color,

base/src/formatter/test/mod.rs

@@ -1,3 +1,2 @@
 mod test_general;
 mod test_parse_formatted_number;
-mod test_time;

base/src/formatter/test/test_general.rs

@@ -1,5 +1,4 @@
 #![allow(clippy::unwrap_used)]
-#![allow(clippy::expect_used)]
 
 use crate::{
     formatter::format::format_number,
@@ -203,9 +202,3 @@ fn test_date() {
         "Sat-September-12"
     );
 }
-
-#[test]
-fn test_german_locale() {
-    let locale = get_locale("de").expect("");
-    assert_eq!(format_number(1234.56, "General", locale).text, "1234,56");
-}

base/src/formatter/test/test_parse_formatted_number.rs

@@ -1,13 +1,9 @@
 #![allow(clippy::unwrap_used)]
 
-use crate::formatter::format::parse_formatted_number;
+use crate::formatter::format::parse_formatted_number as parse;
 
 const PARSE_ERROR_MSG: &str = "Could not parse number";
 
-fn parse(input: &str, currencies: &[&str]) -> Result<(f64, Option<String>), String> {
-    parse_formatted_number(input, currencies, b'.', b',')
-}
-
 #[test]
 fn numbers() {
     // whole numbers

base/src/formatter/test/test_time.rs

@@ -1,32 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::{
-    formatter::format::format_number,
-    locale::{get_locale, Locale},
-};
-
-fn get_default_locale() -> &'static Locale {
-    get_locale("en").unwrap()
-}
-
-#[test]
-fn simple_test() {
-    let locale = get_default_locale();
-    let format = "h:mm AM/PM";
-    let value = 16.001_423_611_111_11; // =1/86400 => 12:02 AM
-    let formatted = format_number(value, format, locale);
-    assert_eq!(formatted.text, "12:02 AM");
-}
-
-#[test]
-fn padded_vs_unpadded() {
-    let locale = get_default_locale();
-    let padded_format = "hh:mm:ss AM/PM";
-    let unpadded_format = "h:m:s AM/PM";
-    let value = 0.25351851851851853; // => 6:05:04 AM (21904/(24*60*60)) where 21904 = 6 * 3600 + 5*60 + 4
-    let formatted = format_number(value, padded_format, locale);
-    assert_eq!(formatted.text, "06:05:04 AM");
-
-    let formatted = format_number(value, unpadded_format, locale);
-    assert_eq!(formatted.text, "6:5:4 AM");
-}

base/src/functions/binary_search.rs

@@ -137,7 +137,7 @@ pub(crate) fn binary_search_descending_or_greater<T: Ord>(target: &T, array: &[T
     Some((n - r - 1) as i32)
 }
 
-impl<'a> Model<'a> {
+impl Model {
     /// Returns an array with the list of cell values in the range
     pub(crate) fn prepare_array(
         &mut self,

base/src/functions/database.rs

@@ -1,946 +0,0 @@
-use chrono::Datelike;
-
-use crate::{
-    calc_result::CalcResult,
-    expressions::{parser::Node, token::Error, types::CellReferenceIndex},
-    formatter::dates::date_to_serial_number,
-    Model,
-};
-
-use super::util::{compare_values, from_wildcard_to_regex, result_matches_regex};
-
-impl<'a> Model<'a> {
-    // =DAVERAGE(database, field, criteria)
-    pub(crate) fn fn_daverage(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.len() != 3 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let (db_left, db_right) = match self.get_reference(&args[0], cell) {
-            Ok(r) => (r.left, r.right),
-            Err(e) => return e,
-        };
-
-        let field_col = match self.resolve_db_field_column(db_left, db_right, &args[1], cell) {
-            Ok(c) => c,
-            Err(e) => return e,
-        };
-
-        let criteria = match self.get_reference(&args[2], cell) {
-            Ok(r) => (r.left, r.right),
-            Err(e) => return e,
-        };
-
-        if db_right.row <= db_left.row {
-            // no data rows
-            return CalcResult::Error {
-                error: Error::VALUE,
-                origin: cell,
-                message: "No data rows in database".to_string(),
-            };
-        }
-
-        let mut sum = 0.0f64;
-        let mut count = 0usize;
-
-        let mut row = db_left.row + 1; // skip header
-        while row <= db_right.row {
-            if self.db_row_matches_criteria(db_left, db_right, row, criteria) {
-                let v = self.evaluate_cell(CellReferenceIndex {
-                    sheet: db_left.sheet,
-                    row,
-                    column: field_col,
-                });
-                if let CalcResult::Number(n) = v {
-                    if n.is_finite() {
-                        sum += n;
-                        count += 1;
-                    }
-                }
-            }
-            row += 1;
-        }
-
-        if count == 0 {
-            return CalcResult::Error {
-                error: Error::DIV,
-                origin: cell,
-                message: "No numeric values matched criteria".to_string(),
-            };
-        }
-
-        CalcResult::Number(sum / count as f64)
-    }
-
-    // =DCOUNT(database, field, criteria)
-    // Counts numeric entries in the field for rows that match criteria
-    pub(crate) fn fn_dcount(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.len() != 3 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let (db_left, db_right) = match self.get_reference(&args[0], cell) {
-            Ok(r) => (r.left, r.right),
-            Err(e) => return e,
-        };
-
-        let field_col = match self.resolve_db_field_column(db_left, db_right, &args[1], cell) {
-            Ok(c) => c,
-            Err(e) => return e,
-        };
-
-        let criteria = match self.get_reference(&args[2], cell) {
-            Ok(r) => (r.left, r.right),
-            Err(e) => return e,
-        };
-
-        if db_right.row <= db_left.row {
-            // no data rows
-            return CalcResult::Error {
-                error: Error::VALUE,
-                origin: cell,
-                message: "No data rows in database".to_string(),
-            };
-        }
-
-        let mut count = 0usize;
-        let mut row = db_left.row + 1; // skip header
-        while row <= db_right.row {
-            if self.db_row_matches_criteria(db_left, db_right, row, criteria) {
-                let v = self.evaluate_cell(CellReferenceIndex {
-                    sheet: db_left.sheet,
-                    row,
-                    column: field_col,
-                });
-                if matches!(v, CalcResult::Number(_)) {
-                    count += 1;
-                }
-            }
-            row += 1;
-        }
-
-        CalcResult::Number(count as f64)
-    }
-
-    // =DGET(database, field, criteria)
-    // Returns the (single) field value for the unique matching row
-    pub(crate) fn fn_dget(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.len() != 3 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let (db_left, db_right) = match self.get_reference(&args[0], cell) {
-            Ok(r) => (r.left, r.right),
-            Err(e) => return e,
-        };
-
-        let field_col = match self.resolve_db_field_column(db_left, db_right, &args[1], cell) {
-            Ok(c) => c,
-            Err(e) => return e,
-        };
-
-        let criteria = match self.get_reference(&args[2], cell) {
-            Ok(r) => (r.left, r.right),
-            Err(e) => return e,
-        };
-
-        if db_right.row <= db_left.row {
-            // no data rows
-            return CalcResult::Error {
-                error: Error::VALUE,
-                origin: cell,
-                message: "No data rows in database".to_string(),
-            };
-        }
-
-        let mut result: Option<CalcResult> = None;
-        let mut matches = 0usize;
-
-        let mut row = db_left.row + 1;
-        while row <= db_right.row {
-            if self.db_row_matches_criteria(db_left, db_right, row, criteria) {
-                matches += 1;
-                if matches > 1 {
-                    return CalcResult::Error {
-                        error: Error::NUM,
-                        origin: cell,
-                        message: "More than one matching record".to_string(),
-                    };
-                }
-                result = Some(self.evaluate_cell(CellReferenceIndex {
-                    sheet: db_left.sheet,
-                    row,
-                    column: field_col,
-                }));
-            }
-            row += 1;
-        }
-
-        match (matches, result) {
-            (0, _) | (_, None) => CalcResult::Error {
-                error: Error::VALUE,
-                origin: cell,
-                message: "No matching record".to_string(),
-            },
-            (_, Some(v)) => v,
-        }
-    }
-
-    // =DMAX(database, field, criteria)
-    pub(crate) fn fn_dmax(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        self.db_extreme(args, cell, true)
-    }
-
-    // =DMIN(database, field, criteria)
-    pub(crate) fn fn_dmin(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        self.db_extreme(args, cell, false)
-    }
-
-    // =DSUM(database, field, criteria)
-    pub(crate) fn fn_dsum(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.len() != 3 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let (db_left, db_right) = match self.get_reference(&args[0], cell) {
-            Ok(r) => (r.left, r.right),
-            Err(e) => return e,
-        };
-
-        let field_col = match self.resolve_db_field_column(db_left, db_right, &args[1], cell) {
-            Ok(c) => c,
-            Err(e) => return e,
-        };
-
-        let criteria = match self.get_reference(&args[2], cell) {
-            Ok(r) => (r.left, r.right),
-            Err(e) => return e,
-        };
-
-        if db_right.row <= db_left.row {
-            // no data rows
-            return CalcResult::Error {
-                error: Error::VALUE,
-                origin: cell,
-                message: "No data rows in database".to_string(),
-            };
-        }
-
-        let mut sum = 0.0;
-
-        // skip header
-        let mut row = db_left.row + 1;
-        while row <= db_right.row {
-            if self.db_row_matches_criteria(db_left, db_right, row, criteria) {
-                let v = self.evaluate_cell(CellReferenceIndex {
-                    sheet: db_left.sheet,
-                    row,
-                    column: field_col,
-                });
-                if let CalcResult::Number(n) = v {
-                    if n.is_finite() {
-                        sum += n;
-                    }
-                }
-            }
-            row += 1;
-        }
-
-        CalcResult::Number(sum)
-    }
-
-    // =DCOUNTA(database, field, criteria)
-    // Counts non-empty entries (any type) in the field for rows that match criteria
-    pub(crate) fn fn_dcounta(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.len() != 3 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let (db_left, db_right) = match self.get_reference(&args[0], cell) {
-            Ok(r) => (r.left, r.right),
-            Err(e) => return e,
-        };
-
-        let field_col = match self.resolve_db_field_column(db_left, db_right, &args[1], cell) {
-            Ok(c) => c,
-            Err(e) => return e,
-        };
-
-        let criteria = match self.get_reference(&args[2], cell) {
-            Ok(r) => (r.left, r.right),
-            Err(e) => return e,
-        };
-
-        if db_right.row <= db_left.row {
-            // no data rows
-            return CalcResult::Error {
-                error: Error::VALUE,
-                origin: cell,
-                message: "No data rows in database".to_string(),
-            };
-        }
-
-        let mut count = 0;
-        for row in (db_left.row + 1)..=db_right.row {
-            if self.db_row_matches_criteria(db_left, db_right, row, criteria) {
-                let v = self.evaluate_cell(CellReferenceIndex {
-                    sheet: db_left.sheet,
-                    row,
-                    column: field_col,
-                });
-                if !matches!(v, CalcResult::EmptyCell | CalcResult::EmptyArg) {
-                    count += 1;
-                }
-            }
-        }
-
-        CalcResult::Number(count as f64)
-    }
-
-    // =DPRODUCT(database, field, criteria)
-    pub(crate) fn fn_dproduct(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.len() != 3 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let (db_left, db_right) = match self.get_reference(&args[0], cell) {
-            Ok(r) => (r.left, r.right),
-            Err(e) => return e,
-        };
-
-        let field_col = match self.resolve_db_field_column(db_left, db_right, &args[1], cell) {
-            Ok(c) => c,
-            Err(e) => return e,
-        };
-
-        let criteria = match self.get_reference(&args[2], cell) {
-            Ok(r) => (r.left, r.right),
-            Err(e) => return e,
-        };
-
-        if db_right.row <= db_left.row {
-            // no data rows
-            return CalcResult::Error {
-                error: Error::VALUE,
-                origin: cell,
-                message: "No data rows in database".to_string(),
-            };
-        }
-
-        let mut product = 1.0f64;
-        let mut has_numeric = false;
-
-        let mut row = db_left.row + 1; // skip header
-        while row <= db_right.row {
-            if self.db_row_matches_criteria(db_left, db_right, row, criteria) {
-                let v = self.evaluate_cell(CellReferenceIndex {
-                    sheet: db_left.sheet,
-                    row,
-                    column: field_col,
-                });
-                if let CalcResult::Number(n) = v {
-                    if n.is_finite() {
-                        product *= n;
-                        has_numeric = true;
-                    }
-                }
-            }
-            row += 1;
-        }
-
-        // Excel returns 0 when no rows / no numeric values match for DPRODUCT
-        if has_numeric {
-            CalcResult::Number(product)
-        } else {
-            CalcResult::Number(0.0)
-        }
-    }
-
-    // Small internal helper for DSTDEV / DVAR
-    // Collects sum, sum of squares, and count of numeric values in the field
-    // for rows that match the criteria.
-    fn db_numeric_stats(
-        &mut self,
-        args: &[Node],
-        cell: CellReferenceIndex,
-    ) -> Result<(f64, f64, usize), CalcResult> {
-        if args.len() != 3 {
-            return Err(CalcResult::new_args_number_error(cell));
-        }
-
-        let (db_left, db_right) = match self.get_reference(&args[0], cell) {
-            Ok(r) => (r.left, r.right),
-            Err(e) => return Err(e),
-        };
-
-        let field_col = self.resolve_db_field_column(db_left, db_right, &args[1], cell)?;
-
-        let criteria = match self.get_reference(&args[2], cell) {
-            Ok(r) => (r.left, r.right),
-            Err(e) => return Err(e),
-        };
-
-        if db_right.row <= db_left.row {
-            // no data rows
-            return Err(CalcResult::Error {
-                error: Error::VALUE,
-                origin: cell,
-                message: "No data rows in database".to_string(),
-            });
-        }
-
-        let mut sum = 0.0f64;
-        let mut sumsq = 0.0f64;
-        let mut count = 0usize;
-
-        let mut row = db_left.row + 1; // skip header
-        while row <= db_right.row {
-            if self.db_row_matches_criteria(db_left, db_right, row, criteria) {
-                let v = self.evaluate_cell(CellReferenceIndex {
-                    sheet: db_left.sheet,
-                    row,
-                    column: field_col,
-                });
-                if let CalcResult::Number(n) = v {
-                    if n.is_finite() {
-                        sum += n;
-                        sumsq += n * n;
-                        count += 1;
-                    }
-                }
-            }
-            row += 1;
-        }
-
-        Ok((sum, sumsq, count))
-    }
-
-    // =DSTDEV(database, field, criteria)
-    // Sample standard deviation of matching numeric values
-    pub(crate) fn fn_dstdev(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        let (sum, sumsq, count) = match self.db_numeric_stats(args, cell) {
-            Ok(stats) => stats,
-            Err(e) => return e,
-        };
-
-        // Excel behaviour: #DIV/0! if 0 or 1 numeric values match
-        if count < 2 {
-            return CalcResult::Error {
-                error: Error::DIV,
-                origin: cell,
-                message: "Not enough numeric values matched criteria".to_string(),
-            };
-        }
-
-        let n = count as f64;
-        let var = (sumsq - (sum * sum) / n) / (n - 1.0);
-        let var = if var < 0.0 { 0.0 } else { var };
-        CalcResult::Number(var.sqrt())
-    }
-
-    // =DVAR(database, field, criteria)
-    // Sample variance of matching numeric values
-    pub(crate) fn fn_dvar(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        let (sum, sumsq, count) = match self.db_numeric_stats(args, cell) {
-            Ok(stats) => stats,
-            Err(e) => return e,
-        };
-
-        // Excel behaviour: #DIV/0! if 0 or 1 numeric values match
-        if count < 2 {
-            return CalcResult::Error {
-                error: Error::DIV,
-                origin: cell,
-                message: "Not enough numeric values matched criteria".to_string(),
-            };
-        }
-
-        let n = count as f64;
-        let var = (sumsq - (sum * sum) / n) / (n - 1.0);
-        let var = if var < 0.0 { 0.0 } else { var };
-        CalcResult::Number(var)
-    }
-
-    // =DSTDEVP(database, field, criteria)
-    // Population standard deviation of matching numeric values
-    pub(crate) fn fn_dstdevp(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        let (sum, sumsq, count) = match self.db_numeric_stats(args, cell) {
-            Ok(stats) => stats,
-            Err(e) => return e,
-        };
-
-        // Excel behaviour: #DIV/0! if no numeric values match
-        if count == 0 {
-            return CalcResult::Error {
-                error: Error::DIV,
-                origin: cell,
-                message: "No numeric values matched criteria".to_string(),
-            };
-        }
-
-        let n = count as f64;
-        let var = (sumsq - (sum * sum) / n) / n;
-        let var = if var < 0.0 { 0.0 } else { var };
-        CalcResult::Number(var.sqrt())
-    }
-
-    // =DVARP(database, field, criteria)
-    // Population variance of matching numeric values
-    pub(crate) fn fn_dvarp(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        let (sum, sumsq, count) = match self.db_numeric_stats(args, cell) {
-            Ok(stats) => stats,
-            Err(e) => return e,
-        };
-
-        // Excel behaviour: #DIV/0! if no numeric values match
-        if count == 0 {
-            return CalcResult::Error {
-                error: Error::DIV,
-                origin: cell,
-                message: "No numeric values matched criteria".to_string(),
-            };
-        }
-
-        let n = count as f64;
-        let var = (sumsq - (sum * sum) / n) / n;
-        let var = if var < 0.0 { 0.0 } else { var };
-        CalcResult::Number(var)
-    }
-
-    /// Resolve the "field" (2nd arg) to an absolute column index (i32) within the sheet.
-    /// Field can be a number (1-based index) or a header name (case-insensitive).
-    /// Returns the absolute column index, not a 1-based offset within the database range.
-    fn resolve_db_field_column(
-        &mut self,
-        db_left: CellReferenceIndex,
-        db_right: CellReferenceIndex,
-        field_arg: &Node,
-        cell: CellReferenceIndex,
-    ) -> Result<i32, CalcResult> {
-        let field_column_name = match self.evaluate_node_in_context(field_arg, cell) {
-            CalcResult::String(s) => s.to_lowercase(),
-            CalcResult::Number(index) => {
-                let index = index.floor() as i32;
-                if index < 1 || db_left.column + index - 1 > db_right.column {
-                    return Err(CalcResult::Error {
-                        error: Error::VALUE,
-                        origin: cell,
-                        message: "Field index out of range".to_string(),
-                    });
-                }
-                return Ok(db_left.column + index - 1);
-            }
-            CalcResult::Boolean(b) => {
-                return if b {
-                    Ok(db_left.column)
-                } else {
-                    // Index 0 is out of range
-                    Err(CalcResult::Error {
-                        error: Error::VALUE,
-                        origin: cell,
-                        message: "Invalid field specifier".to_string(),
-                    })
-                };
-            }
-            error @ CalcResult::Error { .. } => {
-                return Err(error);
-            }
-            CalcResult::Range { .. } => {
-                return Err(CalcResult::Error {
-                    error: Error::NIMPL,
-                    origin: cell,
-                    message: "Arrays not supported yet".to_string(),
-                })
-            }
-            CalcResult::EmptyCell | CalcResult::EmptyArg => "".to_string(),
-            CalcResult::Array(_) => {
-                return Err(CalcResult::Error {
-                    error: Error::NIMPL,
-                    origin: cell,
-                    message: "Arrays not supported yet".to_string(),
-                })
-            }
-        };
-
-        // We search in the database a column whose header matches field_column_name
-        for column in db_left.column..=db_right.column {
-            let v = self.evaluate_cell(CellReferenceIndex {
-                sheet: db_left.sheet,
-                row: db_left.row,
-                column,
-            });
-            match &v {
-                CalcResult::String(s) => {
-                    if s.to_lowercase() == field_column_name {
-                        return Ok(column);
-                    }
-                }
-                CalcResult::Number(n) => {
-                    if field_column_name == n.to_string() {
-                        return Ok(column);
-                    }
-                }
-                CalcResult::Boolean(b) => {
-                    if field_column_name == b.to_string() {
-                        return Ok(column);
-                    }
-                }
-                CalcResult::Error { .. }
-                | CalcResult::Range { .. }
-                | CalcResult::EmptyCell
-                | CalcResult::EmptyArg
-                | CalcResult::Array(_) => {}
-            }
-        }
-
-        Err(CalcResult::Error {
-            error: Error::VALUE,
-            origin: cell,
-            message: "Field header not found".to_string(),
-        })
-    }
-
-    /// Check whether a database row matches the criteria range.
-    /// Criteria logic: OR across criteria rows; AND across columns within a row.
-    fn db_row_matches_criteria(
-        &mut self,
-        db_left: CellReferenceIndex,
-        db_right: CellReferenceIndex,
-        row: i32,
-        criteria: (CellReferenceIndex, CellReferenceIndex),
-    ) -> bool {
-        let (c_left, c_right) = criteria;
-
-        // Read criteria headers (first row of criteria range)
-        // Map header name (lowercased) -> db column (if exists)
-        let mut crit_cols: Vec<i32> = Vec::new();
-        let mut header_count = 0;
-        // We cover the criteria table:
-        //  headerA | headerB | ...
-        //  critA1  | critA2  | ...
-        //  critB1  | critB2  | ...
-        //  ...
-        for column in c_left.column..=c_right.column {
-            let cell = CellReferenceIndex {
-                sheet: c_left.sheet,
-                row: c_left.row,
-                column,
-            };
-            let criteria_header = self.evaluate_cell(cell);
-            if let Ok(s) = self.cast_to_string(criteria_header, cell) {
-                // Non-empty string header. If the header is non string we skip it
-                header_count += 1;
-                let wanted = s.to_lowercase();
-
-                // Find corresponding Database column
-                let mut found = false;
-                for db_column in db_left.column..=db_right.column {
-                    let db_header = self.evaluate_cell(CellReferenceIndex {
-                        sheet: db_left.sheet,
-                        row: db_left.row,
-                        column: db_column,
-                    });
-                    if let Ok(hs) = self.cast_to_string(db_header, cell) {
-                        if hs.to_lowercase() == wanted {
-                            crit_cols.push(db_column);
-                            found = true;
-                            break;
-                        }
-                    }
-                }
-                if !found {
-                    // that means the criteria column has no matching DB column
-                    // If the criteria condition is empty then we remove this condition
-                    // otherwise this condition can never be satisfied
-                    // We evaluate all criteria rows to see if any is non-empty
-                    let mut has_non_empty = false;
-                    for r in (c_left.row + 1)..=c_right.row {
-                        let ccell = self.evaluate_cell(CellReferenceIndex {
-                            sheet: c_left.sheet,
-                            row: r,
-                            column,
-                        });
-                        if !matches!(ccell, CalcResult::EmptyCell | CalcResult::EmptyArg) {
-                            has_non_empty = true;
-                            break;
-                        }
-                    }
-                    if has_non_empty {
-                        // This criteria column can never be satisfied
-                        header_count -= 1;
-                    }
-                }
-            };
-        }
-
-        if c_right.row <= c_left.row {
-            // If no criteria rows (only headers), everything matches
-            return true;
-        }
-
-        if header_count == 0 {
-            // If there are not "String" headers, nothing matches
-            // NB: There might be String headers that do not match any DB columns,
-            // in that case everything matches.
-            return false;
-        }
-
-        // Evaluate each criteria row (OR)
-        for r in (c_left.row + 1)..=c_right.row {
-            // AND across columns for this criteria row
-            let mut and_ok = true;
-
-            for (offset, db_col) in crit_cols.iter().enumerate() {
-                // Criteria cell
-                let ccell = self.evaluate_cell(CellReferenceIndex {
-                    sheet: c_left.sheet,
-                    row: r,
-                    column: c_left.column + offset as i32,
-                });
-
-                // Empty criteria cell -> ignored
-                if matches!(ccell, CalcResult::EmptyCell | CalcResult::EmptyArg) {
-                    continue;
-                }
-
-                // Database value for this row/column
-                let db_val = self.evaluate_cell(CellReferenceIndex {
-                    sheet: db_left.sheet,
-                    row,
-                    column: *db_col,
-                });
-
-                if !self.criteria_cell_matches(&db_val, &ccell) {
-                    and_ok = false;
-                    break;
-                }
-            }
-
-            if and_ok {
-                // This criteria row satisfied (OR)
-                return true;
-            }
-        }
-
-        // none matched
-        false
-    }
-
-    /// Implements Excel-like criteria matching for a single value.
-    /// Supports prefixes: <>, >=, <=, >, <, = ; wildcards * and ? for string equals.
-    fn criteria_cell_matches(&self, db_val: &CalcResult, crit_cell: &CalcResult) -> bool {
-        // Convert the criteria cell to a string for operator parsing if possible,
-        // otherwise fall back to equality via compare_values.
-
-        let mut criteria = match crit_cell {
-            CalcResult::String(s) => s.trim().to_string(),
-            CalcResult::Number(n) => {
-                // treat as equality with number
-                return match db_val {
-                    CalcResult::Number(v) => (*v - *n).abs() <= f64::EPSILON,
-                    _ => false,
-                };
-            }
-            CalcResult::Boolean(b) => {
-                // check equality with boolean
-                return match db_val {
-                    CalcResult::Boolean(v) => *v == *b,
-                    _ => false,
-                };
-            }
-            CalcResult::EmptyCell | CalcResult::EmptyArg => "".to_string(),
-            CalcResult::Error { .. } => return false,
-            CalcResult::Range { .. } | CalcResult::Array(_) => return false,
-        };
-
-        // Detect operator prefix
-        let mut op = "="; // default equality (with wildcard semantics for strings)
-        let prefixes = ["<>", ">=", "<=", ">", "<", "="];
-        for p in prefixes.iter() {
-            if criteria.starts_with(p) {
-                op = p;
-                criteria = criteria[p.len()..].trim().to_string();
-                break;
-            }
-        }
-
-        // Is it a number?
-        let rhs_num = criteria.parse::<f64>().ok();
-
-        // Is it a date?
-        // FIXME: We should parse dates according to locale settings
-        let rhs_date = criteria.parse::<chrono::NaiveDate>().ok();
-
-        match op {
-            ">" | ">=" | "<" | "<=" => {
-                if let Some(d) = rhs_date {
-                    // date comparison
-                    let serial = match date_to_serial_number(d.day(), d.month(), d.year()) {
-                        Ok(sn) => sn as f64,
-                        Err(_) => return false,
-                    };
-
-                    if let CalcResult::Number(n) = db_val {
-                        match op {
-                            ">" => *n > serial,
-                            ">=" => *n >= serial,
-                            "<" => *n < serial,
-                            "<=" => *n <= serial,
-                            _ => false,
-                        }
-                    } else {
-                        false
-                    }
-                } else if let Some(t) = rhs_num {
-                    // numeric comparison
-                    if let CalcResult::Number(n) = db_val {
-                        match op {
-                            ">" => *n > t,
-                            ">=" => *n >= t,
-                            "<" => *n < t,
-                            "<=" => *n <= t,
-                            _ => false,
-                        }
-                    } else {
-                        false
-                    }
-                } else {
-                    // string comparison (case-insensitive) using compare_values semantics
-                    let rhs = CalcResult::String(criteria.to_lowercase());
-                    let lhs = match db_val {
-                        CalcResult::String(s) => CalcResult::String(s.to_lowercase()),
-                        x => x.clone(),
-                    };
-                    let c = compare_values(&lhs, &rhs);
-                    match op {
-                        ">" => c > 0,
-                        ">=" => c >= 0,
-                        "<" => c < 0,
-                        "<=" => c <= 0,
-                        _ => false,
-                    }
-                }
-            }
-            "<>" => {
-                // not equal (with wildcard semantics for strings)
-                // If rhs has wildcards and db_val is string, do regex; else use compare_values != 0
-                if let CalcResult::String(s) = db_val {
-                    if criteria.contains('*') || criteria.contains('?') {
-                        if let Ok(re) = from_wildcard_to_regex(&criteria.to_lowercase(), true) {
-                            return !result_matches_regex(
-                                &CalcResult::String(s.to_lowercase()),
-                                &re,
-                            );
-                        }
-                    }
-                }
-                let rhs = if let Some(n) = rhs_num {
-                    CalcResult::Number(n)
-                } else {
-                    CalcResult::String(criteria.to_lowercase())
-                };
-                let lhs = match db_val {
-                    CalcResult::String(s) => CalcResult::String(s.to_lowercase()),
-                    x => x.clone(),
-                };
-                compare_values(&lhs, &rhs) != 0
-            }
-            _ => {
-                // equality. For strings, support wildcards (*, ?)
-                if let Some(n) = rhs_num {
-                    // numeric equals
-                    if let CalcResult::Number(m) = db_val {
-                        (*m - n).abs() <= f64::EPSILON
-                    } else {
-                        compare_values(db_val, &CalcResult::Number(n)) == 0
-                    }
-                } else {
-                    // textual/boolean equals (case-insensitive), wildcard-enabled for strings
-                    if let CalcResult::String(s) = db_val {
-                        if criteria.contains('*') || criteria.contains('?') {
-                            if let Ok(re) = from_wildcard_to_regex(&criteria.to_lowercase(), true) {
-                                return result_matches_regex(
-                                    &CalcResult::String(s.to_lowercase()),
-                                    &re,
-                                );
-                            }
-                        }
-                        // This is weird but we only need to check if "starts with" for equality
-                        return s.to_lowercase().starts_with(&criteria.to_lowercase());
-                    }
-                    // Fallback: compare_values equality
-                    compare_values(db_val, &CalcResult::String(criteria.to_lowercase())) == 0
-                }
-            }
-        }
-    }
-
-    /// Shared implementation for DMAX/DMIN
-    fn db_extreme(
-        &mut self,
-        args: &[Node],
-        cell: CellReferenceIndex,
-        want_max: bool,
-    ) -> CalcResult {
-        if args.len() != 3 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let (db_left, db_right) = match self.get_reference(&args[0], cell) {
-            Ok(r) => (r.left, r.right),
-            Err(e) => return e,
-        };
-
-        let field_col = match self.resolve_db_field_column(db_left, db_right, &args[1], cell) {
-            Ok(c) => c,
-            Err(e) => return e,
-        };
-
-        let criteria = match self.get_reference(&args[2], cell) {
-            Ok(r) => (r.left, r.right),
-            Err(e) => return e,
-        };
-
-        if db_right.row <= db_left.row {
-            // no data rows
-            return CalcResult::Error {
-                error: Error::VALUE,
-                origin: cell,
-                message: "No data rows in database".to_string(),
-            };
-        }
-
-        let mut best: Option<f64> = None;
-
-        let mut row = db_left.row + 1;
-        while row <= db_right.row {
-            if self.db_row_matches_criteria(db_left, db_right, row, criteria) {
-                let v = self.evaluate_cell(CellReferenceIndex {
-                    sheet: db_left.sheet,
-                    row,
-                    column: field_col,
-                });
-                if let CalcResult::Number(value) = v {
-                    if value.is_finite() {
-                        best = Some(match best {
-                            None => value,
-                            Some(cur) => {
-                                if want_max {
-                                    value.max(cur)
-                                } else {
-                                    value.min(cur)
-                                }
-                            }
-                        });
-                    }
-                }
-            }
-            row += 1;
-        }
-
-        match best {
-            Some(v) => CalcResult::Number(v),
-            None => CalcResult::Number(0.0),
-        }
-    }
-}

base/src/functions/engineering/bessel.rs

@@ -1,18 +1,16 @@
-use statrs::function::erf::{erf, erfc};
-
 use crate::{
     calc_result::CalcResult,
     expressions::{parser::Node, token::Error, types::CellReferenceIndex},
     model::Model,
 };
 
-use super::transcendental::{bessel_i, bessel_j, bessel_k, bessel_y};
+use super::transcendental::{bessel_i, bessel_j, bessel_k, bessel_y, erf};
 // https://root.cern/doc/v610/TMath_8cxx_source.html
 
 // Notice that the parameters for Bessel functions in Excel and here have inverted order
 // EXCEL_BESSEL(x, n) => bessel(n, x)
 
-impl<'a> Model<'a> {
+impl Model {
     pub(crate) fn fn_besseli(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
         if args.len() != 2 {
             return CalcResult::new_args_number_error(cell);
@@ -162,7 +160,7 @@ impl<'a> Model<'a> {
             Ok(f) => f,
             Err(s) => return s,
         };
-        CalcResult::Number(erfc(x))
+        CalcResult::Number(1.0 - erf(x))
     }
 
     pub(crate) fn fn_erfcprecise(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
@@ -173,6 +171,6 @@ impl<'a> Model<'a> {
             Ok(f) => f,
             Err(s) => return s,
         };
-        CalcResult::Number(erfc(x))
+        CalcResult::Number(1.0 - erf(x))
     }
 }

base/src/functions/engineering/bit_operations.rs

@@ -7,7 +7,7 @@ use crate::{
 // 2^48-1
 const MAX: f64 = 281474976710655.0;
 
-impl<'a> Model<'a> {
+impl Model {
     // BITAND( number1, number2)
     pub(crate) fn fn_bitand(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
         if args.len() != 2 {

base/src/functions/engineering/complex.rs

@@ -182,7 +182,7 @@ fn parse_complex_number(s: &str) -> Result<(f64, f64, Suffix), String> {
     }
 }
 
-impl<'a> Model<'a> {
+impl Model {
     fn get_complex_number(
         &mut self,
         node: &Node,

base/src/functions/engineering/convert.rs

@@ -41,7 +41,7 @@ fn convert_temperature(
     }
 }
 
-impl<'a> Model<'a> {
+impl Model {
     // CONVERT(number, from_unit, to_unit)
     pub(crate) fn fn_convert(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
         if args.len() != 3 {

base/src/functions/engineering/misc.rs

@@ -5,7 +5,7 @@ use crate::{
     number_format::to_precision,
 };
 
-impl<'a> Model<'a> {
+impl Model {
     // DELTA(number1, [number2])
     pub(crate) fn fn_delta(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
         let arg_count = args.len();

base/src/functions/engineering/number_basis.rs

@@ -31,7 +31,7 @@ fn from_binary_to_decimal(value: f64) -> Result<i64, String> {
     Ok(result)
 }
 
-impl<'a> Model<'a> {
+impl Model {
     // BIN2DEC(number)
     pub(crate) fn fn_bin2dec(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
         if args.len() != 1 {

base/src/functions/engineering/transcendental/erf.rs

@@ -0,0 +1,53 @@
+pub(crate) fn erf(x: f64) -> f64 {
+    let cof = vec![
+        -1.3026537197817094,
+        6.419_697_923_564_902e-1,
+        1.9476473204185836e-2,
+        -9.561_514_786_808_63e-3,
+        -9.46595344482036e-4,
+        3.66839497852761e-4,
+        4.2523324806907e-5,
+        -2.0278578112534e-5,
+        -1.624290004647e-6,
+        1.303655835580e-6,
+        1.5626441722e-8,
+        -8.5238095915e-8,
+        6.529054439e-9,
+        5.059343495e-9,
+        -9.91364156e-10,
+        -2.27365122e-10,
+        9.6467911e-11,
+        2.394038e-12,
+        -6.886027e-12,
+        8.94487e-13,
+        3.13092e-13,
+        -1.12708e-13,
+        3.81e-16,
+        7.106e-15,
+        -1.523e-15,
+        -9.4e-17,
+        1.21e-16,
+        -2.8e-17,
+    ];
+
+    let mut d = 0.0;
+    let mut dd = 0.0;
+
+    let x_abs = x.abs();
+
+    let t = 2.0 / (2.0 + x_abs);
+    let ty = 4.0 * t - 2.0;
+
+    for j in (1..=cof.len() - 1).rev() {
+        let tmp = d;
+        d = ty * d - dd + cof[j];
+        dd = tmp;
+    }
+
+    let res = t * f64::exp(-x_abs * x_abs + 0.5 * (cof[0] + ty * d) - dd);
+    if x < 0.0 {
+        res - 1.0
+    } else {
+        1.0 - res
+    }
+}

base/src/functions/engineering/transcendental/mod.rs

@@ -4,6 +4,7 @@ mod bessel_j1_y1;
 mod bessel_jn_yn;
 mod bessel_k;
 mod bessel_util;
+mod erf;
 
 #[cfg(test)]
 mod test_bessel;
@@ -12,3 +13,4 @@ pub(crate) use bessel_i::bessel_i;
 pub(crate) use bessel_jn_yn::jn as bessel_j;
 pub(crate) use bessel_jn_yn::yn as bessel_y;
 pub(crate) use bessel_k::bessel_k;
+pub(crate) use erf::erf;

base/src/functions/financial.rs

@@ -191,7 +191,7 @@ fn compute_ppmt(
 // All, except for rate are easily solvable in terms of the others.
 // In these formulas the payment (pmt) is normally negative
 
-impl<'a> Model<'a> {
+impl Model {
     fn get_array_of_numbers_generic(
         &mut self,
         arg: &Node,

base/src/functions/information.rs

@@ -1,10 +1,10 @@
 use crate::{
     calc_result::CalcResult,
-    expressions::{parser::Node, token::Error, types::CellReferenceIndex, utils::number_to_column},
+    expressions::{parser::Node, token::Error, types::CellReferenceIndex},
     model::{Model, ParsedDefinedName},
 };
 
-impl<'a> Model<'a> {
+impl Model {
     pub(crate) fn fn_isnumber(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
         if args.len() == 1 {
             match self.evaluate_node_in_context(&args[0], cell) {
@@ -320,152 +320,4 @@ impl<'a> Model<'a> {
             message: "Invalid name".to_string(),
         }
     }
-
-    pub(crate) fn fn_n(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        let arg_count = args.len();
-        if arg_count != 1 {
-            return CalcResult::new_args_number_error(cell);
-        }
-        let value = match self.evaluate_node_in_context(&args[0], cell) {
-            CalcResult::Number(n) => n,
-            CalcResult::String(_) => 0.0,
-            CalcResult::Boolean(f) => {
-                if f {
-                    1.0
-                } else {
-                    0.0
-                }
-            }
-            CalcResult::EmptyCell | CalcResult::EmptyArg => 0.0,
-            error @ CalcResult::Error { .. } => return error,
-            CalcResult::Range { .. } => {
-                return CalcResult::Error {
-                    error: Error::NIMPL,
-                    origin: cell,
-                    message: "Arrays not supported yet".to_string(),
-                }
-            }
-            CalcResult::Array(_) => {
-                return CalcResult::Error {
-                    error: Error::NIMPL,
-                    origin: cell,
-                    message: "Arrays not supported yet".to_string(),
-                }
-            }
-        };
-
-        CalcResult::Number(value)
-    }
-
-    pub(crate) fn fn_sheets(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        let arg_count = args.len();
-        if arg_count > 1 {
-            return CalcResult::new_args_number_error(cell);
-        }
-        if arg_count == 1 {
-            return CalcResult::Error {
-                error: Error::NIMPL,
-                origin: cell,
-                message: "Sheets function with an argument is not implemented".to_string(),
-            };
-        }
-        let sheet_count = self.workbook.worksheets.len() as f64;
-        CalcResult::Number(sheet_count)
-    }
-
-    /// INFO(info_type, [reference])
-    /// NB: In Excel "info_type" is localized. Here it is always in English.
-    pub(crate) fn fn_cell(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        let arg_count = args.len();
-        if arg_count == 0 || arg_count > 2 {
-            return CalcResult::new_args_number_error(cell);
-        }
-        let reference = if arg_count == 2 {
-            match self.evaluate_node_with_reference(&args[1], cell) {
-                CalcResult::Range { left, right: _ } => {
-                    // we just take the left cell of the range
-                    left
-                }
-                _ => {
-                    return CalcResult::Error {
-                        error: Error::VALUE,
-                        origin: cell,
-                        message: "Argument must be a reference".to_string(),
-                    }
-                }
-            }
-        } else {
-            CellReferenceIndex {
-                sheet: cell.sheet,
-                row: cell.row,
-                column: cell.column,
-            }
-        };
-        let info_type = match self.get_string(&args[0], cell) {
-            Ok(s) => s.to_uppercase(),
-            Err(e) => return e,
-        };
-        match info_type.as_str() {
-            "ADDRESS" => {
-                if reference.sheet != cell.sheet {
-                    return CalcResult::Error {
-                        error: Error::NIMPL,
-                        origin: cell,
-                        message: "References to other sheets not implemented".to_string(),
-                    };
-                }
-                let column = match number_to_column(reference.column) {
-                    Some(c) => c,
-                    None => {
-                        return CalcResult::Error {
-                            error: Error::VALUE,
-                            origin: cell,
-                            message: "Invalid column".to_string(),
-                        }
-                    }
-                };
-                let address = format!("${}${}", column, reference.row);
-                CalcResult::String(address)
-            }
-            "COL" => CalcResult::Number(reference.column as f64),
-            "COLOR" | "FILENAME" | "FORMAT" | "PARENTHESES" | "PREFIX" | "PROTECT" | "WIDTH" => {
-                CalcResult::Error {
-                    error: Error::VALUE,
-                    origin: cell,
-                    message: "info_type not implemented".to_string(),
-                }
-            }
-            "CONTENTS" => self.evaluate_cell(reference),
-            "ROW" => CalcResult::Number(reference.row as f64),
-            "TYPE" => {
-                let cell_type = match self.evaluate_cell(reference) {
-                    CalcResult::EmptyCell => "b",
-                    CalcResult::String(_) => "l",
-                    CalcResult::Number(_) => "v",
-                    CalcResult::Boolean(_) => "v",
-                    CalcResult::Error { .. } => "v",
-                    CalcResult::Range { .. } => "v",
-                    CalcResult::EmptyArg => "v",
-                    CalcResult::Array(_) => "v",
-                };
-                CalcResult::String(cell_type.to_string())
-            }
-            _ => CalcResult::Error {
-                error: Error::VALUE,
-                origin: cell,
-                message: "Invalid info_type".to_string(),
-            },
-        }
-    }
-
-    pub(crate) fn fn_info(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.is_empty() || args.len() > 2 {
-            return CalcResult::new_args_number_error(cell);
-        }
-        CalcResult::Error {
-            error: Error::NIMPL,
-            origin: cell,
-            message: "Info function not implemented".to_string(),
-        }
-    }
 }

base/src/functions/logical.rs

@@ -6,7 +6,7 @@ use crate::{
 
 use super::util::compare_values;
 
-impl<'a> Model<'a> {
+impl Model {
     pub(crate) fn fn_true(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
         if args.is_empty() {
             CalcResult::Boolean(true)
@@ -246,7 +246,7 @@ impl<'a> Model<'a> {
         }
         // None of the cases matched so we return the default
         // If there is an even number of args is the last one otherwise is #N/A
-        if args_count.is_multiple_of(2) {
+        if args_count % 2 == 0 {
             return self.evaluate_node_in_context(&args[args_count - 1], cell);
         }
         CalcResult::Error {
@@ -262,7 +262,7 @@ impl<'a> Model<'a> {
         if args_count < 2 {
             return CalcResult::new_args_number_error(cell);
         }
-        if !args_count.is_multiple_of(2) {
+        if args_count % 2 != 0 {
             // Missing value for last condition
             return CalcResult::new_args_number_error(cell);
         }

base/src/functions/lookup_and_reference.rs

@@ -7,7 +7,7 @@ use crate::{
 
 use super::util::{compare_values, from_wildcard_to_regex, result_matches_regex, values_are_equal};
 
-impl<'a> Model<'a> {
+impl Model {
     pub(crate) fn fn_index(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
         let row_num;
         let col_num;
@@ -698,7 +698,7 @@ impl<'a> Model<'a> {
                 let parsed_reference = ParsedReference::parse_reference_formula(
                     Some(cell.sheet),
                     &s,
-                    self.locale,
+                    &self.locale,
                     |name| self.get_sheet_index_by_name(name),
                 );
 
@@ -839,10 +839,6 @@ impl<'a> Model<'a> {
         CalcResult::Range { left, right }
     }
 
-    // FORMULATEXT(reference)
-    // Returns a formula as a string. Two differences with Excel:
-    // - It returns the formula in English
-    // - It formats the formula without spaces between elements
     pub(crate) fn fn_formulatext(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
         if args.len() != 1 {
             return CalcResult::new_args_number_error(cell);
@@ -864,7 +860,7 @@ impl<'a> Model<'a> {
                     message: "argument must be a reference to a single cell".to_string(),
                 };
             }
-            if let Ok(Some(f)) = self.get_english_cell_formula(left.sheet, left.row, left.column) {
+            if let Ok(Some(f)) = self.get_cell_formula(left.sheet, left.row, left.column) {
                 CalcResult::String(f)
             } else {
                 CalcResult::Error {

base/src/functions/macros.rs

@@ -68,14 +68,14 @@ macro_rules! single_number_fn {
                                 },
                                 // If String, parse to f64 then apply or #VALUE! error
                                 ArrayNode::String(s) => {
-                                    let node = match self.cast_number(&s) {
+                                    let node = match s.parse::<f64>() {
-                                        Some(f) => match $op(f) {
+                                        Ok(f) => match $op(f) {
                                             Ok(x) => ArrayNode::Number(x),
                                             Err(Error::DIV) => ArrayNode::Error(Error::DIV),
                                             Err(Error::VALUE) => ArrayNode::Error(Error::VALUE),
                                             Err(e) => ArrayNode::Error(e),
                                         },
-                                        None => ArrayNode::Error(Error::VALUE),
+                                        Err(_) => ArrayNode::Error(Error::VALUE),
                                     };
                                     data_row.push(node);
                                 }

base/src/functions/math_util.rs

@@ -1,200 +0,0 @@
-/// Parse Roman (classic or Excel variants) → number
-pub fn from_roman(s: &str) -> Result<u32, String> {
-    if s.is_empty() {
-        return Err("empty numeral".into());
-    }
-    fn val(c: char) -> Option<u32> {
-        Some(match c {
-            'I' => 1,
-            'V' => 5,
-            'X' => 10,
-            'L' => 50,
-            'C' => 100,
-            'D' => 500,
-            'M' => 1000,
-            _ => return None,
-        })
-    }
-
-    // Accept the union of subtractive pairs used by the tables above (Excel-compatible).
-    fn allowed_subtractive(a: char, b: char) -> bool {
-        matches!(
-            (a, b),
-            // classic:
-            ('I','V')|('I','X')|('X','L')|('X','C')|('C','D')|('C','M')
-            // Excel forms:
-            |('V','L')|('L','D')|('L','M') // VL, LD, LM
-            |('X','D')|('X','M')          // XD, XM
-            |('V','M')                    // VM
-            |('I','L')|('I','C')|('I','D')|('I','M') // IL, IC, ID, IM
-            |('V','D')|('V','C') // VD, VC
-        )
-    }
-
-    let chars: Vec<char> = s.chars().map(|c| c.to_ascii_uppercase()).collect();
-    let mut total = 0u32;
-    let mut i = 0usize;
-
-    // Repetition rules similar to classic Romans:
-    // V, L, D cannot repeat; I, X, C, M max 3 in a row.
-    let mut last_char: Option<char> = None;
-    let mut run_len = 0usize;
-
-    while i < chars.len() {
-        let c = chars[i];
-        let v = val(c).ok_or_else(|| format!("invalid character '{c}'"))?;
-
-        if Some(c) == last_char {
-            run_len += 1;
-            match c {
-                'V' | 'L' | 'D' => return Err(format!("invalid repetition of '{c}'")),
-                _ if run_len >= 3 => return Err(format!("invalid repetition of '{c}'")),
-                _ => {}
-            }
-        } else {
-            last_char = Some(c);
-            run_len = 0;
-        }
-
-        if i + 1 < chars.len() {
-            let c2 = chars[i + 1];
-            let v2 = val(c2).ok_or_else(|| format!("invalid character '{c2}'"))?;
-            if v < v2 {
-                if !allowed_subtractive(c, c2) {
-                    return Err(format!("invalid subtractive pair '{c}{c2}'"));
-                }
-                // Disallow stacked subtractives like IIV, XXL:
-                if run_len > 0 {
-                    return Err(format!("malformed numeral near position {i}"));
-                }
-                total += v2 - v;
-                i += 2;
-                last_char = None;
-                run_len = 0;
-                continue;
-            }
-        }
-
-        total += v;
-        i += 1;
-    }
-    Ok(total)
-}
-
-/// Classic Roman (strict) encoder used as a base for all forms.
-fn to_roman(mut n: u32) -> Result<String, String> {
-    if !(1..=3999).contains(&n) {
-        return Err("value out of range (must be 1..=3999)".into());
-    }
-
-    const MAP: &[(u32, &str)] = &[
-        (1000, "M"),
-        (900, "CM"),
-        (500, "D"),
-        (400, "CD"),
-        (100, "C"),
-        (90, "XC"),
-        (50, "L"),
-        (40, "XL"),
-        (10, "X"),
-        (9, "IX"),
-        (5, "V"),
-        (4, "IV"),
-        (1, "I"),
-    ];
-
-    let mut out = String::with_capacity(15);
-    for &(val, sym) in MAP {
-        while n >= val {
-            out.push_str(sym);
-            n -= val;
-        }
-        if n == 0 {
-            break;
-        }
-    }
-    Ok(out)
-}
-
-/// Excel/Google Sheets compatible ROMAN(number, [form]) encoder.
-/// `form`: 0..=4 (0=Classic, 4=Simplified).
-pub fn to_roman_with_form(n: u32, form: i32) -> Result<String, String> {
-    let mut s = to_roman(n)?;
-    if form == 0 {
-        return Ok(s);
-    }
-    if !(0..=4).contains(&form) {
-        return Err("form must be between 0 and 4".into());
-    }
-
-    // Base rules (apply for all f >= 1)
-    let base_rules: &[(&str, &str)] = &[
-        // C(D|M)XC -> L$1XL
-        ("CDXC", "LDXL"),
-        ("CMXC", "LMXL"),
-        // C(D|M)L -> L$1
-        ("CDL", "LD"),
-        ("CML", "LM"),
-        // X(L|C)IX -> V$1IV
-        ("XLIX", "VLIV"),
-        ("XCIX", "VCIV"),
-        // X(L|C)V -> V$1
-        ("XLV", "VL"),
-        ("XCV", "VC"),
-    ];
-
-    // Level 2 extra rules
-    let lvl2_rules: &[(&str, &str)] = &[
-        // V(L|C)IV -> I$1
-        ("VLIV", "IL"),
-        ("VCIV", "IC"),
-        // L(D|M)XL -> X$1
-        ("LDXL", "XD"),
-        ("LMXL", "XM"),
-        // L(D|M)VL -> X$1V
-        ("LDVL", "XDV"),
-        ("LMVL", "XMV"),
-        // L(D|M)IL -> X$1IX
-        ("LDIL", "XDIX"),
-        ("LMIL", "XMIX"),
-    ];
-
-    // Level 3 extra rules
-    let lvl3_rules: &[(&str, &str)] = &[
-        // X(D|M)V -> V$1
-        ("XDV", "VD"),
-        ("XMV", "VM"),
-        // X(D|M)IX -> V$1IV
-        ("XDIX", "VDIV"),
-        ("XMIX", "VMIV"),
-    ];
-
-    // Level 4 extra rules
-    let lvl4_rules: &[(&str, &str)] = &[
-        // V(D|M)IV -> I$1
-        ("VDIV", "ID"),
-        ("VMIV", "IM"),
-    ];
-
-    // Helper to apply a batch of (from -> to) globally, in order.
-    fn apply_rules(mut t: String, rules: &[(&str, &str)]) -> String {
-        for (from, to) in rules {
-            if t.contains(from) {
-                t = t.replace(from, to);
-            }
-        }
-        t
-    }
-
-    s = apply_rules(s, base_rules);
-    if form >= 2 {
-        s = apply_rules(s, lvl2_rules);
-    }
-    if form >= 3 {
-        s = apply_rules(s, lvl3_rules);
-    }
-    if form >= 4 {
-        s = apply_rules(s, lvl4_rules);
-    }
-    Ok(s)
-}

base/src/functions/mathematical_sum.rs

@@ -1,230 +0,0 @@
-use crate::expressions::types::CellReferenceIndex;
-
-use crate::{
-    calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
-};
-
-type TwoMatricesResult = (i32, i32, Vec<Option<f64>>, Vec<Option<f64>>);
-
-// Helper to check if two shapes are the same or compatible 1D shapes
-fn is_same_shape_or_1d(rows1: i32, cols1: i32, rows2: i32, cols2: i32) -> bool {
-    (rows1 == rows2 && cols1 == cols2)
-        || (rows1 == 1 && cols2 == 1 && cols1 == rows2)
-        || (rows2 == 1 && cols1 == 1 && cols2 == rows1)
-}
-
-impl<'a> Model<'a> {
-    // SUMX2MY2(array_x, array_y) - Returns the sum of the difference of squares
-    pub(crate) fn fn_sumx2my2(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        let result = match self.fn_get_two_matrices(args, cell) {
-            Ok(s) => s,
-            Err(s) => return s,
-        };
-
-        let (_, _, values_left, values_right) = result;
-
-        let mut sum = 0.0;
-        for (x_opt, y_opt) in values_left.into_iter().zip(values_right.into_iter()) {
-            let x = x_opt.unwrap_or(0.0);
-            let y = y_opt.unwrap_or(0.0);
-            sum += x * x - y * y;
-        }
-
-        CalcResult::Number(sum)
-    }
-
-    // SUMX2PY2(array_x, array_y) - Returns the sum of the sum of squares
-    pub(crate) fn fn_sumx2py2(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        let result = match self.fn_get_two_matrices(args, cell) {
-            Ok(s) => s,
-            Err(s) => return s,
-        };
-
-        let (_rows, _cols, values_left, values_right) = result;
-
-        let mut sum = 0.0;
-        for (x_opt, y_opt) in values_left.into_iter().zip(values_right.into_iter()) {
-            let x = x_opt.unwrap_or(0.0);
-            let y = y_opt.unwrap_or(0.0);
-            sum += x * x + y * y;
-        }
-
-        CalcResult::Number(sum)
-    }
-
-    // SUMXMY2(array_x, array_y) - Returns the sum of squares of differences
-    pub(crate) fn fn_sumxmy2(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        let result = match self.fn_get_two_matrices(args, cell) {
-            Ok(s) => s,
-            Err(s) => return s,
-        };
-
-        let (_, _, values_left, values_right) = result;
-
-        let mut sum = 0.0;
-        for (x_opt, y_opt) in values_left.into_iter().zip(values_right.into_iter()) {
-            let x = x_opt.unwrap_or(0.0);
-            let y = y_opt.unwrap_or(0.0);
-            let diff = x - y;
-            sum += diff * diff;
-        }
-
-        CalcResult::Number(sum)
-    }
-
-    // Helper function to extract and validate two matrices (ranges or arrays) with compatible shapes.
-    // Returns (rows, cols, values_left, values_right) or an error.
-    pub(crate) fn fn_get_two_matrices(
-        &mut self,
-        args: &[Node],
-        cell: CellReferenceIndex,
-    ) -> Result<TwoMatricesResult, CalcResult> {
-        if args.len() != 2 {
-            return Err(CalcResult::new_args_number_error(cell));
-        }
-        let x_range = self.evaluate_node_in_context(&args[0], cell);
-        let y_range = self.evaluate_node_in_context(&args[1], cell);
-
-        let result = match (x_range, y_range) {
-            (
-                CalcResult::Range {
-                    left: l1,
-                    right: r1,
-                },
-                CalcResult::Range {
-                    left: l2,
-                    right: r2,
-                },
-            ) => {
-                if l1.sheet != l2.sheet {
-                    return Err(CalcResult::new_error(
-                        Error::VALUE,
-                        cell,
-                        "Ranges are in different sheets".to_string(),
-                    ));
-                }
-                let rows1 = r1.row - l1.row + 1;
-                let cols1 = r1.column - l1.column + 1;
-                let rows2 = r2.row - l2.row + 1;
-                let cols2 = r2.column - l2.column + 1;
-                if !is_same_shape_or_1d(rows1, cols1, rows2, cols2) {
-                    return Err(CalcResult::new_error(
-                        Error::VALUE,
-                        cell,
-                        "Ranges must be of the same shape".to_string(),
-                    ));
-                }
-                let values_left = self.values_from_range(l1, r1)?;
-                let values_right = self.values_from_range(l2, r2)?;
-                (rows1, cols1, values_left, values_right)
-            }
-            (
-                CalcResult::Array(left),
-                CalcResult::Range {
-                    left: l2,
-                    right: r2,
-                },
-            ) => {
-                let rows2 = r2.row - l2.row + 1;
-                let cols2 = r2.column - l2.column + 1;
-
-                let rows1 = left.len() as i32;
-                let cols1 = if rows1 > 0 { left[0].len() as i32 } else { 0 };
-                if !is_same_shape_or_1d(rows1, cols1, rows2, cols2) {
-                    return Err(CalcResult::new_error(
-                        Error::VALUE,
-                        cell,
-                        "Array and range must be of the same shape".to_string(),
-                    ));
-                }
-                let values_left = match self.values_from_array(left) {
-                    Err(error) => {
-                        return Err(CalcResult::new_error(
-                            Error::VALUE,
-                            cell,
-                            format!("Error in first array: {:?}", error),
-                        ));
-                    }
-                    Ok(v) => v,
-                };
-                let values_right = self.values_from_range(l2, r2)?;
-                (rows2, cols2, values_left, values_right)
-            }
-            (
-                CalcResult::Range {
-                    left: l1,
-                    right: r1,
-                },
-                CalcResult::Array(right),
-            ) => {
-                let rows1 = r1.row - l1.row + 1;
-                let cols1 = r1.column - l1.column + 1;
-
-                let rows2 = right.len() as i32;
-                let cols2 = if rows2 > 0 { right[0].len() as i32 } else { 0 };
-                if !is_same_shape_or_1d(rows1, cols1, rows2, cols2) {
-                    return Err(CalcResult::new_error(
-                        Error::VALUE,
-                        cell,
-                        "Range and array must be of the same shape".to_string(),
-                    ));
-                }
-                let values_left = self.values_from_range(l1, r1)?;
-                let values_right = match self.values_from_array(right) {
-                    Err(error) => {
-                        return Err(CalcResult::new_error(
-                            Error::VALUE,
-                            cell,
-                            format!("Error in second array: {:?}", error),
-                        ));
-                    }
-                    Ok(v) => v,
-                };
-                (rows1, cols1, values_left, values_right)
-            }
-            (CalcResult::Array(left), CalcResult::Array(right)) => {
-                let rows1 = left.len() as i32;
-                let rows2 = right.len() as i32;
-                let cols1 = if rows1 > 0 { left[0].len() as i32 } else { 0 };
-                let cols2 = if rows2 > 0 { right[0].len() as i32 } else { 0 };
-
-                if !is_same_shape_or_1d(rows1, cols1, rows2, cols2) {
-                    return Err(CalcResult::new_error(
-                        Error::VALUE,
-                        cell,
-                        "Arrays must be of the same shape".to_string(),
-                    ));
-                }
-                let values_left = match self.values_from_array(left) {
-                    Err(error) => {
-                        return Err(CalcResult::new_error(
-                            Error::VALUE,
-                            cell,
-                            format!("Error in first array: {:?}", error),
-                        ));
-                    }
-                    Ok(v) => v,
-                };
-                let values_right = match self.values_from_array(right) {
-                    Err(error) => {
-                        return Err(CalcResult::new_error(
-                            Error::VALUE,
-                            cell,
-                            format!("Error in second array: {:?}", error),
-                        ));
-                    }
-                    Ok(v) => v,
-                };
-                (rows1, cols1, values_left, values_right)
-            }
-            _ => {
-                return Err(CalcResult::new_error(
-                    Error::VALUE,
-                    cell,
-                    "Both arguments must be ranges or arrays".to_string(),
-                ));
-            }
-        };
-        Ok(result)
-    }
-}

base/src/functions/statistical.rs

@@ -0,0 +1,733 @@
+use crate::constants::{LAST_COLUMN, LAST_ROW};
+use crate::expressions::types::CellReferenceIndex;
+use crate::{
+    calc_result::{CalcResult, Range},
+    expressions::parser::Node,
+    expressions::token::Error,
+    model::Model,
+};
+
+use super::util::build_criteria;
+
+impl Model {
+    pub(crate) fn fn_average(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        if args.is_empty() {
+            return CalcResult::new_args_number_error(cell);
+        }
+        let mut count = 0.0;
+        let mut sum = 0.0;
+        for arg in args {
+            match self.evaluate_node_in_context(arg, cell) {
+                CalcResult::Number(value) => {
+                    count += 1.0;
+                    sum += value;
+                }
+                CalcResult::Boolean(b) => {
+                    if let Node::ReferenceKind { .. } = arg {
+                    } else {
+                        sum += if b { 1.0 } else { 0.0 };
+                        count += 1.0;
+                    }
+                }
+                CalcResult::Range { left, right } => {
+                    if left.sheet != right.sheet {
+                        return CalcResult::new_error(
+                            Error::VALUE,
+                            cell,
+                            "Ranges are in different sheets".to_string(),
+                        );
+                    }
+                    for row in left.row..(right.row + 1) {
+                        for column in left.column..(right.column + 1) {
+                            match self.evaluate_cell(CellReferenceIndex {
+                                sheet: left.sheet,
+                                row,
+                                column,
+                            }) {
+                                CalcResult::Number(value) => {
+                                    count += 1.0;
+                                    sum += value;
+                                }
+                                error @ CalcResult::Error { .. } => return error,
+                                CalcResult::Range { .. } => {
+                                    return CalcResult::new_error(
+                                        Error::ERROR,
+                                        cell,
+                                        "Unexpected Range".to_string(),
+                                    );
+                                }
+                                _ => {}
+                            }
+                        }
+                    }
+                }
+                error @ CalcResult::Error { .. } => return error,
+                CalcResult::String(s) => {
+                    if let Node::ReferenceKind { .. } = arg {
+                        // Do nothing
+                    } else if let Ok(t) = s.parse::<f64>() {
+                        sum += t;
+                        count += 1.0;
+                    } else {
+                        return CalcResult::Error {
+                            error: Error::VALUE,
+                            origin: cell,
+                            message: "Argument cannot be cast into number".to_string(),
+                        };
+                    }
+                }
+                _ => {
+                    // Ignore everything else
+                }
+            };
+        }
+        if count == 0.0 {
+            return CalcResult::Error {
+                error: Error::DIV,
+                origin: cell,
+                message: "Division by Zero".to_string(),
+            };
+        }
+        CalcResult::Number(sum / count)
+    }
+
+    pub(crate) fn fn_averagea(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        if args.is_empty() {
+            return CalcResult::new_args_number_error(cell);
+        }
+        let mut count = 0.0;
+        let mut sum = 0.0;
+        for arg in args {
+            match self.evaluate_node_in_context(arg, cell) {
+                CalcResult::Range { left, right } => {
+                    if left.sheet != right.sheet {
+                        return CalcResult::new_error(
+                            Error::VALUE,
+                            cell,
+                            "Ranges are in different sheets".to_string(),
+                        );
+                    }
+                    for row in left.row..(right.row + 1) {
+                        for column in left.column..(right.column + 1) {
+                            match self.evaluate_cell(CellReferenceIndex {
+                                sheet: left.sheet,
+                                row,
+                                column,
+                            }) {
+                                CalcResult::String(_) => count += 1.0,
+                                CalcResult::Number(value) => {
+                                    count += 1.0;
+                                    sum += value;
+                                }
+                                CalcResult::Boolean(b) => {
+                                    if b {
+                                        sum += 1.0;
+                                    }
+                                    count += 1.0;
+                                }
+                                error @ CalcResult::Error { .. } => return error,
+                                CalcResult::Range { .. } => {
+                                    return CalcResult::new_error(
+                                        Error::ERROR,
+                                        cell,
+                                        "Unexpected Range".to_string(),
+                                    );
+                                }
+                                CalcResult::EmptyCell | CalcResult::EmptyArg => {}
+                                CalcResult::Array(_) => {
+                                    return CalcResult::Error {
+                                        error: Error::NIMPL,
+                                        origin: cell,
+                                        message: "Arrays not supported yet".to_string(),
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                CalcResult::Number(value) => {
+                    count += 1.0;
+                    sum += value;
+                }
+                CalcResult::String(s) => {
+                    if let Node::ReferenceKind { .. } = arg {
+                        // Do nothing
+                        count += 1.0;
+                    } else if let Ok(t) = s.parse::<f64>() {
+                        sum += t;
+                        count += 1.0;
+                    } else {
+                        return CalcResult::Error {
+                            error: Error::VALUE,
+                            origin: cell,
+                            message: "Argument cannot be cast into number".to_string(),
+                        };
+                    }
+                }
+                CalcResult::Boolean(b) => {
+                    count += 1.0;
+                    if b {
+                        sum += 1.0;
+                    }
+                }
+                error @ CalcResult::Error { .. } => return error,
+                CalcResult::EmptyCell | CalcResult::EmptyArg => {}
+                CalcResult::Array(_) => {
+                    return CalcResult::Error {
+                        error: Error::NIMPL,
+                        origin: cell,
+                        message: "Arrays not supported yet".to_string(),
+                    }
+                }
+            };
+        }
+        if count == 0.0 {
+            return CalcResult::Error {
+                error: Error::DIV,
+                origin: cell,
+                message: "Division by Zero".to_string(),
+            };
+        }
+        CalcResult::Number(sum / count)
+    }
+
+    pub(crate) fn fn_count(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        if args.is_empty() {
+            return CalcResult::new_args_number_error(cell);
+        }
+        let mut result = 0.0;
+        for arg in args {
+            match self.evaluate_node_in_context(arg, cell) {
+                CalcResult::Number(_) => {
+                    result += 1.0;
+                }
+                CalcResult::Boolean(_) => {
+                    if !matches!(arg, Node::ReferenceKind { .. }) {
+                        result += 1.0;
+                    }
+                }
+                CalcResult::String(s) => {
+                    if !matches!(arg, Node::ReferenceKind { .. }) && s.parse::<f64>().is_ok() {
+                        result += 1.0;
+                    }
+                }
+                CalcResult::Range { left, right } => {
+                    if left.sheet != right.sheet {
+                        return CalcResult::new_error(
+                            Error::VALUE,
+                            cell,
+                            "Ranges are in different sheets".to_string(),
+                        );
+                    }
+                    for row in left.row..(right.row + 1) {
+                        for column in left.column..(right.column + 1) {
+                            if let CalcResult::Number(_) = self.evaluate_cell(CellReferenceIndex {
+                                sheet: left.sheet,
+                                row,
+                                column,
+                            }) {
+                                result += 1.0;
+                            }
+                        }
+                    }
+                }
+                _ => {
+                    // Ignore everything else
+                }
+            };
+        }
+        CalcResult::Number(result)
+    }
+
+    pub(crate) fn fn_counta(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        if args.is_empty() {
+            return CalcResult::new_args_number_error(cell);
+        }
+        let mut result = 0.0;
+        for arg in args {
+            match self.evaluate_node_in_context(arg, cell) {
+                CalcResult::EmptyCell | CalcResult::EmptyArg => {}
+                CalcResult::Range { left, right } => {
+                    if left.sheet != right.sheet {
+                        return CalcResult::new_error(
+                            Error::VALUE,
+                            cell,
+                            "Ranges are in different sheets".to_string(),
+                        );
+                    }
+                    for row in left.row..(right.row + 1) {
+                        for column in left.column..(right.column + 1) {
+                            match self.evaluate_cell(CellReferenceIndex {
+                                sheet: left.sheet,
+                                row,
+                                column,
+                            }) {
+                                CalcResult::EmptyCell | CalcResult::EmptyArg => {}
+                                _ => {
+                                    result += 1.0;
+                                }
+                            }
+                        }
+                    }
+                }
+                _ => {
+                    result += 1.0;
+                }
+            };
+        }
+        CalcResult::Number(result)
+    }
+
+    pub(crate) fn fn_countblank(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        // COUNTBLANK requires only one argument
+        if args.len() != 1 {
+            return CalcResult::new_args_number_error(cell);
+        }
+        let mut result = 0.0;
+        for arg in args {
+            match self.evaluate_node_in_context(arg, cell) {
+                CalcResult::EmptyCell | CalcResult::EmptyArg => result += 1.0,
+                CalcResult::String(s) => {
+                    if s.is_empty() {
+                        result += 1.0
+                    }
+                }
+                CalcResult::Range { left, right } => {
+                    if left.sheet != right.sheet {
+                        return CalcResult::new_error(
+                            Error::VALUE,
+                            cell,
+                            "Ranges are in different sheets".to_string(),
+                        );
+                    }
+                    for row in left.row..(right.row + 1) {
+                        for column in left.column..(right.column + 1) {
+                            match self.evaluate_cell(CellReferenceIndex {
+                                sheet: left.sheet,
+                                row,
+                                column,
+                            }) {
+                                CalcResult::EmptyCell | CalcResult::EmptyArg => result += 1.0,
+                                CalcResult::String(s) => {
+                                    if s.is_empty() {
+                                        result += 1.0
+                                    }
+                                }
+                                _ => {}
+                            }
+                        }
+                    }
+                }
+                _ => {}
+            };
+        }
+        CalcResult::Number(result)
+    }
+
+    pub(crate) fn fn_countif(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        if args.len() == 2 {
+            let arguments = vec![args[0].clone(), args[1].clone()];
+            self.fn_countifs(&arguments, cell)
+        } else {
+            CalcResult::new_args_number_error(cell)
+        }
+    }
+
+    /// AVERAGEIF(criteria_range, criteria, [average_range])
+    /// if average_rage is missing then criteria_range will be used
+    pub(crate) fn fn_averageif(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        if args.len() == 2 {
+            let arguments = vec![args[0].clone(), args[0].clone(), args[1].clone()];
+            self.fn_averageifs(&arguments, cell)
+        } else if args.len() == 3 {
+            let arguments = vec![args[2].clone(), args[0].clone(), args[1].clone()];
+            self.fn_averageifs(&arguments, cell)
+        } else {
+            CalcResult::new_args_number_error(cell)
+        }
+    }
+
+    // FIXME: This function shares a lot of code with apply_ifs. Can we merge them?
+    pub(crate) fn fn_countifs(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        let args_count = args.len();
+        if args_count < 2 || args_count % 2 == 1 {
+            return CalcResult::new_args_number_error(cell);
+        }
+
+        let case_count = args_count / 2;
+        // NB: this is a beautiful example of the borrow checker
+        // The order of these two definitions cannot be swapped.
+        let mut criteria = Vec::new();
+        let mut fn_criteria = Vec::new();
+        let ranges = &mut Vec::new();
+        for case_index in 0..case_count {
+            let criterion = self.evaluate_node_in_context(&args[case_index * 2 + 1], cell);
+            criteria.push(criterion);
+            // NB: We cannot do:
+            // fn_criteria.push(build_criteria(&criterion));
+            // because criterion doesn't live long enough
+            let result = self.evaluate_node_in_context(&args[case_index * 2], cell);
+            if result.is_error() {
+                return result;
+            }
+            if let CalcResult::Range { left, right } = result {
+                if left.sheet != right.sheet {
+                    return CalcResult::new_error(
+                        Error::VALUE,
+                        cell,
+                        "Ranges are in different sheets".to_string(),
+                    );
+                }
+                // TODO test ranges are of the same size as sum_range
+                ranges.push(Range { left, right });
+            } else {
+                return CalcResult::new_error(Error::VALUE, cell, "Expected a range".to_string());
+            }
+        }
+        for criterion in criteria.iter() {
+            fn_criteria.push(build_criteria(criterion));
+        }
+
+        let mut total = 0.0;
+        let first_range = &ranges[0];
+        let left_row = first_range.left.row;
+        let left_column = first_range.left.column;
+        let right_row = first_range.right.row;
+        let right_column = first_range.right.column;
+
+        let dimension = match self.workbook.worksheet(first_range.left.sheet) {
+            Ok(s) => s.dimension(),
+            Err(_) => {
+                return CalcResult::new_error(
+                    Error::ERROR,
+                    cell,
+                    format!("Invalid worksheet index: '{}'", first_range.left.sheet),
+                )
+            }
+        };
+        let max_row = dimension.max_row;
+        let max_column = dimension.max_column;
+
+        let open_row = left_row == 1 && right_row == LAST_ROW;
+        let open_column = left_column == 1 && right_column == LAST_COLUMN;
+
+        for row in left_row..right_row + 1 {
+            if open_row && row > max_row {
+                // If the row is larger than the max row in the sheet then all cells are empty.
+                // We compute it only once
+                let mut is_true = true;
+                for fn_criterion in fn_criteria.iter() {
+                    if !fn_criterion(&CalcResult::EmptyCell) {
+                        is_true = false;
+                        break;
+                    }
+                }
+                if is_true {
+                    total += ((LAST_ROW - max_row) * (right_column - left_column + 1)) as f64;
+                }
+                break;
+            }
+            for column in left_column..right_column + 1 {
+                if open_column && column > max_column {
+                    // If the column is larger than the max column in the sheet then all cells are empty.
+                    // We compute it only once
+                    let mut is_true = true;
+                    for fn_criterion in fn_criteria.iter() {
+                        if !fn_criterion(&CalcResult::EmptyCell) {
+                            is_true = false;
+                            break;
+                        }
+                    }
+                    if is_true {
+                        total += (LAST_COLUMN - max_column) as f64;
+                    }
+                    break;
+                }
+                let mut is_true = true;
+                for case_index in 0..case_count {
+                    // We check if value in range n meets criterion n
+                    let range = &ranges[case_index];
+                    let fn_criterion = &fn_criteria[case_index];
+                    let value = self.evaluate_cell(CellReferenceIndex {
+                        sheet: range.left.sheet,
+                        row: range.left.row + row - first_range.left.row,
+                        column: range.left.column + column - first_range.left.column,
+                    });
+                    if !fn_criterion(&value) {
+                        is_true = false;
+                        break;
+                    }
+                }
+                if is_true {
+                    total += 1.0;
+                }
+            }
+        }
+        CalcResult::Number(total)
+    }
+
+    pub(crate) fn apply_ifs<F>(
+        &mut self,
+        args: &[Node],
+        cell: CellReferenceIndex,
+        mut apply: F,
+    ) -> Result<(), CalcResult>
+    where
+        F: FnMut(f64),
+    {
+        let args_count = args.len();
+        if args_count < 3 || args_count % 2 == 0 {
+            return Err(CalcResult::new_args_number_error(cell));
+        }
+        let arg_0 = self.evaluate_node_in_context(&args[0], cell);
+        if arg_0.is_error() {
+            return Err(arg_0);
+        }
+        let sum_range = if let CalcResult::Range { left, right } = arg_0 {
+            if left.sheet != right.sheet {
+                return Err(CalcResult::new_error(
+                    Error::VALUE,
+                    cell,
+                    "Ranges are in different sheets".to_string(),
+                ));
+            }
+            Range { left, right }
+        } else {
+            return Err(CalcResult::new_error(
+                Error::VALUE,
+                cell,
+                "Expected a range".to_string(),
+            ));
+        };
+
+        let case_count = (args_count - 1) / 2;
+        // NB: this is a beautiful example of the borrow checker
+        // The order of these two definitions cannot be swapped.
+        let mut criteria = Vec::new();
+        let mut fn_criteria = Vec::new();
+        let ranges = &mut Vec::new();
+        for case_index in 1..=case_count {
+            let criterion = self.evaluate_node_in_context(&args[case_index * 2], cell);
+            // NB: criterion might be an error. That's ok
+            criteria.push(criterion);
+            // NB: We cannot do:
+            // fn_criteria.push(build_criteria(&criterion));
+            // because criterion doesn't live long enough
+            let result = self.evaluate_node_in_context(&args[case_index * 2 - 1], cell);
+            if result.is_error() {
+                return Err(result);
+            }
+            if let CalcResult::Range { left, right } = result {
+                if left.sheet != right.sheet {
+                    return Err(CalcResult::new_error(
+                        Error::VALUE,
+                        cell,
+                        "Ranges are in different sheets".to_string(),
+                    ));
+                }
+                // TODO test ranges are of the same size as sum_range
+                ranges.push(Range { left, right });
+            } else {
+                return Err(CalcResult::new_error(
+                    Error::VALUE,
+                    cell,
+                    "Expected a range".to_string(),
+                ));
+            }
+        }
+        for criterion in criteria.iter() {
+            fn_criteria.push(build_criteria(criterion));
+        }
+
+        let left_row = sum_range.left.row;
+        let left_column = sum_range.left.column;
+        let mut right_row = sum_range.right.row;
+        let mut right_column = sum_range.right.column;
+
+        if left_row == 1 && right_row == LAST_ROW {
+            right_row = match self.workbook.worksheet(sum_range.left.sheet) {
+                Ok(s) => s.dimension().max_row,
+                Err(_) => {
+                    return Err(CalcResult::new_error(
+                        Error::ERROR,
+                        cell,
+                        format!("Invalid worksheet index: '{}'", sum_range.left.sheet),
+                    ));
+                }
+            };
+        }
+        if left_column == 1 && right_column == LAST_COLUMN {
+            right_column = match self.workbook.worksheet(sum_range.left.sheet) {
+                Ok(s) => s.dimension().max_column,
+                Err(_) => {
+                    return Err(CalcResult::new_error(
+                        Error::ERROR,
+                        cell,
+                        format!("Invalid worksheet index: '{}'", sum_range.left.sheet),
+                    ));
+                }
+            };
+        }
+
+        for row in left_row..right_row + 1 {
+            for column in left_column..right_column + 1 {
+                let mut is_true = true;
+                for case_index in 0..case_count {
+                    // We check if value in range n meets criterion n
+                    let range = &ranges[case_index];
+                    let fn_criterion = &fn_criteria[case_index];
+                    let value = self.evaluate_cell(CellReferenceIndex {
+                        sheet: range.left.sheet,
+                        row: range.left.row + row - sum_range.left.row,
+                        column: range.left.column + column - sum_range.left.column,
+                    });
+                    if !fn_criterion(&value) {
+                        is_true = false;
+                        break;
+                    }
+                }
+                if is_true {
+                    let v = self.evaluate_cell(CellReferenceIndex {
+                        sheet: sum_range.left.sheet,
+                        row,
+                        column,
+                    });
+                    match v {
+                        CalcResult::Number(n) => apply(n),
+                        CalcResult::Error { .. } => return Err(v),
+                        _ => {}
+                    }
+                }
+            }
+        }
+        Ok(())
+    }
+
+    pub(crate) fn fn_averageifs(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        let mut total = 0.0;
+        let mut count = 0.0;
+
+        let average = |value: f64| {
+            total += value;
+            count += 1.0;
+        };
+        if let Err(e) = self.apply_ifs(args, cell, average) {
+            return e;
+        }
+
+        if count == 0.0 {
+            return CalcResult::Error {
+                error: Error::DIV,
+                origin: cell,
+                message: "division by 0".to_string(),
+            };
+        }
+        CalcResult::Number(total / count)
+    }
+
+    pub(crate) fn fn_minifs(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        let mut min = f64::INFINITY;
+        let apply_min = |value: f64| min = value.min(min);
+        if let Err(e) = self.apply_ifs(args, cell, apply_min) {
+            return e;
+        }
+
+        if min.is_infinite() {
+            min = 0.0;
+        }
+        CalcResult::Number(min)
+    }
+
+    pub(crate) fn fn_maxifs(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        let mut max = -f64::INFINITY;
+        let apply_max = |value: f64| max = value.max(max);
+        if let Err(e) = self.apply_ifs(args, cell, apply_max) {
+            return e;
+        }
+        if max.is_infinite() {
+            max = 0.0;
+        }
+        CalcResult::Number(max)
+    }
+
+    pub(crate) fn fn_geomean(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        if args.is_empty() {
+            return CalcResult::new_args_number_error(cell);
+        }
+        let mut count = 0.0;
+        let mut product = 1.0;
+        for arg in args {
+            match self.evaluate_node_in_context(arg, cell) {
+                CalcResult::Number(value) => {
+                    count += 1.0;
+                    product *= value;
+                }
+                CalcResult::Boolean(b) => {
+                    if let Node::ReferenceKind { .. } = arg {
+                    } else {
+                        product *= if b { 1.0 } else { 0.0 };
+                        count += 1.0;
+                    }
+                }
+                CalcResult::Range { left, right } => {
+                    if left.sheet != right.sheet {
+                        return CalcResult::new_error(
+                            Error::VALUE,
+                            cell,
+                            "Ranges are in different sheets".to_string(),
+                        );
+                    }
+                    for row in left.row..(right.row + 1) {
+                        for column in left.column..(right.column + 1) {
+                            match self.evaluate_cell(CellReferenceIndex {
+                                sheet: left.sheet,
+                                row,
+                                column,
+                            }) {
+                                CalcResult::Number(value) => {
+                                    count += 1.0;
+                                    product *= value;
+                                }
+                                error @ CalcResult::Error { .. } => return error,
+                                CalcResult::Range { .. } => {
+                                    return CalcResult::new_error(
+                                        Error::ERROR,
+                                        cell,
+                                        "Unexpected Range".to_string(),
+                                    );
+                                }
+                                _ => {}
+                            }
+                        }
+                    }
+                }
+                error @ CalcResult::Error { .. } => return error,
+                CalcResult::String(s) => {
+                    if let Node::ReferenceKind { .. } = arg {
+                        // Do nothing
+                    } else if let Ok(t) = s.parse::<f64>() {
+                        product *= t;
+                        count += 1.0;
+                    } else {
+                        return CalcResult::Error {
+                            error: Error::VALUE,
+                            origin: cell,
+                            message: "Argument cannot be cast into number".to_string(),
+                        };
+                    }
+                }
+                _ => {
+                    // Ignore everything else
+                }
+            };
+        }
+        if count == 0.0 {
+            return CalcResult::Error {
+                error: Error::DIV,
+                origin: cell,
+                message: "Division by Zero".to_string(),
+            };
+        }
+        CalcResult::Number(product.powf(1.0 / count))
+    }
+}

base/src/functions/statistical/beta.rs

@@ -1,213 +0,0 @@
-use statrs::distribution::{Beta, Continuous, ContinuousCDF};
-
-use crate::expressions::types::CellReferenceIndex;
-use crate::{
-    calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
-};
-
-impl<'a> Model<'a> {
-    // BETA.DIST(x, alpha, beta, cumulative, [A], [B])
-    pub(crate) fn fn_beta_dist(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        let arg_count = args.len();
-        if !(4..=6).contains(&arg_count) {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let x = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-        let alpha = match self.get_number_no_bools(&args[1], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-        let beta_param = match self.get_number_no_bools(&args[2], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-
-        // cumulative argument: interpret like Excel
-        let cumulative = match self.evaluate_node_in_context(&args[3], cell) {
-            CalcResult::Boolean(b) => b,
-            CalcResult::Number(n) => n != 0.0,
-            CalcResult::String(s) => {
-                let up = s.to_ascii_uppercase();
-                if up == "TRUE" {
-                    true
-                } else if up == "FALSE" {
-                    false
-                } else {
-                    return CalcResult::Error {
-                        error: Error::VALUE,
-                        origin: cell,
-                        message: "cumulative must be TRUE/FALSE or numeric".to_string(),
-                    };
-                }
-            }
-            error @ CalcResult::Error { .. } => return error,
-            _ => {
-                return CalcResult::Error {
-                    error: Error::VALUE,
-                    origin: cell,
-                    message: "Invalid cumulative argument".to_string(),
-                }
-            }
-        };
-
-        // Optional A, B
-        let a = if arg_count >= 5 {
-            match self.get_number_no_bools(&args[4], cell) {
-                Ok(f) => f,
-                Err(e) => return e,
-            }
-        } else {
-            0.0
-        };
-
-        let b = if arg_count >= 6 {
-            match self.get_number_no_bools(&args[5], cell) {
-                Ok(f) => f,
-                Err(e) => return e,
-            }
-        } else {
-            1.0
-        };
-
-        // Excel: alpha <= 0 or beta <= 0 → #NUM!
-        if alpha <= 0.0 || beta_param <= 0.0 {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "alpha and beta must be > 0 in BETA.DIST".to_string(),
-            );
-        }
-
-        // Excel: if x < A, x > B, or A = B → #NUM!
-        if b == a || x < a || x > b {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "x must be between A and B and A < B in BETA.DIST".to_string(),
-            );
-        }
-
-        // Transform to standard Beta(0,1)
-        let width = b - a;
-        let t = (x - a) / width;
-
-        let dist = match Beta::new(alpha, beta_param) {
-            Ok(d) => d,
-            Err(_) => {
-                return CalcResult::new_error(
-                    Error::NUM,
-                    cell,
-                    "Invalid parameters for Beta distribution".to_string(),
-                )
-            }
-        };
-
-        let result = if cumulative {
-            dist.cdf(t)
-        } else {
-            // general-interval beta pdf: f_X(x) = f_T(t) / (B - A), t=(x-A)/(B-A)
-            dist.pdf(t) / width
-        };
-
-        if result.is_nan() || result.is_infinite() {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "Invalid result for BETA.DIST".to_string(),
-            );
-        }
-
-        CalcResult::Number(result)
-    }
-
-    pub(crate) fn fn_beta_inv(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        let arg_count = args.len();
-        if !(3..=5).contains(&arg_count) {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let p = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-        let alpha = match self.get_number_no_bools(&args[1], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-        let beta_param = match self.get_number_no_bools(&args[2], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-
-        let a = if arg_count >= 4 {
-            match self.get_number_no_bools(&args[3], cell) {
-                Ok(f) => f,
-                Err(e) => return e,
-            }
-        } else {
-            0.0
-        };
-
-        let b = if arg_count >= 5 {
-            match self.get_number_no_bools(&args[4], cell) {
-                Ok(f) => f,
-                Err(e) => return e,
-            }
-        } else {
-            1.0
-        };
-
-        if alpha <= 0.0 || beta_param <= 0.0 {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "alpha and beta must be > 0 in BETA.INV".to_string(),
-            );
-        }
-
-        // probability <= 0 or probability > 1 → #NUM!
-        if p <= 0.0 || p > 1.0 {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "probability must be in (0,1] in BETA.INV".to_string(),
-            );
-        }
-
-        if b <= a {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "A must be < B in BETA.INV".to_string(),
-            );
-        }
-
-        let dist = match Beta::new(alpha, beta_param) {
-            Ok(d) => d,
-            Err(_) => {
-                return CalcResult::new_error(
-                    Error::NUM,
-                    cell,
-                    "Invalid parameters for Beta distribution".to_string(),
-                )
-            }
-        };
-
-        let t = dist.inverse_cdf(p);
-        if t.is_nan() || t.is_infinite() {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "Invalid result for BETA.INV".to_string(),
-            );
-        }
-
-        // Map back from [0,1] to [A,B]
-        let x = a + t * (b - a);
-        CalcResult::Number(x)
-    }
-}

base/src/functions/statistical/binom.rs

@@ -1,311 +0,0 @@
-use statrs::distribution::{Binomial, Discrete, DiscreteCDF};
-
-use crate::expressions::types::CellReferenceIndex;
-use crate::{
-    calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
-};
-
-impl<'a> Model<'a> {
-    pub(crate) fn fn_binom_dist(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.len() != 4 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        // number_s
-        let number_s = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f.trunc(),
-            Err(e) => return e,
-        };
-
-        // trials
-        let trials = match self.get_number_no_bools(&args[1], cell) {
-            Ok(f) => f.trunc(),
-            Err(e) => return e,
-        };
-
-        // probability_s
-        let p = match self.get_number_no_bools(&args[2], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-
-        // cumulative (logical)
-        let cumulative = match self.get_boolean(&args[3], cell) {
-            Ok(b) => b,
-            Err(e) => return e,
-        };
-
-        // Domain checks
-        if trials < 0.0
-            || number_s < 0.0
-            || number_s > trials
-            || p.is_nan()
-            || !(0.0..=1.0).contains(&p)
-        {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "Invalid parameters for BINOM.DIST".to_string(),
-            );
-        }
-
-        // Limit to u64
-        if trials > u64::MAX as f64 {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "Number of trials too large".to_string(),
-            );
-        }
-
-        let n = trials as u64;
-        let k = number_s as u64;
-
-        let dist = match Binomial::new(p, n) {
-            Ok(d) => d,
-            Err(_) => {
-                return CalcResult::new_error(
-                    Error::NUM,
-                    cell,
-                    "Invalid parameters for binomial distribution".to_string(),
-                )
-            }
-        };
-
-        let prob = if cumulative { dist.cdf(k) } else { dist.pmf(k) };
-
-        if prob.is_nan() || prob.is_infinite() {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "Invalid result for BINOM.DIST".to_string(),
-            );
-        }
-
-        CalcResult::Number(prob)
-    }
-
-    pub(crate) fn fn_binom_dist_range(
-        &mut self,
-        args: &[Node],
-        cell: CellReferenceIndex,
-    ) -> CalcResult {
-        if args.len() < 3 || args.len() > 4 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        // trials
-        let trials = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f.trunc(),
-            Err(e) => return e,
-        };
-
-        // probability_s
-        let p = match self.get_number_no_bools(&args[1], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-
-        // number_s (lower)
-        let number_s = match self.get_number_no_bools(&args[2], cell) {
-            Ok(f) => f.trunc(),
-            Err(e) => return e,
-        };
-
-        // number_s2 (upper, optional)
-        let number_s2 = if args.len() == 4 {
-            match self.get_number_no_bools(&args[3], cell) {
-                Ok(f) => f.trunc(),
-                Err(e) => return e,
-            }
-        } else {
-            number_s
-        };
-
-        if trials < 0.0
-            || number_s < 0.0
-            || number_s2 < 0.0
-            || number_s > number_s2
-            || number_s2 > trials
-            || p.is_nan()
-            || !(0.0..=1.0).contains(&p)
-        {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "Invalid parameters for BINOM.DIST.RANGE".to_string(),
-            );
-        }
-
-        if trials > u64::MAX as f64 {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "Number of trials too large".to_string(),
-            );
-        }
-
-        let n = trials as u64;
-        let lower = number_s as u64;
-        let upper = number_s2 as u64;
-
-        let dist = match Binomial::new(p, n) {
-            Ok(d) => d,
-            Err(_) => {
-                return CalcResult::new_error(
-                    Error::NUM,
-                    cell,
-                    "Invalid parameters for binomial distribution".to_string(),
-                )
-            }
-        };
-
-        let prob = if lower == 0 {
-            dist.cdf(upper)
-        } else {
-            let cdf_upper = dist.cdf(upper);
-            let cdf_below_lower = dist.cdf(lower - 1);
-            cdf_upper - cdf_below_lower
-        };
-
-        if prob.is_nan() || prob.is_infinite() {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "Invalid result for BINOM.DIST.RANGE".to_string(),
-            );
-        }
-
-        CalcResult::Number(prob)
-    }
-
-    pub(crate) fn fn_binom_inv(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.len() != 3 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        // trials
-        let trials = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f.trunc(),
-            Err(e) => return e,
-        };
-
-        // probability_s
-        let p = match self.get_number_no_bools(&args[1], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-
-        // alpha
-        let alpha = match self.get_number_no_bools(&args[2], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-
-        if trials < 0.0
-            || trials > u64::MAX as f64
-            || p.is_nan()
-            || !(0.0..=1.0).contains(&p)
-            || alpha.is_nan()
-            || !(0.0..=1.0).contains(&alpha)
-        {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "Invalid parameters for BINOM.INV".to_string(),
-            );
-        }
-
-        let n = trials as u64;
-
-        let dist = match Binomial::new(p, n) {
-            Ok(d) => d,
-            Err(_) => {
-                return CalcResult::new_error(
-                    Error::NUM,
-                    cell,
-                    "Invalid parameters for binomial distribution".to_string(),
-                )
-            }
-        };
-
-        // DiscreteCDF::inverse_cdf returns u64 for binomial
-        let k = statrs::distribution::DiscreteCDF::inverse_cdf(&dist, alpha);
-
-        CalcResult::Number(k as f64)
-    }
-
-    pub(crate) fn fn_negbinom_dist(
-        &mut self,
-        args: &[Node],
-        cell: CellReferenceIndex,
-    ) -> CalcResult {
-        use statrs::distribution::{Discrete, DiscreteCDF, NegativeBinomial};
-
-        if args.len() != 4 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let number_f = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f.trunc(),
-            Err(e) => return e,
-        };
-        let number_s = match self.get_number_no_bools(&args[1], cell) {
-            Ok(f) => f.trunc(),
-            Err(e) => return e,
-        };
-        let probability_s = match self.get_number_no_bools(&args[2], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-        let cumulative = match self.get_boolean(&args[3], cell) {
-            Ok(b) => b,
-            Err(e) => return e,
-        };
-
-        if number_f < 0.0 || number_s < 1.0 || !(0.0..=1.0).contains(&probability_s) {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid parameter for NEGBINOM.DIST".to_string(),
-            };
-        }
-
-        // Guard against absurdly large failures that won't fit in u64
-        if number_f > (u64::MAX as f64) {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid parameter for NEGBINOM.DIST".to_string(),
-            };
-        }
-
-        let dist = match NegativeBinomial::new(number_s, probability_s) {
-            Ok(d) => d,
-            Err(_) => {
-                return CalcResult::Error {
-                    error: Error::NUM,
-                    origin: cell,
-                    message: "Invalid parameter for NEGBINOM.DIST".to_string(),
-                }
-            }
-        };
-
-        let f_u = number_f as u64;
-        let result = if cumulative {
-            dist.cdf(f_u)
-        } else {
-            dist.pmf(f_u)
-        };
-
-        if !result.is_finite() {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid parameter for NEGBINOM.DIST".to_string(),
-            };
-        }
-
-        CalcResult::Number(result)
-    }
-}

base/src/functions/statistical/chisq.rs

@@ -1,397 +0,0 @@
-use statrs::distribution::{ChiSquared, Continuous, ContinuousCDF};
-
-use crate::expressions::parser::ArrayNode;
-use crate::expressions::types::CellReferenceIndex;
-use crate::{
-    calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
-};
-
-impl<'a> Model<'a> {
-    // CHISQ.DIST(x, deg_freedom, cumulative)
-    pub(crate) fn fn_chisq_dist(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.len() != 3 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let x = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-
-        let df = match self.get_number_no_bools(&args[1], cell) {
-            Ok(f) => f.trunc(),
-            Err(e) => return e,
-        };
-
-        let cumulative = match self.get_boolean(&args[2], cell) {
-            Ok(b) => b,
-            Err(e) => return e,
-        };
-
-        if x < 0.0 {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "x must be >= 0 in CHISQ.DIST".to_string(),
-            );
-        }
-        if df < 1.0 {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "degrees of freedom must be >= 1 in CHISQ.DIST".to_string(),
-            );
-        }
-
-        let dist = match ChiSquared::new(df) {
-            Ok(d) => d,
-            Err(_) => {
-                return CalcResult::new_error(
-                    Error::NUM,
-                    cell,
-                    "Invalid parameters for Chi-squared distribution".to_string(),
-                )
-            }
-        };
-
-        let result = if cumulative { dist.cdf(x) } else { dist.pdf(x) };
-
-        if result.is_nan() || result.is_infinite() {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "Invalid result for CHISQ.DIST".to_string(),
-            );
-        }
-
-        CalcResult::Number(result)
-    }
-
-    // CHISQ.DIST.RT(x, deg_freedom)
-    pub(crate) fn fn_chisq_dist_rt(
-        &mut self,
-        args: &[Node],
-        cell: CellReferenceIndex,
-    ) -> CalcResult {
-        if args.len() != 2 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let x = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-
-        let df_raw = match self.get_number_no_bools(&args[1], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-
-        let df = df_raw.trunc();
-
-        if x < 0.0 {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "x must be >= 0 in CHISQ.DIST.RT".to_string(),
-            );
-        }
-        if df < 1.0 {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "degrees of freedom must be >= 1 in CHISQ.DIST.RT".to_string(),
-            );
-        }
-
-        let dist = match ChiSquared::new(df) {
-            Ok(d) => d,
-            Err(_) => {
-                return CalcResult::new_error(
-                    Error::NUM,
-                    cell,
-                    "Invalid parameters for Chi-squared distribution".to_string(),
-                )
-            }
-        };
-
-        // Right-tail probability: P(X > x).
-        // Use sf(x) directly for better numerical properties than 1 - cdf(x).
-        let result = dist.sf(x);
-
-        if result.is_nan() || result.is_infinite() || result < 0.0 {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "Invalid result for CHISQ.DIST.RT".to_string(),
-            );
-        }
-
-        CalcResult::Number(result)
-    }
-
-    // CHISQ.INV(probability, deg_freedom)
-    pub(crate) fn fn_chisq_inv(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.len() != 2 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let p = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-
-        let df = match self.get_number_no_bools(&args[1], cell) {
-            Ok(f) => f.trunc(),
-            Err(e) => return e,
-        };
-
-        // if probability < 0 or > 1 → #NUM!
-        if !(0.0..=1.0).contains(&p) {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "probability must be in [0,1] in CHISQ.INV".to_string(),
-            );
-        }
-        if df < 1.0 {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "degrees of freedom must be >= 1 in CHISQ.INV".to_string(),
-            );
-        }
-
-        let dist = match ChiSquared::new(df) {
-            Ok(d) => d,
-            Err(_) => {
-                return CalcResult::new_error(
-                    Error::NUM,
-                    cell,
-                    "Invalid parameters for Chi-squared distribution".to_string(),
-                )
-            }
-        };
-
-        let x = dist.inverse_cdf(p);
-
-        if x.is_nan() || x.is_infinite() || x < 0.0 {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "Invalid result for CHISQ.INV".to_string(),
-            );
-        }
-
-        CalcResult::Number(x)
-    }
-
-    // CHISQ.INV.RT(probability, deg_freedom)
-    pub(crate) fn fn_chisq_inv_rt(
-        &mut self,
-        args: &[Node],
-        cell: CellReferenceIndex,
-    ) -> CalcResult {
-        if args.len() != 2 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let p = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-
-        let df_raw = match self.get_number_no_bools(&args[1], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-
-        let df = df_raw.trunc();
-
-        // if probability < 0 or > 1 → #NUM!
-        if !(0.0..=1.0).contains(&p) {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "probability must be in [0,1] in CHISQ.INV.RT".to_string(),
-            );
-        }
-        if df < 1.0 {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "degrees of freedom must be >= 1 in CHISQ.INV.RT".to_string(),
-            );
-        }
-
-        let dist = match ChiSquared::new(df) {
-            Ok(d) => d,
-            Err(_) => {
-                return CalcResult::new_error(
-                    Error::NUM,
-                    cell,
-                    "Invalid parameters for Chi-squared distribution".to_string(),
-                )
-            }
-        };
-
-        // Right-tail inverse: p = P(X > x) = SF(x) = 1 - CDF(x)
-        // So x = inverse_cdf(1 - p).
-        let x = dist.inverse_cdf(1.0 - p);
-
-        if x.is_nan() || x.is_infinite() || x < 0.0 {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "Invalid result for CHISQ.INV.RT".to_string(),
-            );
-        }
-
-        CalcResult::Number(x)
-    }
-
-    pub(crate) fn values_from_range(
-        &mut self,
-        left: CellReferenceIndex,
-        right: CellReferenceIndex,
-    ) -> Result<Vec<Option<f64>>, CalcResult> {
-        let mut values = Vec::new();
-        for row_offset in 0..=(right.row - left.row) {
-            for col_offset in 0..=(right.column - left.column) {
-                let cell_ref = CellReferenceIndex {
-                    sheet: left.sheet,
-                    row: left.row + row_offset,
-                    column: left.column + col_offset,
-                };
-                let cell_value = self.evaluate_cell(cell_ref);
-                match cell_value {
-                    CalcResult::Number(v) => {
-                        values.push(Some(v));
-                    }
-                    error @ CalcResult::Error { .. } => return Err(error),
-                    _ => {
-                        values.push(None);
-                    }
-                }
-            }
-        }
-        Ok(values)
-    }
-
-    pub(crate) fn values_from_array(
-        &mut self,
-        array: Vec<Vec<ArrayNode>>,
-    ) -> Result<Vec<Option<f64>>, Error> {
-        let mut values = Vec::new();
-        for row in array {
-            for item in row {
-                match item {
-                    ArrayNode::Number(f) => {
-                        values.push(Some(f));
-                    }
-                    ArrayNode::Error(error) => {
-                        return Err(error);
-                    }
-                    _ => {
-                        values.push(None);
-                    }
-                }
-            }
-        }
-        Ok(values)
-    }
-
-    // CHISQ.TEST(actual_range, expected_range)
-    pub(crate) fn fn_chisq_test(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        let (width, height, values_left, values_right) = match self.fn_get_two_matrices(args, cell)
-        {
-            Ok(v) => v,
-            Err(r) => return r,
-        };
-
-        let mut values = Vec::with_capacity(values_left.len());
-
-        // Now we have:
-        // - values: flattened (observed, expected)
-        // - width, height: shape
-        for i in 0..values_left.len() {
-            match (values_left[i], values_right[i]) {
-                (Some(v1), Some(v2)) => {
-                    values.push((v1, v2));
-                }
-                _ => {
-                    values.push((1.0, 1.0));
-                }
-            }
-        }
-        if width == 0 || height == 0 || values.len() < 2 {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "CHISQ.TEST requires at least two data points".to_string(),
-            );
-        }
-
-        let mut chi2 = 0.0;
-        for (obs, exp) in &values {
-            if *obs < 0.0 || *exp < 0.0 {
-                return CalcResult::new_error(
-                    Error::NUM,
-                    cell,
-                    "Negative value in CHISQ.TEST data".to_string(),
-                );
-            }
-            if *exp == 0.0 {
-                return CalcResult::new_error(
-                    Error::DIV,
-                    cell,
-                    "Zero expected value in CHISQ.TEST".to_string(),
-                );
-            }
-            let diff = obs - exp;
-            chi2 += (diff * diff) / exp;
-        }
-
-        if chi2 < 0.0 && chi2 > -1e-12 {
-            chi2 = 0.0;
-        }
-
-        let total = width * height;
-        if total <= 1 {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "CHISQ.TEST degrees of freedom is zero".to_string(),
-            );
-        }
-
-        let df = if width > 1 && height > 1 {
-            (width - 1) * (height - 1)
-        } else {
-            total - 1
-        };
-
-        let dist = match ChiSquared::new(df as f64) {
-            Ok(d) => d,
-            Err(_) => {
-                return CalcResult::new_error(
-                    Error::NUM,
-                    cell,
-                    "Invalid degrees of freedom in CHISQ.TEST".to_string(),
-                );
-            }
-        };
-
-        let mut p = 1.0 - dist.cdf(chi2);
-
-        // clamp tiny fp noise
-        if p < 0.0 && p > -1e-15 {
-            p = 0.0;
-        }
-        if p > 1.0 && p < 1.0 + 1e-15 {
-            p = 1.0;
-        }
-
-        CalcResult::Number(p)
-    }
-}

base/src/functions/statistical/correl.rs

@@ -1,227 +0,0 @@
-use crate::expressions::types::CellReferenceIndex;
-use crate::{
-    calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
-};
-
-impl<'a> Model<'a> {
-    // CORREL(array1, array2) - Returns the correlation coefficient of two data sets
-    pub(crate) fn fn_correl(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        let (_, _, values_left, values_right) = match self.fn_get_two_matrices(args, cell) {
-            Ok(s) => s,
-            Err(e) => return e,
-        };
-
-        let mut n = 0.0;
-        let mut sum_x = 0.0;
-        let mut sum_y = 0.0;
-        let mut sum_x2 = 0.0;
-        let mut sum_y2 = 0.0;
-        let mut sum_xy = 0.0;
-
-        for (x_opt, y_opt) in values_left.into_iter().zip(values_right.into_iter()) {
-            if let (Some(x), Some(y)) = (x_opt, y_opt) {
-                n += 1.0;
-                sum_x += x;
-                sum_y += y;
-                sum_x2 += x * x;
-                sum_y2 += y * y;
-                sum_xy += x * y;
-            }
-        }
-
-        // Need at least 2 valid pairs
-        if n < 2.0 {
-            return CalcResult::new_error(
-                Error::DIV,
-                cell,
-                "CORREL requires at least two numeric data points in each range".to_string(),
-            );
-        }
-
-        let num = n * sum_xy - sum_x * sum_y;
-        let denom_x = n * sum_x2 - sum_x * sum_x;
-        let denom_y = n * sum_y2 - sum_y * sum_y;
-        let denom = (denom_x * denom_y).sqrt();
-
-        if denom == 0.0 || !denom.is_finite() {
-            return CalcResult::new_error(
-                Error::DIV,
-                cell,
-                "Division by zero in CORREL".to_string(),
-            );
-        }
-
-        let r = num / denom;
-        CalcResult::Number(r)
-    }
-
-    // SLOPE(known_y's, known_x's) - Returns the slope of the linear regression line
-    pub(crate) fn fn_slope(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        let (_rows, _cols, values_y, values_x) = match self.fn_get_two_matrices(args, cell) {
-            Ok(s) => s,
-            Err(e) => return e,
-        };
-
-        let mut n = 0.0;
-        let mut sum_x = 0.0;
-        let mut sum_y = 0.0;
-        let mut sum_x2 = 0.0;
-        let mut sum_xy = 0.0;
-
-        let len = values_y.len().min(values_x.len());
-        for i in 0..len {
-            if let (Some(y), Some(x)) = (values_y[i], values_x[i]) {
-                n += 1.0;
-                sum_x += x;
-                sum_y += y;
-                sum_x2 += x * x;
-                sum_xy += x * y;
-            }
-        }
-
-        if n < 2.0 {
-            return CalcResult::new_error(
-                Error::DIV,
-                cell,
-                "SLOPE requires at least two numeric data points".to_string(),
-            );
-        }
-
-        let denom = n * sum_x2 - sum_x * sum_x;
-        if denom == 0.0 || !denom.is_finite() {
-            return CalcResult::new_error(
-                Error::DIV,
-                cell,
-                "Division by zero in SLOPE".to_string(),
-            );
-        }
-
-        let num = n * sum_xy - sum_x * sum_y;
-        let slope = num / denom;
-
-        CalcResult::Number(slope)
-    }
-
-    // INTERCEPT(known_y's, known_x's) - Returns the y-intercept of the linear regression line
-    pub(crate) fn fn_intercept(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        let (_rows, _cols, values_y, values_x) = match self.fn_get_two_matrices(args, cell) {
-            Ok(s) => s,
-            Err(e) => return e,
-        };
-
-        let mut n = 0.0;
-        let mut sum_x = 0.0;
-        let mut sum_y = 0.0;
-        let mut sum_x2 = 0.0;
-        let mut sum_xy = 0.0;
-
-        let len = values_y.len().min(values_x.len());
-        for i in 0..len {
-            if let (Some(y), Some(x)) = (values_y[i], values_x[i]) {
-                n += 1.0;
-                sum_x += x;
-                sum_y += y;
-                sum_x2 += x * x;
-                sum_xy += x * y;
-            }
-        }
-
-        if n < 2.0 {
-            return CalcResult::new_error(
-                Error::DIV,
-                cell,
-                "INTERCEPT requires at least two numeric data points".to_string(),
-            );
-        }
-
-        let denom = n * sum_x2 - sum_x * sum_x;
-        if denom == 0.0 || !denom.is_finite() {
-            return CalcResult::new_error(
-                Error::DIV,
-                cell,
-                "Division by zero in INTERCEPT".to_string(),
-            );
-        }
-
-        let num = n * sum_xy - sum_x * sum_y;
-        let slope = num / denom;
-        let intercept = (sum_y - slope * sum_x) / n;
-
-        CalcResult::Number(intercept)
-    }
-
-    // STEYX(known_y's, known_x's) - Returns the standard error of the predicted y-values
-    pub(crate) fn fn_steyx(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        let (_rows, _cols, values_y, values_x) = match self.fn_get_two_matrices(args, cell) {
-            Ok(s) => s,
-            Err(e) => return e,
-        };
-
-        let mut n = 0.0;
-        let mut sum_x = 0.0;
-        let mut sum_y = 0.0;
-        let mut sum_x2 = 0.0;
-        let mut sum_xy = 0.0;
-
-        // We need the actual pairs again later for residuals
-        let mut pairs: Vec<(f64, f64)> = Vec::new();
-
-        let len = values_y.len().min(values_x.len());
-        for i in 0..len {
-            if let (Some(y), Some(x)) = (values_y[i], values_x[i]) {
-                n += 1.0;
-                sum_x += x;
-                sum_y += y;
-                sum_x2 += x * x;
-                sum_xy += x * y;
-                pairs.push((x, y));
-            }
-        }
-
-        // Need at least 3 points for STEYX (n - 2 in denominator)
-        if n < 3.0 {
-            return CalcResult::new_error(
-                Error::DIV,
-                cell,
-                "STEYX requires at least three numeric data points".to_string(),
-            );
-        }
-
-        let denom = n * sum_x2 - sum_x * sum_x;
-        if denom == 0.0 || !denom.is_finite() {
-            return CalcResult::new_error(
-                Error::DIV,
-                cell,
-                "Division by zero in STEYX".to_string(),
-            );
-        }
-
-        let num = n * sum_xy - sum_x * sum_y;
-        let slope = num / denom;
-        let intercept = (sum_y - slope * sum_x) / n;
-
-        // Sum of squared residuals: Σ (y - ŷ)^2, ŷ = intercept + slope * x
-        let mut sse = 0.0;
-        for (x, y) in pairs {
-            let y_hat = intercept + slope * x;
-            let diff = y - y_hat;
-            sse += diff * diff;
-        }
-
-        let dof = n - 2.0;
-        if dof <= 0.0 {
-            return CalcResult::new_error(
-                Error::DIV,
-                cell,
-                "STEYX has non-positive degrees of freedom".to_string(),
-            );
-        }
-
-        let sey = (sse / dof).sqrt();
-        if !sey.is_finite() {
-            return CalcResult::new_error(Error::DIV, cell, "Numerical error in STEYX".to_string());
-        }
-
-        CalcResult::Number(sey)
-    }
-}

base/src/functions/statistical/covariance.rs

@@ -1,264 +0,0 @@
-use crate::expressions::types::CellReferenceIndex;
-use crate::{
-    calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
-};
-
-impl<'a> Model<'a> {
-    pub(crate) fn fn_covariance_p(
-        &mut self,
-        args: &[Node],
-        cell: CellReferenceIndex,
-    ) -> CalcResult {
-        if args.len() != 2 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let values1_opts = match self.evaluate_node_in_context(&args[0], cell) {
-            CalcResult::Range { left, right } => match self.values_from_range(left, right) {
-                Ok(v) => v,
-                Err(error) => return error,
-            },
-            CalcResult::Array(a) => match self.values_from_array(a) {
-                Ok(v) => v,
-                Err(error) => {
-                    return CalcResult::new_error(
-                        Error::VALUE,
-                        cell,
-                        format!("Error in first array: {:?}", error),
-                    );
-                }
-            },
-            _ => {
-                return CalcResult::new_error(
-                    Error::VALUE,
-                    cell,
-                    "First argument must be a range or array".to_string(),
-                );
-            }
-        };
-
-        let values2_opts = match self.evaluate_node_in_context(&args[1], cell) {
-            CalcResult::Range { left, right } => match self.values_from_range(left, right) {
-                Ok(v) => v,
-                Err(error) => return error,
-            },
-            CalcResult::Array(a) => match self.values_from_array(a) {
-                Ok(v) => v,
-                Err(error) => {
-                    return CalcResult::new_error(
-                        Error::VALUE,
-                        cell,
-                        format!("Error in second array: {:?}", error),
-                    );
-                }
-            },
-            _ => {
-                return CalcResult::new_error(
-                    Error::VALUE,
-                    cell,
-                    "Second argument must be a range or array".to_string(),
-                );
-            }
-        };
-
-        // Same number of cells
-        if values1_opts.len() != values2_opts.len() {
-            return CalcResult::new_error(
-                Error::NA,
-                cell,
-                "COVARIANCE.P requires arrays of the same size".to_string(),
-            );
-        }
-
-        // Count numeric data points in each array (ignoring text/booleans/empty)
-        let count1 = values1_opts.iter().filter(|v| v.is_some()).count();
-        let count2 = values2_opts.iter().filter(|v| v.is_some()).count();
-
-        if count1 == 0 || count2 == 0 {
-            return CalcResult::new_error(
-                Error::DIV,
-                cell,
-                "COVARIANCE.P requires at least one numeric value in each array".to_string(),
-            );
-        }
-
-        if count1 != count2 {
-            return CalcResult::new_error(
-                Error::NA,
-                cell,
-                "COVARIANCE.P arrays must have the same number of numeric data points".to_string(),
-            );
-        }
-
-        // Build paired numeric vectors, position by position
-        let mut xs: Vec<f64> = Vec::with_capacity(count1);
-        let mut ys: Vec<f64> = Vec::with_capacity(count2);
-
-        for (v1_opt, v2_opt) in values1_opts.into_iter().zip(values2_opts.into_iter()) {
-            if let (Some(x), Some(y)) = (v1_opt, v2_opt) {
-                xs.push(x);
-                ys.push(y);
-            }
-        }
-
-        let n = xs.len();
-        if n == 0 {
-            // Should be impossible given the checks above, but guard anyway
-            return CalcResult::new_error(
-                Error::DIV,
-                cell,
-                "COVARIANCE.P has no paired numeric data points".to_string(),
-            );
-        }
-
-        let n_f = n as f64;
-
-        let mut sum_x = 0.0;
-        let mut sum_y = 0.0;
-        for i in 0..n {
-            sum_x += xs[i];
-            sum_y += ys[i];
-        }
-        let mean_x = sum_x / n_f;
-        let mean_y = sum_y / n_f;
-
-        let mut sum_prod = 0.0;
-        for i in 0..n {
-            let dx = xs[i] - mean_x;
-            let dy = ys[i] - mean_y;
-            sum_prod += dx * dy;
-        }
-
-        let cov = sum_prod / n_f;
-        CalcResult::Number(cov)
-    }
-
-    pub(crate) fn fn_covariance_s(
-        &mut self,
-        args: &[Node],
-        cell: CellReferenceIndex,
-    ) -> CalcResult {
-        if args.len() != 2 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let values1_opts = match self.evaluate_node_in_context(&args[0], cell) {
-            CalcResult::Range { left, right } => match self.values_from_range(left, right) {
-                Ok(v) => v,
-                Err(error) => return error,
-            },
-            CalcResult::Array(a) => match self.values_from_array(a) {
-                Ok(v) => v,
-                Err(error) => {
-                    return CalcResult::new_error(
-                        Error::VALUE,
-                        cell,
-                        format!("Error in first array: {:?}", error),
-                    );
-                }
-            },
-            _ => {
-                return CalcResult::new_error(
-                    Error::VALUE,
-                    cell,
-                    "First argument must be a range or array".to_string(),
-                );
-            }
-        };
-
-        let values2_opts = match self.evaluate_node_in_context(&args[1], cell) {
-            CalcResult::Range { left, right } => match self.values_from_range(left, right) {
-                Ok(v) => v,
-                Err(error) => return error,
-            },
-            CalcResult::Array(a) => match self.values_from_array(a) {
-                Ok(v) => v,
-                Err(error) => {
-                    return CalcResult::new_error(
-                        Error::VALUE,
-                        cell,
-                        format!("Error in second array: {:?}", error),
-                    );
-                }
-            },
-            _ => {
-                return CalcResult::new_error(
-                    Error::VALUE,
-                    cell,
-                    "Second argument must be a range or array".to_string(),
-                );
-            }
-        };
-
-        // Same number of cells
-        if values1_opts.len() != values2_opts.len() {
-            return CalcResult::new_error(
-                Error::NA,
-                cell,
-                "COVARIANCE.S requires arrays of the same size".to_string(),
-            );
-        }
-
-        // Count numeric data points in each array (ignoring text/booleans/empty)
-        let count1 = values1_opts.iter().filter(|v| v.is_some()).count();
-        let count2 = values2_opts.iter().filter(|v| v.is_some()).count();
-
-        if count1 == 0 || count2 == 0 {
-            return CalcResult::new_error(
-                Error::DIV,
-                cell,
-                "COVARIANCE.S requires numeric values in each array".to_string(),
-            );
-        }
-
-        if count1 != count2 {
-            return CalcResult::new_error(
-                Error::NA,
-                cell,
-                "COVARIANCE.S arrays must have the same number of numeric data points".to_string(),
-            );
-        }
-
-        // Build paired numeric vectors
-        let mut xs: Vec<f64> = Vec::with_capacity(count1);
-        let mut ys: Vec<f64> = Vec::with_capacity(count2);
-
-        for (v1_opt, v2_opt) in values1_opts.into_iter().zip(values2_opts.into_iter()) {
-            if let (Some(x), Some(y)) = (v1_opt, v2_opt) {
-                xs.push(x);
-                ys.push(y);
-            }
-        }
-
-        let n = xs.len();
-        if n < 2 {
-            return CalcResult::new_error(
-                Error::DIV,
-                cell,
-                "COVARIANCE.S requires at least two paired data points".to_string(),
-            );
-        }
-
-        let n_f = n as f64;
-
-        let mut sum_x = 0.0;
-        let mut sum_y = 0.0;
-        for i in 0..n {
-            sum_x += xs[i];
-            sum_y += ys[i];
-        }
-        let mean_x = sum_x / n_f;
-        let mean_y = sum_y / n_f;
-
-        let mut sum_prod = 0.0;
-        for i in 0..n {
-            let dx = xs[i] - mean_x;
-            let dy = ys[i] - mean_y;
-            sum_prod += dx * dy;
-        }
-
-        let cov = sum_prod / (n_f - 1.0);
-
-        CalcResult::Number(cov)
-    }
-}

base/src/functions/statistical/devsq.rs

@@ -1,135 +0,0 @@
-use crate::constants::{LAST_COLUMN, LAST_ROW};
-use crate::expressions::parser::ArrayNode;
-use crate::expressions::types::CellReferenceIndex;
-use crate::{
-    calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
-};
-
-impl<'a> Model<'a> {
-    // DEVSQ(number1, [number2], ...)
-    pub(crate) fn fn_devsq(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.is_empty() {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let mut sum = 0.0;
-        let mut sumsq = 0.0;
-        let mut count: u64 = 0;
-
-        // tiny helper so we don't repeat ourselves
-        #[inline]
-        fn accumulate(sum: &mut f64, sumsq: &mut f64, count: &mut u64, value: f64) {
-            *sum += value;
-            *sumsq += value * value;
-            *count += 1;
-        }
-
-        for arg in args {
-            match self.evaluate_node_in_context(arg, cell) {
-                CalcResult::Number(value) => {
-                    accumulate(&mut sum, &mut sumsq, &mut count, value);
-                }
-                CalcResult::Range { left, right } => {
-                    if left.sheet != right.sheet {
-                        return CalcResult::new_error(
-                            Error::VALUE,
-                            cell,
-                            "Ranges are in different sheets".to_string(),
-                        );
-                    }
-                    let row1 = left.row;
-                    let mut row2 = right.row;
-                    let column1 = left.column;
-                    let mut column2 = right.column;
-
-                    if row1 == 1 && row2 == LAST_ROW {
-                        row2 = match self.workbook.worksheet(left.sheet) {
-                            Ok(s) => s.dimension().max_row,
-                            Err(_) => {
-                                return CalcResult::new_error(
-                                    Error::ERROR,
-                                    cell,
-                                    format!("Invalid worksheet index: '{}'", left.sheet),
-                                );
-                            }
-                        };
-                    }
-                    if column1 == 1 && column2 == LAST_COLUMN {
-                        column2 = match self.workbook.worksheet(left.sheet) {
-                            Ok(s) => s.dimension().max_column,
-                            Err(_) => {
-                                return CalcResult::new_error(
-                                    Error::ERROR,
-                                    cell,
-                                    format!("Invalid worksheet index: '{}'", left.sheet),
-                                );
-                            }
-                        };
-                    }
-
-                    for row in row1..row2 + 1 {
-                        for column in column1..(column2 + 1) {
-                            match self.evaluate_cell(CellReferenceIndex {
-                                sheet: left.sheet,
-                                row,
-                                column,
-                            }) {
-                                CalcResult::Number(value) => {
-                                    accumulate(&mut sum, &mut sumsq, &mut count, value);
-                                }
-                                error @ CalcResult::Error { .. } => return error,
-                                _ => {
-                                    // We ignore booleans and strings
-                                }
-                            }
-                        }
-                    }
-                }
-                CalcResult::Array(array) => {
-                    for row in array {
-                        for value in row {
-                            match value {
-                                ArrayNode::Number(value) => {
-                                    accumulate(&mut sum, &mut sumsq, &mut count, value);
-                                }
-                                ArrayNode::Error(error) => {
-                                    return CalcResult::Error {
-                                        error,
-                                        origin: cell,
-                                        message: "Error in array".to_string(),
-                                    }
-                                }
-                                _ => {
-                                    // We ignore booleans and strings
-                                }
-                            }
-                        }
-                    }
-                }
-                error @ CalcResult::Error { .. } => return error,
-                _ => {
-                    // We ignore booleans and strings
-                }
-            };
-        }
-
-        if count == 0 {
-            // No numeric data at all
-            return CalcResult::new_error(
-                Error::DIV,
-                cell,
-                "DEVSQ with no numeric data".to_string(),
-            );
-        }
-
-        let n = count as f64;
-        let mut result = sumsq - (sum * sum) / n;
-
-        // Numerical noise can make result slightly negative when it should be 0
-        if result < 0.0 && result > -1e-12 {
-            result = 0.0;
-        }
-
-        CalcResult::Number(result)
-    }
-}

base/src/functions/statistical/exponential.rs

@@ -1,54 +0,0 @@
-use crate::expressions::types::CellReferenceIndex;
-use crate::{
-    calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
-};
-
-impl<'a> Model<'a> {
-    pub(crate) fn fn_expon_dist(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        // EXPON.DIST(x, lambda, cumulative)
-        if args.len() != 3 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let x = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-
-        let lambda = match self.get_number_no_bools(&args[1], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-
-        let cumulative = match self.get_boolean(&args[2], cell) {
-            Ok(b) => b,
-            Err(e) => return e,
-        };
-
-        if x < 0.0 || lambda <= 0.0 {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid parameters for EXPON.DIST".to_string(),
-            };
-        }
-
-        let result = if cumulative {
-            // CDF
-            1.0 - (-lambda * x).exp()
-        } else {
-            // PDF
-            lambda * (-lambda * x).exp()
-        };
-
-        if result.is_nan() || result.is_infinite() {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid result for EXPON.DIST".to_string(),
-            };
-        }
-
-        CalcResult::Number(result)
-    }
-}

base/src/functions/statistical/fisher.rs

@@ -1,418 +0,0 @@
-use statrs::distribution::{Continuous, ContinuousCDF, FisherSnedecor};
-
-use crate::expressions::types::CellReferenceIndex;
-use crate::functions::statistical::t_dist::sample_var;
-use crate::{
-    calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
-};
-
-impl<'a> Model<'a> {
-    // FISHER(x) = 0.5 * ln((1 + x) / (1 - x))
-    pub(crate) fn fn_fisher(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.len() != 1 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let x = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-
-        if x <= -1.0 || x >= 1.0 {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "x must be between -1 and 1 (exclusive) in FISHER".to_string(),
-            };
-        }
-
-        let ratio = (1.0 + x) / (1.0 - x);
-        let result = 0.5 * ratio.ln();
-
-        if result.is_nan() || result.is_infinite() {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid result for FISHER".to_string(),
-            };
-        }
-
-        CalcResult::Number(result)
-    }
-
-    // FISHERINV(y) = (e^(2y) - 1) / (e^(2y) + 1) = tanh(y)
-    pub(crate) fn fn_fisher_inv(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.len() != 1 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let y = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-
-        // Use tanh directly to avoid overflow from exp(2y)
-        let result = y.tanh();
-
-        if result.is_nan() || result.is_infinite() {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid result for FISHERINV".to_string(),
-            };
-        }
-
-        CalcResult::Number(result)
-    }
-
-    // F.DIST(x, deg_freedom1, deg_freedom2, cumulative)
-    pub(crate) fn fn_f_dist(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.len() != 4 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let x = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-
-        let df1 = match self.get_number_no_bools(&args[1], cell) {
-            Ok(f) => f.trunc(),
-            Err(e) => return e,
-        };
-        let df2 = match self.get_number_no_bools(&args[2], cell) {
-            Ok(f) => f.trunc(),
-            Err(e) => return e,
-        };
-
-        let cumulative = match self.get_boolean(&args[3], cell) {
-            Ok(b) => b,
-            Err(e) => return e,
-        };
-
-        // Excel domain checks
-        if x < 0.0 {
-            return CalcResult::new_error(Error::NUM, cell, "x must be >= 0 in F.DIST".to_string());
-        }
-        if df1 < 1.0 || df2 < 1.0 {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "degrees of freedom must be >= 1 in F.DIST".to_string(),
-            );
-        }
-
-        let dist = match FisherSnedecor::new(df1, df2) {
-            Ok(d) => d,
-            Err(_) => {
-                return CalcResult::new_error(
-                    Error::NUM,
-                    cell,
-                    "Invalid parameters for F distribution".to_string(),
-                )
-            }
-        };
-
-        let result = if cumulative { dist.cdf(x) } else { dist.pdf(x) };
-
-        if result.is_nan() || result.is_infinite() {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "Invalid result for F.DIST".to_string(),
-            );
-        }
-
-        CalcResult::Number(result)
-    }
-
-    pub(crate) fn fn_f_dist_rt(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        // F.DIST.RT(x, deg_freedom1, deg_freedom2)
-        if args.len() != 3 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let x = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-
-        let df1 = match self.get_number_no_bools(&args[1], cell) {
-            Ok(f) => f.trunc(),
-            Err(e) => return e,
-        };
-        let df2 = match self.get_number_no_bools(&args[2], cell) {
-            Ok(f) => f.trunc(),
-            Err(e) => return e,
-        };
-
-        if x < 0.0 {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "x must be >= 0 in F.DIST.RT".to_string(),
-            );
-        }
-        if df1 < 1.0 || df2 < 1.0 {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "degrees of freedom must be >= 1 in F.DIST.RT".to_string(),
-            );
-        }
-
-        let dist = match FisherSnedecor::new(df1, df2) {
-            Ok(d) => d,
-            Err(_) => {
-                return CalcResult::new_error(
-                    Error::NUM,
-                    cell,
-                    "Invalid parameters for F distribution".to_string(),
-                )
-            }
-        };
-
-        // Right-tail probability: P(F > x) = 1 - CDF(x)
-        let result = 1.0 - dist.cdf(x);
-
-        if result.is_nan() || result.is_infinite() || result < 0.0 {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "Invalid result for F.DIST.RT".to_string(),
-            );
-        }
-
-        CalcResult::Number(result)
-    }
-
-    // F.INV(probability, deg_freedom1, deg_freedom2)
-    pub(crate) fn fn_f_inv(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.len() != 3 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let p = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-        let df1 = match self.get_number_no_bools(&args[1], cell) {
-            Ok(f) => f.trunc(),
-            Err(e) => return e,
-        };
-        let df2 = match self.get_number_no_bools(&args[2], cell) {
-            Ok(f) => f.trunc(),
-            Err(e) => return e,
-        };
-
-        // probability < 0 or > 1 → #NUM!
-        if !(0.0..=1.0).contains(&p) {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "probability must be in [0,1] in F.INV".to_string(),
-            );
-        }
-        if df1 < 1.0 || df2 < 1.0 {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "degrees of freedom must be >= 1 in F.INV".to_string(),
-            );
-        }
-
-        let dist = match FisherSnedecor::new(df1, df2) {
-            Ok(d) => d,
-            Err(_) => {
-                return CalcResult::new_error(
-                    Error::NUM,
-                    cell,
-                    "Invalid parameters for F distribution".to_string(),
-                )
-            }
-        };
-
-        let x = dist.inverse_cdf(p);
-        if x.is_nan() || x.is_infinite() || x < 0.0 {
-            return CalcResult::new_error(Error::NUM, cell, "Invalid result for F.INV".to_string());
-        }
-
-        CalcResult::Number(x)
-    }
-
-    // F.INV.RT(probability, deg_freedom1, deg_freedom2)
-    pub(crate) fn fn_f_inv_rt(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.len() != 3 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let p = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-        let df1 = match self.get_number_no_bools(&args[1], cell) {
-            Ok(f) => f.trunc(),
-            Err(e) => return e,
-        };
-        let df2 = match self.get_number_no_bools(&args[2], cell) {
-            Ok(f) => f.trunc(),
-            Err(e) => return e,
-        };
-
-        if p <= 0.0 || p > 1.0 {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "probability must be in (0,1] in F.INV.RT".to_string(),
-            );
-        }
-        if df1 < 1.0 || df2 < 1.0 {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "degrees of freedom must be >= 1 in F.INV.RT".to_string(),
-            );
-        }
-
-        let dist = match FisherSnedecor::new(df1, df2) {
-            Ok(d) => d,
-            Err(_) => {
-                return CalcResult::new_error(
-                    Error::NUM,
-                    cell,
-                    "Invalid parameters for F distribution".to_string(),
-                )
-            }
-        };
-
-        // p is right-tail: p = P(F > x) = 1 - CDF(x)
-        let x = dist.inverse_cdf(1.0 - p);
-        if x.is_nan() || x.is_infinite() || x < 0.0 {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "Invalid result for F.INV.RT".to_string(),
-            );
-        }
-
-        CalcResult::Number(x)
-    }
-
-    // F.TEST(array1, array2)
-    pub(crate) fn fn_f_test(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.len() != 2 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let values1_opts = match self.evaluate_node_in_context(&args[0], cell) {
-            CalcResult::Range { left, right } => match self.values_from_range(left, right) {
-                Ok(v) => v,
-                Err(error) => return error,
-            },
-            CalcResult::Array(a) => match self.values_from_array(a) {
-                Ok(v) => v,
-                Err(error) => {
-                    return CalcResult::new_error(
-                        Error::VALUE,
-                        cell,
-                        format!("Error in first array: {:?}", error),
-                    );
-                }
-            },
-            _ => {
-                return CalcResult::new_error(
-                    Error::VALUE,
-                    cell,
-                    "First argument must be a range or array".to_string(),
-                );
-            }
-        };
-
-        // Get second sample as Vec<Option<f64>>
-        let values2_opts = match self.evaluate_node_in_context(&args[1], cell) {
-            CalcResult::Range { left, right } => match self.values_from_range(left, right) {
-                Ok(v) => v,
-                Err(error) => return error,
-            },
-            CalcResult::Array(a) => match self.values_from_array(a) {
-                Ok(v) => v,
-                Err(error) => {
-                    return CalcResult::new_error(
-                        Error::VALUE,
-                        cell,
-                        format!("Error in second array: {:?}", error),
-                    );
-                }
-            },
-            _ => {
-                return CalcResult::new_error(
-                    Error::VALUE,
-                    cell,
-                    "Second argument must be a range or array".to_string(),
-                );
-            }
-        };
-
-        let values1: Vec<f64> = values1_opts.into_iter().flatten().collect();
-        let values2: Vec<f64> = values2_opts.into_iter().flatten().collect();
-
-        let n1 = values1.len();
-        let n2 = values2.len();
-
-        // If fewer than 2 numeric values in either sample -> #DIV/0!
-        if n1 < 2 || n2 < 2 {
-            return CalcResult::new_error(
-                Error::DIV,
-                cell,
-                "F.TEST requires at least two numeric values in each sample".to_string(),
-            );
-        }
-
-        let v1 = sample_var(&values1);
-        let v2 = sample_var(&values2);
-
-        if v1 <= 0.0 || v2 <= 0.0 {
-            return CalcResult::new_error(
-                Error::DIV,
-                cell,
-                "Variance of one sample is zero in F.TEST".to_string(),
-            );
-        }
-
-        // F ratio: larger variance / smaller variance
-        let mut f = v1 / v2;
-        let mut df1 = (n1 - 1) as f64;
-        let mut df2 = (n2 - 1) as f64;
-
-        if f < 1.0 {
-            f = 1.0 / f;
-            std::mem::swap(&mut df1, &mut df2);
-        }
-
-        let dist = match FisherSnedecor::new(df1, df2) {
-            Ok(d) => d,
-            Err(_) => {
-                return CalcResult::new_error(
-                    Error::NUM,
-                    cell,
-                    "Invalid parameters for F distribution in F.TEST".to_string(),
-                );
-            }
-        };
-
-        // One-tailed right-tail probability
-        let tail = 1.0 - dist.cdf(f);
-        // F.TEST is two-tailed: p = 2 * tail (with F >= 1)
-        let mut p = 2.0 * tail;
-
-        // Clamp tiny FP noise
-        if p < 0.0 && p > -1e-15 {
-            p = 0.0;
-        }
-        if p > 1.0 && p < 1.0 + 1e-15 {
-            p = 1.0;
-        }
-
-        CalcResult::Number(p)
-    }
-}

base/src/functions/statistical/gamma.rs

@@ -1,194 +0,0 @@
-use statrs::distribution::{Continuous, ContinuousCDF, Gamma};
-use statrs::function::gamma::{gamma, ln_gamma};
-
-use crate::expressions::types::CellReferenceIndex;
-use crate::{
-    calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
-};
-
-impl<'a> Model<'a> {
-    pub(crate) fn fn_gamma(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.len() != 1 {
-            return CalcResult::new_args_number_error(cell);
-        }
-        let x = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f,
-            Err(s) => return s,
-        };
-        if x < 0.0 && x.floor() == x {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid parameter for Gamma function".to_string(),
-            };
-        }
-        let result = gamma(x);
-        if result.is_nan() || result.is_infinite() {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid parameter for Gamma function".to_string(),
-            };
-        }
-        CalcResult::Number(result)
-    }
-
-    pub(crate) fn fn_gamma_dist(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        // GAMMA.DIST(x, alpha, beta, cumulative)
-        if args.len() != 4 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let x = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-        let alpha = match self.get_number_no_bools(&args[1], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-        let beta_scale = match self.get_number_no_bools(&args[2], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-
-        let cumulative = match self.get_boolean(&args[3], cell) {
-            Ok(b) => b,
-            Err(e) => return e,
-        };
-
-        if x < 0.0 {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "x must be >= 0 in GAMMA.DIST".to_string(),
-            );
-        }
-        if alpha <= 0.0 || beta_scale <= 0.0 {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "alpha and beta must be > 0 in GAMMA.DIST".to_string(),
-            );
-        }
-
-        let rate = 1.0 / beta_scale;
-
-        let dist = match Gamma::new(alpha, rate) {
-            Ok(d) => d,
-            Err(_) => {
-                return CalcResult::new_error(
-                    Error::NUM,
-                    cell,
-                    "Invalid parameters for Gamma distribution".to_string(),
-                )
-            }
-        };
-
-        let result = if cumulative { dist.cdf(x) } else { dist.pdf(x) };
-
-        if result.is_nan() || result.is_infinite() {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "Invalid result for GAMMA.DIST".to_string(),
-            );
-        }
-
-        CalcResult::Number(result)
-    }
-
-    pub(crate) fn fn_gamma_inv(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        // GAMMA.INV(probability, alpha, beta)
-        if args.len() != 3 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let p = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-        let alpha = match self.get_number_no_bools(&args[1], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-        let beta_scale = match self.get_number_no_bools(&args[2], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-
-        if !(0.0..=1.0).contains(&p) {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "probability must be in [0,1] in GAMMA.INV".to_string(),
-            );
-        }
-
-        if alpha <= 0.0 || beta_scale <= 0.0 {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "alpha and beta must be > 0 in GAMMA.INV".to_string(),
-            );
-        }
-
-        let rate = 1.0 / beta_scale;
-
-        let dist = match Gamma::new(alpha, rate) {
-            Ok(d) => d,
-            Err(_) => {
-                return CalcResult::new_error(
-                    Error::NUM,
-                    cell,
-                    "Invalid parameters for Gamma distribution".to_string(),
-                )
-            }
-        };
-
-        let x = dist.inverse_cdf(p);
-        if x.is_nan() || x.is_infinite() || x < 0.0 {
-            return CalcResult::new_error(
-                Error::NUM,
-                cell,
-                "Invalid result for GAMMA.INV".to_string(),
-            );
-        }
-
-        CalcResult::Number(x)
-    }
-
-    pub(crate) fn fn_gamma_ln(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.len() != 1 {
-            return CalcResult::new_args_number_error(cell);
-        }
-        let x = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f,
-            Err(s) => return s,
-        };
-        if x < 0.0 {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid parameter for Gamma function".to_string(),
-            };
-        }
-        let result = ln_gamma(x);
-        if result.is_nan() || result.is_infinite() {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid parameter for Gamma Ln function".to_string(),
-            };
-        }
-        CalcResult::Number(result)
-    }
-
-    pub(crate) fn fn_gamma_ln_precise(
-        &mut self,
-        args: &[Node],
-        cell: CellReferenceIndex,
-    ) -> CalcResult {
-        self.fn_gamma_ln(args, cell)
-    }
-}

base/src/functions/statistical/gauss.rs

@@ -1,39 +0,0 @@
-use statrs::distribution::{ContinuousCDF, Normal};
-
-use crate::expressions::token::Error;
-use crate::expressions::types::CellReferenceIndex;
-use crate::{calc_result::CalcResult, expressions::parser::Node, model::Model};
-
-impl<'a> Model<'a> {
-    pub(crate) fn fn_gauss(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.len() != 1 {
-            return CalcResult::new_args_number_error(cell);
-        }
-        let z = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f,
-            Err(s) => return s,
-        };
-        let dist = match Normal::new(0.0, 1.0) {
-            Ok(d) => d,
-            Err(_) => {
-                return CalcResult::Error {
-                    error: Error::ERROR,
-                    origin: cell,
-                    message: "Failed to construct standard normal distribution".to_string(),
-                }
-            }
-        };
-
-        let result = dist.cdf(z) - 0.5;
-
-        if !result.is_finite() {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid result for GAUSS".to_string(),
-            };
-        }
-
-        CalcResult::Number(result)
-    }
-}

base/src/functions/statistical/geomean.rs

@@ -1,87 +0,0 @@
-use crate::expressions::types::CellReferenceIndex;
-use crate::{
-    calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
-};
-
-impl<'a> Model<'a> {
-    pub(crate) fn fn_geomean(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.is_empty() {
-            return CalcResult::new_args_number_error(cell);
-        }
-        let mut count = 0.0;
-        let mut product = 1.0;
-        for arg in args {
-            match self.evaluate_node_in_context(arg, cell) {
-                CalcResult::Number(value) => {
-                    count += 1.0;
-                    product *= value;
-                }
-                CalcResult::Boolean(b) => {
-                    if let Node::ReferenceKind { .. } = arg {
-                    } else {
-                        product *= if b { 1.0 } else { 0.0 };
-                        count += 1.0;
-                    }
-                }
-                CalcResult::Range { left, right } => {
-                    if left.sheet != right.sheet {
-                        return CalcResult::new_error(
-                            Error::VALUE,
-                            cell,
-                            "Ranges are in different sheets".to_string(),
-                        );
-                    }
-                    for row in left.row..(right.row + 1) {
-                        for column in left.column..(right.column + 1) {
-                            match self.evaluate_cell(CellReferenceIndex {
-                                sheet: left.sheet,
-                                row,
-                                column,
-                            }) {
-                                CalcResult::Number(value) => {
-                                    count += 1.0;
-                                    product *= value;
-                                }
-                                error @ CalcResult::Error { .. } => return error,
-                                CalcResult::Range { .. } => {
-                                    return CalcResult::new_error(
-                                        Error::ERROR,
-                                        cell,
-                                        "Unexpected Range".to_string(),
-                                    );
-                                }
-                                _ => {}
-                            }
-                        }
-                    }
-                }
-                error @ CalcResult::Error { .. } => return error,
-                CalcResult::String(s) => {
-                    if let Node::ReferenceKind { .. } = arg {
-                        // Do nothing
-                    } else if let Ok(t) = s.parse::<f64>() {
-                        product *= t;
-                        count += 1.0;
-                    } else {
-                        return CalcResult::Error {
-                            error: Error::VALUE,
-                            origin: cell,
-                            message: "Argument cannot be cast into number".to_string(),
-                        };
-                    }
-                }
-                _ => {
-                    // Ignore everything else
-                }
-            };
-        }
-        if count == 0.0 {
-            return CalcResult::Error {
-                error: Error::DIV,
-                origin: cell,
-                message: "Division by Zero".to_string(),
-            };
-        }
-        CalcResult::Number(product.powf(1.0 / count))
-    }
-}

base/src/functions/statistical/hypegeom.rs

@@ -1,108 +0,0 @@
-use statrs::distribution::{Discrete, DiscreteCDF, Hypergeometric};
-
-use crate::expressions::types::CellReferenceIndex;
-use crate::{
-    calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
-};
-
-impl<'a> Model<'a> {
-    // =HYPGEOM.DIST(sample_s, number_sample, population_s, number_pop, cumulative)
-    pub(crate) fn fn_hyp_geom_dist(
-        &mut self,
-        args: &[Node],
-        cell: CellReferenceIndex,
-    ) -> CalcResult {
-        if args.len() != 5 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        // sample_s (number of successes in the sample)
-        let sample_s = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f.trunc(),
-            Err(e) => return e,
-        };
-
-        // number_sample (sample size)
-        let number_sample = match self.get_number_no_bools(&args[1], cell) {
-            Ok(f) => f.trunc(),
-            Err(e) => return e,
-        };
-
-        // population_s (number of successes in the population)
-        let population_s = match self.get_number_no_bools(&args[2], cell) {
-            Ok(f) => f.trunc(),
-            Err(e) => return e,
-        };
-
-        // number_pop (population size)
-        let number_pop = match self.get_number_no_bools(&args[3], cell) {
-            Ok(f) => f.trunc(),
-            Err(e) => return e,
-        };
-
-        let cumulative = match self.get_boolean(&args[4], cell) {
-            Ok(b) => b,
-            Err(e) => return e,
-        };
-
-        if sample_s < 0.0 || sample_s > f64::min(number_sample, population_s) {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid parameters for HYPGEOM.DIST".to_string(),
-            };
-        }
-
-        if sample_s < f64::max(0.0, number_sample + population_s - number_pop) {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid parameters for HYPGEOM.DIST".to_string(),
-            };
-        }
-
-        if number_sample <= 0.0 || number_sample > number_pop {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid parameters for HYPGEOM.DIST".to_string(),
-            };
-        }
-
-        if population_s <= 0.0 || population_s > number_pop {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid parameters for HYPGEOM.DIST".to_string(),
-            };
-        }
-
-        let n_pop = number_pop as u64;
-        let k_pop = population_s as u64;
-        let n_sample = number_sample as u64;
-        let k = sample_s as u64;
-
-        let dist = match Hypergeometric::new(n_pop, k_pop, n_sample) {
-            Ok(d) => d,
-            Err(_) => {
-                return CalcResult::new_error(
-                    Error::NUM,
-                    cell,
-                    "Invalid parameters for hypergeometric distribution".to_string(),
-                )
-            }
-        };
-
-        let prob = if cumulative { dist.cdf(k) } else { dist.pmf(k) };
-
-        if !prob.is_finite() {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid result for HYPGEOM.DIST".to_string(),
-            };
-        }
-
-        CalcResult::Number(prob)
-    }
-}

base/src/functions/statistical/if_ifs.rs

@@ -1,337 +0,0 @@
-use crate::constants::{LAST_COLUMN, LAST_ROW};
-use crate::expressions::types::CellReferenceIndex;
-use crate::functions::util::build_criteria;
-use crate::{
-    calc_result::{CalcResult, Range},
-    expressions::parser::Node,
-    expressions::token::Error,
-    model::Model,
-};
-
-impl<'a> Model<'a> {
-    pub(crate) fn fn_countif(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.len() == 2 {
-            let arguments = vec![args[0].clone(), args[1].clone()];
-            self.fn_countifs(&arguments, cell)
-        } else {
-            CalcResult::new_args_number_error(cell)
-        }
-    }
-
-    /// AVERAGEIF(criteria_range, criteria, [average_range])
-    /// if average_rage is missing then criteria_range will be used
-    pub(crate) fn fn_averageif(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.len() == 2 {
-            let arguments = vec![args[0].clone(), args[0].clone(), args[1].clone()];
-            self.fn_averageifs(&arguments, cell)
-        } else if args.len() == 3 {
-            let arguments = vec![args[2].clone(), args[0].clone(), args[1].clone()];
-            self.fn_averageifs(&arguments, cell)
-        } else {
-            CalcResult::new_args_number_error(cell)
-        }
-    }
-
-    // FIXME: This function shares a lot of code with apply_ifs. Can we merge them?
-    pub(crate) fn fn_countifs(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        let args_count = args.len();
-        if args_count < 2 || !args_count.is_multiple_of(2) {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let case_count = args_count / 2;
-        // NB: this is a beautiful example of the borrow checker
-        // The order of these two definitions cannot be swapped.
-        let mut criteria = Vec::new();
-        let mut fn_criteria = Vec::new();
-        let ranges = &mut Vec::new();
-        for case_index in 0..case_count {
-            let criterion = self.evaluate_node_in_context(&args[case_index * 2 + 1], cell);
-            criteria.push(criterion);
-            // NB: We cannot do:
-            // fn_criteria.push(build_criteria(&criterion));
-            // because criterion doesn't live long enough
-            let result = self.evaluate_node_in_context(&args[case_index * 2], cell);
-            if result.is_error() {
-                return result;
-            }
-            if let CalcResult::Range { left, right } = result {
-                if left.sheet != right.sheet {
-                    return CalcResult::new_error(
-                        Error::VALUE,
-                        cell,
-                        "Ranges are in different sheets".to_string(),
-                    );
-                }
-                // TODO test ranges are of the same size as sum_range
-                ranges.push(Range { left, right });
-            } else {
-                return CalcResult::new_error(Error::VALUE, cell, "Expected a range".to_string());
-            }
-        }
-        for criterion in criteria.iter() {
-            fn_criteria.push(build_criteria(criterion));
-        }
-
-        let mut total = 0.0;
-        let first_range = &ranges[0];
-        let left_row = first_range.left.row;
-        let left_column = first_range.left.column;
-        let right_row = first_range.right.row;
-        let right_column = first_range.right.column;
-
-        let dimension = match self.workbook.worksheet(first_range.left.sheet) {
-            Ok(s) => s.dimension(),
-            Err(_) => {
-                return CalcResult::new_error(
-                    Error::ERROR,
-                    cell,
-                    format!("Invalid worksheet index: '{}'", first_range.left.sheet),
-                )
-            }
-        };
-        let max_row = dimension.max_row;
-        let max_column = dimension.max_column;
-
-        let open_row = left_row == 1 && right_row == LAST_ROW;
-        let open_column = left_column == 1 && right_column == LAST_COLUMN;
-
-        for row in left_row..right_row + 1 {
-            if open_row && row > max_row {
-                // If the row is larger than the max row in the sheet then all cells are empty.
-                // We compute it only once
-                let mut is_true = true;
-                for fn_criterion in fn_criteria.iter() {
-                    if !fn_criterion(&CalcResult::EmptyCell) {
-                        is_true = false;
-                        break;
-                    }
-                }
-                if is_true {
-                    total += ((LAST_ROW - max_row) * (right_column - left_column + 1)) as f64;
-                }
-                break;
-            }
-            for column in left_column..right_column + 1 {
-                if open_column && column > max_column {
-                    // If the column is larger than the max column in the sheet then all cells are empty.
-                    // We compute it only once
-                    let mut is_true = true;
-                    for fn_criterion in fn_criteria.iter() {
-                        if !fn_criterion(&CalcResult::EmptyCell) {
-                            is_true = false;
-                            break;
-                        }
-                    }
-                    if is_true {
-                        total += (LAST_COLUMN - max_column) as f64;
-                    }
-                    break;
-                }
-                let mut is_true = true;
-                for case_index in 0..case_count {
-                    // We check if value in range n meets criterion n
-                    let range = &ranges[case_index];
-                    let fn_criterion = &fn_criteria[case_index];
-                    let value = self.evaluate_cell(CellReferenceIndex {
-                        sheet: range.left.sheet,
-                        row: range.left.row + row - first_range.left.row,
-                        column: range.left.column + column - first_range.left.column,
-                    });
-                    if !fn_criterion(&value) {
-                        is_true = false;
-                        break;
-                    }
-                }
-                if is_true {
-                    total += 1.0;
-                }
-            }
-        }
-        CalcResult::Number(total)
-    }
-
-    pub(crate) fn apply_ifs<F>(
-        &mut self,
-        args: &[Node],
-        cell: CellReferenceIndex,
-        mut apply: F,
-    ) -> Result<(), CalcResult>
-    where
-        F: FnMut(f64),
-    {
-        let args_count = args.len();
-        if args_count < 3 || args_count.is_multiple_of(2) {
-            return Err(CalcResult::new_args_number_error(cell));
-        }
-        let arg_0 = self.evaluate_node_in_context(&args[0], cell);
-        if arg_0.is_error() {
-            return Err(arg_0);
-        }
-        let sum_range = if let CalcResult::Range { left, right } = arg_0 {
-            if left.sheet != right.sheet {
-                return Err(CalcResult::new_error(
-                    Error::VALUE,
-                    cell,
-                    "Ranges are in different sheets".to_string(),
-                ));
-            }
-            Range { left, right }
-        } else {
-            return Err(CalcResult::new_error(
-                Error::VALUE,
-                cell,
-                "Expected a range".to_string(),
-            ));
-        };
-
-        let case_count = (args_count - 1) / 2;
-        // NB: this is a beautiful example of the borrow checker
-        // The order of these two definitions cannot be swapped.
-        let mut criteria = Vec::new();
-        let mut fn_criteria = Vec::new();
-        let ranges = &mut Vec::new();
-        for case_index in 1..=case_count {
-            let criterion = self.evaluate_node_in_context(&args[case_index * 2], cell);
-            // NB: criterion might be an error. That's ok
-            criteria.push(criterion);
-            // NB: We cannot do:
-            // fn_criteria.push(build_criteria(&criterion));
-            // because criterion doesn't live long enough
-            let result = self.evaluate_node_in_context(&args[case_index * 2 - 1], cell);
-            if result.is_error() {
-                return Err(result);
-            }
-            if let CalcResult::Range { left, right } = result {
-                if left.sheet != right.sheet {
-                    return Err(CalcResult::new_error(
-                        Error::VALUE,
-                        cell,
-                        "Ranges are in different sheets".to_string(),
-                    ));
-                }
-                // TODO test ranges are of the same size as sum_range
-                ranges.push(Range { left, right });
-            } else {
-                return Err(CalcResult::new_error(
-                    Error::VALUE,
-                    cell,
-                    "Expected a range".to_string(),
-                ));
-            }
-        }
-        for criterion in criteria.iter() {
-            fn_criteria.push(build_criteria(criterion));
-        }
-
-        let left_row = sum_range.left.row;
-        let left_column = sum_range.left.column;
-        let mut right_row = sum_range.right.row;
-        let mut right_column = sum_range.right.column;
-
-        if left_row == 1 && right_row == LAST_ROW {
-            right_row = match self.workbook.worksheet(sum_range.left.sheet) {
-                Ok(s) => s.dimension().max_row,
-                Err(_) => {
-                    return Err(CalcResult::new_error(
-                        Error::ERROR,
-                        cell,
-                        format!("Invalid worksheet index: '{}'", sum_range.left.sheet),
-                    ));
-                }
-            };
-        }
-        if left_column == 1 && right_column == LAST_COLUMN {
-            right_column = match self.workbook.worksheet(sum_range.left.sheet) {
-                Ok(s) => s.dimension().max_column,
-                Err(_) => {
-                    return Err(CalcResult::new_error(
-                        Error::ERROR,
-                        cell,
-                        format!("Invalid worksheet index: '{}'", sum_range.left.sheet),
-                    ));
-                }
-            };
-        }
-
-        for row in left_row..right_row + 1 {
-            for column in left_column..right_column + 1 {
-                let mut is_true = true;
-                for case_index in 0..case_count {
-                    // We check if value in range n meets criterion n
-                    let range = &ranges[case_index];
-                    let fn_criterion = &fn_criteria[case_index];
-                    let value = self.evaluate_cell(CellReferenceIndex {
-                        sheet: range.left.sheet,
-                        row: range.left.row + row - sum_range.left.row,
-                        column: range.left.column + column - sum_range.left.column,
-                    });
-                    if !fn_criterion(&value) {
-                        is_true = false;
-                        break;
-                    }
-                }
-                if is_true {
-                    let v = self.evaluate_cell(CellReferenceIndex {
-                        sheet: sum_range.left.sheet,
-                        row,
-                        column,
-                    });
-                    match v {
-                        CalcResult::Number(n) => apply(n),
-                        CalcResult::Error { .. } => return Err(v),
-                        _ => {}
-                    }
-                }
-            }
-        }
-        Ok(())
-    }
-
-    pub(crate) fn fn_averageifs(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        let mut total = 0.0;
-        let mut count = 0.0;
-
-        let average = |value: f64| {
-            total += value;
-            count += 1.0;
-        };
-        if let Err(e) = self.apply_ifs(args, cell, average) {
-            return e;
-        }
-
-        if count == 0.0 {
-            return CalcResult::Error {
-                error: Error::DIV,
-                origin: cell,
-                message: "division by 0".to_string(),
-            };
-        }
-        CalcResult::Number(total / count)
-    }
-
-    pub(crate) fn fn_minifs(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        let mut min = f64::INFINITY;
-        let apply_min = |value: f64| min = value.min(min);
-        if let Err(e) = self.apply_ifs(args, cell, apply_min) {
-            return e;
-        }
-
-        if min.is_infinite() {
-            min = 0.0;
-        }
-        CalcResult::Number(min)
-    }
-
-    pub(crate) fn fn_maxifs(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        let mut max = -f64::INFINITY;
-        let apply_max = |value: f64| max = value.max(max);
-        if let Err(e) = self.apply_ifs(args, cell, apply_max) {
-            return e;
-        }
-        if max.is_infinite() {
-            max = 0.0;
-        }
-        CalcResult::Number(max)
-    }
-}

base/src/functions/statistical/log_normal.rs

@@ -1,124 +0,0 @@
-use statrs::distribution::{Continuous, ContinuousCDF, LogNormal};
-
-use crate::expressions::types::CellReferenceIndex;
-use crate::{
-    calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
-};
-
-impl<'a> Model<'a> {
-    pub(crate) fn fn_log_norm_dist(
-        &mut self,
-        args: &[Node],
-        cell: CellReferenceIndex,
-    ) -> CalcResult {
-        if args.len() != 4 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let x = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-        let mean = match self.get_number_no_bools(&args[1], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-        let std_dev = match self.get_number_no_bools(&args[2], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-        let cumulative = match self.get_boolean(&args[3], cell) {
-            Ok(b) => b,
-            Err(e) => return e,
-        };
-
-        // Excel domain checks
-        if x <= 0.0 || std_dev <= 0.0 {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid parameter for LOGNORM.DIST".to_string(),
-            };
-        }
-
-        let dist = match LogNormal::new(mean, std_dev) {
-            Ok(d) => d,
-            Err(_) => {
-                return CalcResult::Error {
-                    error: Error::NUM,
-                    origin: cell,
-                    message: "Invalid parameter for LOGNORM.DIST".to_string(),
-                }
-            }
-        };
-
-        let result = if cumulative { dist.cdf(x) } else { dist.pdf(x) };
-
-        if !result.is_finite() {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid parameter for LOGNORM.DIST".to_string(),
-            };
-        }
-
-        CalcResult::Number(result)
-    }
-
-    pub(crate) fn fn_log_norm_inv(
-        &mut self,
-        args: &[Node],
-        cell: CellReferenceIndex,
-    ) -> CalcResult {
-        use statrs::distribution::{ContinuousCDF, LogNormal};
-
-        if args.len() != 3 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let p = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-        let mean = match self.get_number_no_bools(&args[1], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-        let std_dev = match self.get_number_no_bools(&args[2], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-
-        // Excel domain checks
-        if p <= 0.0 || p >= 1.0 || std_dev <= 0.0 {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid parameter for LOGNORM.INV".to_string(),
-            };
-        }
-
-        let dist = match LogNormal::new(mean, std_dev) {
-            Ok(d) => d,
-            Err(_) => {
-                return CalcResult::Error {
-                    error: Error::NUM,
-                    origin: cell,
-                    message: "Invalid parameter for LOGNORM.INV".to_string(),
-                }
-            }
-        };
-
-        let result = dist.inverse_cdf(p);
-
-        if !result.is_finite() {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid parameter for LOGNORM.INV".to_string(),
-            };
-        }
-
-        CalcResult::Number(result)
-    }
-}

base/src/functions/statistical/mod.rs

@@ -1,26 +0,0 @@
-mod beta;
-mod binom;
-mod chisq;
-mod correl;
-mod count_and_average;
-mod covariance;
-mod devsq;
-mod exponential;
-mod fisher;
-mod gamma;
-mod gauss;
-mod geomean;
-mod hypegeom;
-mod if_ifs;
-mod log_normal;
-mod normal;
-mod pearson;
-mod phi;
-mod poisson;
-mod rank_eq_avg;
-mod standard_dev;
-mod standardize;
-mod t_dist;
-mod variance;
-mod weibull;
-mod z_test;

base/src/functions/statistical/normal.rs

@@ -1,325 +0,0 @@
-use statrs::distribution::{Continuous, ContinuousCDF, Normal, StudentsT};
-
-use crate::expressions::types::CellReferenceIndex;
-use crate::{
-    calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
-};
-
-impl<'a> Model<'a> {
-    // NORM.DIST(x, mean, standard_dev, cumulative)
-    pub(crate) fn fn_norm_dist(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.len() != 4 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let x = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-        let mean = match self.get_number_no_bools(&args[1], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-        let std_dev = match self.get_number_no_bools(&args[2], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-        let cumulative = match self.get_boolean(&args[3], cell) {
-            Ok(b) => b,
-            Err(e) => return e,
-        };
-
-        // Excel: standard_dev must be > 0
-        if std_dev <= 0.0 {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "standard_dev must be > 0 in NORM.DIST".to_string(),
-            };
-        }
-
-        let dist = match Normal::new(mean, std_dev) {
-            Ok(d) => d,
-            Err(_) => {
-                return CalcResult::Error {
-                    error: Error::NUM,
-                    origin: cell,
-                    message: "Invalid parameters for NORM.DIST".to_string(),
-                }
-            }
-        };
-
-        let result = if cumulative { dist.cdf(x) } else { dist.pdf(x) };
-
-        if !result.is_finite() {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid result for NORM.DIST".to_string(),
-            };
-        }
-
-        CalcResult::Number(result)
-    }
-
-    // NORM.INV(probability, mean, standard_dev)
-    pub(crate) fn fn_norm_inv(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.len() != 3 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let p = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-        let mean = match self.get_number_no_bools(&args[1], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-        let std_dev = match self.get_number_no_bools(&args[2], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-
-        if p <= 0.0 || p >= 1.0 || std_dev <= 0.0 {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid parameters for NORM.INV".to_string(),
-            };
-        }
-
-        let dist = match Normal::new(mean, std_dev) {
-            Ok(d) => d,
-            Err(_) => {
-                return CalcResult::Error {
-                    error: Error::NUM,
-                    origin: cell,
-                    message: "Invalid parameters for NORM.INV".to_string(),
-                }
-            }
-        };
-
-        let x = dist.inverse_cdf(p);
-
-        if !x.is_finite() {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid result for NORM.INV".to_string(),
-            };
-        }
-
-        CalcResult::Number(x)
-    }
-
-    // NORM.S.DIST(z, cumulative)
-    pub(crate) fn fn_norm_s_dist(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.len() != 2 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let z = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-        let cumulative = match self.get_boolean(&args[1], cell) {
-            Ok(b) => b,
-            Err(e) => return e,
-        };
-
-        let dist = match Normal::new(0.0, 1.0) {
-            Ok(d) => d,
-            Err(_) => {
-                return CalcResult::Error {
-                    error: Error::ERROR,
-                    origin: cell,
-                    message: "Failed to construct standard normal distribution".to_string(),
-                }
-            }
-        };
-
-        let result = if cumulative { dist.cdf(z) } else { dist.pdf(z) };
-
-        if !result.is_finite() {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid result for NORM.S.DIST".to_string(),
-            };
-        }
-
-        CalcResult::Number(result)
-    }
-
-    // NORM.S.INV(probability)
-    pub(crate) fn fn_norm_s_inv(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.len() != 1 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let p = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-
-        if p <= 0.0 || p >= 1.0 {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "probability must be in (0,1) in NORM.S.INV".to_string(),
-            };
-        }
-
-        let dist = match Normal::new(0.0, 1.0) {
-            Ok(d) => d,
-            Err(_) => {
-                return CalcResult::Error {
-                    error: Error::ERROR,
-                    origin: cell,
-                    message: "Failed to construct standard normal distribution".to_string(),
-                }
-            }
-        };
-
-        let z = dist.inverse_cdf(p);
-
-        if !z.is_finite() {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid result for NORM.S.INV".to_string(),
-            };
-        }
-
-        CalcResult::Number(z)
-    }
-
-    pub(crate) fn fn_confidence_norm(
-        &mut self,
-        args: &[Node],
-        cell: CellReferenceIndex,
-    ) -> CalcResult {
-        if args.len() != 3 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let alpha = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-        let std_dev = match self.get_number_no_bools(&args[1], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-        let size = match self.get_number_no_bools(&args[2], cell) {
-            Ok(f) => f.floor(),
-            Err(e) => return e,
-        };
-
-        if alpha <= 0.0 || alpha >= 1.0 || std_dev <= 0.0 {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid parameters for CONFIDENCE.NORM".to_string(),
-            };
-        }
-        if size < 1.0 {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Sample size must be at least 1".to_string(),
-            };
-        }
-
-        let normal = match Normal::new(0.0, 1.0) {
-            Ok(d) => d,
-            Err(_) => {
-                return CalcResult::new_error(
-                    Error::ERROR,
-                    cell,
-                    "Failed to construct normal distribution".to_string(),
-                )
-            }
-        };
-
-        let quantile = normal.inverse_cdf(1.0 - alpha / 2.0);
-        if !quantile.is_finite() {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid quantile for CONFIDENCE.NORM".to_string(),
-            };
-        }
-
-        let margin = quantile * std_dev / size.sqrt();
-        CalcResult::Number(margin)
-    }
-
-    pub(crate) fn fn_confidence_t(
-        &mut self,
-        args: &[Node],
-        cell: CellReferenceIndex,
-    ) -> CalcResult {
-        if args.len() != 3 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let alpha = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-        let std_dev = match self.get_number_no_bools(&args[1], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-        let size = match self.get_number_no_bools(&args[2], cell) {
-            Ok(f) => f.trunc(),
-            Err(e) => return e,
-        };
-
-        // Domain checks
-        if alpha <= 0.0 || alpha >= 1.0 || std_dev <= 0.0 {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid parameters for CONFIDENCE.T".to_string(),
-            };
-        }
-
-        // Need at least 2 observations so df = n - 1 > 0
-        if size < 2.0 {
-            return CalcResult::Error {
-                error: Error::DIV,
-                origin: cell,
-                message: "Sample size must be at least 2".to_string(),
-            };
-        }
-
-        let df = size - 1.0;
-
-        let t_dist = match StudentsT::new(0.0, 1.0, df) {
-            Ok(d) => d,
-            Err(_) => {
-                return CalcResult::new_error(
-                    Error::ERROR,
-                    cell,
-                    "Failed to construct Student's t distribution".to_string(),
-                )
-            }
-        };
-
-        // Two-sided CI => use 1 - alpha/2
-        let t_crit = t_dist.inverse_cdf(1.0 - alpha / 2.0);
-        if !t_crit.is_finite() {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid quantile for CONFIDENCE.T".to_string(),
-            };
-        }
-
-        let margin = t_crit * std_dev / size.sqrt();
-        CalcResult::Number(margin)
-    }
-}

base/src/functions/statistical/pearson.rs

@@ -1,113 +0,0 @@
-use crate::expressions::types::CellReferenceIndex;
-use crate::{
-    calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
-};
-
-impl<'a> Model<'a> {
-    // PEARSON(array1, array2)
-    pub(crate) fn fn_pearson(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        let (_, _, values_left, values_right) = match self.fn_get_two_matrices(args, cell) {
-            Ok(result) => result,
-            Err(e) => return e,
-        };
-
-        // Flatten into (x, y) pairs, skipping non-numeric entries (None)
-        let mut n: f64 = 0.0;
-        let mut sum_x = 0.0;
-        let mut sum_y = 0.0;
-        let mut sum_x2 = 0.0;
-        let mut sum_y2 = 0.0;
-        let mut sum_xy = 0.0;
-
-        let len = values_left.len().min(values_right.len());
-        for i in 0..len {
-            match (values_left[i], values_right[i]) {
-                (Some(x), Some(y)) => {
-                    n += 1.0;
-                    sum_x += x;
-                    sum_y += y;
-                    sum_x2 += x * x;
-                    sum_y2 += y * y;
-                    sum_xy += x * y;
-                }
-                _ => {
-                    // Ignore pairs where at least one side is non-numeric
-                }
-            }
-        }
-
-        if n < 2.0 {
-            return CalcResult::new_error(
-                Error::DIV,
-                cell,
-                "PEARSON requires at least two numeric pairs".to_string(),
-            );
-        }
-
-        // Pearson correlation:
-        // r = [ n*Σxy - (Σx)(Σy) ] / sqrt( [n*Σx² - (Σx)²] [n*Σy² - (Σy)²] )
-        let num = n * sum_xy - sum_x * sum_y;
-        let denom_x = n * sum_x2 - sum_x * sum_x;
-        let denom_y = n * sum_y2 - sum_y * sum_y;
-
-        if denom_x.abs() < 1e-15 || denom_y.abs() < 1e-15 {
-            // Zero variance in at least one series
-            return CalcResult::new_error(
-                Error::DIV,
-                cell,
-                "PEARSON cannot be computed when one series has zero variance".to_string(),
-            );
-        }
-
-        let denom = (denom_x * denom_y).sqrt();
-
-        CalcResult::Number(num / denom)
-    }
-
-    // RSQ(array1, array2) = CORREL(array1, array2)^2
-    pub(crate) fn fn_rsq(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        let (_rows, _cols, values1, values2) = match self.fn_get_two_matrices(args, cell) {
-            Ok(s) => s,
-            Err(e) => return e,
-        };
-
-        let mut n = 0.0_f64;
-        let mut sum_x = 0.0_f64;
-        let mut sum_y = 0.0_f64;
-        let mut sum_x2 = 0.0_f64;
-        let mut sum_y2 = 0.0_f64;
-        let mut sum_xy = 0.0_f64;
-
-        let len = values1.len().min(values2.len());
-        for i in 0..len {
-            if let (Some(x), Some(y)) = (values1[i], values2[i]) {
-                n += 1.0;
-                sum_x += x;
-                sum_y += y;
-                sum_x2 += x * x;
-                sum_y2 += y * y;
-                sum_xy += x * y;
-            }
-        }
-
-        if n < 2.0 {
-            return CalcResult::new_error(
-                Error::DIV,
-                cell,
-                "RSQ requires at least two numeric data points in each range".to_string(),
-            );
-        }
-
-        let num = n * sum_xy - sum_x * sum_y;
-        let denom_x = n * sum_x2 - sum_x * sum_x;
-        let denom_y = n * sum_y2 - sum_y * sum_y;
-        let denom = (denom_x * denom_y).sqrt();
-
-        if denom == 0.0 || !denom.is_finite() {
-            return CalcResult::new_error(Error::DIV, cell, "Division by zero in RSQ".to_string());
-        }
-
-        let r = num / denom;
-        CalcResult::Number(r * r)
-    }
-}

base/src/functions/statistical/phi.rs

@@ -1,21 +0,0 @@
-use crate::expressions::types::CellReferenceIndex;
-use crate::{calc_result::CalcResult, expressions::parser::Node, model::Model};
-
-impl<'a> Model<'a> {
-    // PHI(x) = standard normal PDF at x
-    pub(crate) fn fn_phi(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.len() != 1 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        let x = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-
-        // Standard normal PDF: (1 / sqrt(2π)) * exp(-x^2 / 2)
-        let result = (-(x * x) / 2.0).exp() / (2.0 * std::f64::consts::PI).sqrt();
-
-        CalcResult::Number(result)
-    }
-}

base/src/functions/statistical/poisson.rs

@@ -1,94 +0,0 @@
-use statrs::distribution::{Discrete, DiscreteCDF, Poisson};
-
-use crate::expressions::types::CellReferenceIndex;
-use crate::{
-    calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
-};
-
-impl<'a> Model<'a> {
-    // =POISSON.DIST(x, mean, cumulative)
-    pub(crate) fn fn_poisson_dist(
-        &mut self,
-        args: &[Node],
-        cell: CellReferenceIndex,
-    ) -> CalcResult {
-        if args.len() != 3 {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        // x
-        let x = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f.trunc(),
-            Err(e) => return e,
-        };
-
-        // mean (lambda)
-        let lambda = match self.get_number_no_bools(&args[1], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-
-        let cumulative = match self.get_boolean(&args[2], cell) {
-            Ok(b) => b,
-            Err(e) => return e,
-        };
-
-        if x < 0.0 || lambda < 0.0 {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid parameters for POISSON.DIST".to_string(),
-            };
-        }
-
-        // Guard against insane k for u64
-        if x < 0.0 || x > (u64::MAX as f64) {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid parameters for POISSON.DIST".to_string(),
-            };
-        }
-
-        let k = x as u64;
-
-        // Special-case lambda = 0: degenerate distribution at 0
-        if lambda == 0.0 {
-            let result = if cumulative {
-                // For x >= 0, P(X <= x) = 1
-                1.0
-            } else {
-                // P(X = 0) = 1, P(X = k>0) = 0
-                if k == 0 {
-                    1.0
-                } else {
-                    0.0
-                }
-            };
-            return CalcResult::Number(result);
-        }
-
-        let dist = match Poisson::new(lambda) {
-            Ok(d) => d,
-            Err(_) => {
-                return CalcResult::Error {
-                    error: Error::NUM,
-                    origin: cell,
-                    message: "Invalid parameters for POISSON.DIST".to_string(),
-                }
-            }
-        };
-
-        let prob = if cumulative { dist.cdf(k) } else { dist.pmf(k) };
-
-        if !prob.is_finite() {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "Invalid result for POISSON.DIST".to_string(),
-            };
-        }
-
-        CalcResult::Number(prob)
-    }
-}

base/src/functions/statistical/rank_eq_avg.rs

@@ -1,202 +0,0 @@
-use crate::expressions::types::CellReferenceIndex;
-use crate::{
-    calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
-};
-
-impl<'a> Model<'a> {
-    // Helper to collect numeric values from the 2nd argument of RANK.*
-    fn collect_rank_values(
-        &mut self,
-        arg: &Node,
-        cell: CellReferenceIndex,
-    ) -> Result<Vec<f64>, CalcResult> {
-        let values = match self.evaluate_node_in_context(arg, cell) {
-            CalcResult::Array(array) => match self.values_from_array(array) {
-                Ok(v) => v,
-                Err(e) => {
-                    return Err(CalcResult::Error {
-                        error: Error::VALUE,
-                        origin: cell,
-                        message: format!("Unsupported array argument: {}", e),
-                    })
-                }
-            },
-            CalcResult::Range { left, right } => self.values_from_range(left, right)?,
-            CalcResult::Boolean(value) => {
-                if !matches!(arg, Node::ReferenceKind { .. }) {
-                    vec![Some(if value { 1.0 } else { 0.0 })]
-                } else {
-                    return Err(CalcResult::Error {
-                        error: Error::NUM,
-                        origin: cell,
-                        message: "Unsupported argument type".to_string(),
-                    });
-                }
-            }
-            _ => {
-                return Err(CalcResult::Error {
-                    error: Error::NIMPL,
-                    origin: cell,
-                    message: "Unsupported argument type".to_string(),
-                })
-            }
-        };
-
-        let numeric_values: Vec<f64> = values.into_iter().flatten().collect();
-        Ok(numeric_values)
-    }
-
-    // RANK.EQ(number, ref, [order])
-    pub(crate) fn fn_rank_eq(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if !(2..=3).contains(&args.len()) {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        // number
-        let number = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-
-        // ref
-        let mut values = match self.collect_rank_values(&args[1], cell) {
-            Ok(v) => v,
-            Err(e) => return e,
-        };
-
-        if values.is_empty() {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "No numeric values for RANK.EQ".to_string(),
-            };
-        }
-
-        // order: default 0 (descending)
-        let order = if args.len() == 2 {
-            0.0
-        } else {
-            match self.get_number_no_bools(&args[2], cell) {
-                Ok(f) => f,
-                Err(e) => return e,
-            }
-        };
-
-        values.retain(|v| !v.is_nan());
-
-        // "better" = greater (descending) or smaller (ascending)
-        let mut better = 0;
-        let mut equal = 0;
-
-        if order == 0.0 {
-            // descending
-            for v in &values {
-                if *v > number {
-                    better += 1;
-                } else if *v == number {
-                    equal += 1;
-                }
-            }
-        } else {
-            // ascending
-            for v in &values {
-                if *v < number {
-                    better += 1;
-                } else if *v == number {
-                    equal += 1;
-                }
-            }
-        }
-
-        if equal == 0 {
-            return CalcResult::Error {
-                error: Error::NA,
-                origin: cell,
-                message: "Number not found in reference for RANK.EQ".to_string(),
-            };
-        }
-
-        let rank = (better as f64) + 1.0;
-        CalcResult::Number(rank)
-    }
-
-    // RANK.AVG(number, ref, [order])
-    pub(crate) fn fn_rank_avg(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if !(2..=3).contains(&args.len()) {
-            return CalcResult::new_args_number_error(cell);
-        }
-
-        // number
-        let number = match self.get_number_no_bools(&args[0], cell) {
-            Ok(f) => f,
-            Err(e) => return e,
-        };
-
-        // ref
-        let mut values = match self.collect_rank_values(&args[1], cell) {
-            Ok(v) => v,
-            Err(e) => return e,
-        };
-
-        if values.is_empty() {
-            return CalcResult::Error {
-                error: Error::NUM,
-                origin: cell,
-                message: "No numeric values for RANK.AVG".to_string(),
-            };
-        }
-
-        // order: default 0 (descending)
-        let order = if args.len() == 2 {
-            0.0
-        } else {
-            match self.get_number_no_bools(&args[2], cell) {
-                Ok(f) => f,
-                Err(e) => return e,
-            }
-        };
-
-        values.retain(|v| !v.is_nan());
-
-        // > or < depending on order
-        let mut better = 0;
-        let mut equal = 0;
-
-        if order == 0.0 {
-            // descending
-            for v in &values {
-                if *v > number {
-                    better += 1;
-                } else if *v == number {
-                    equal += 1;
-                }
-            }
-        } else {
-            // ascending
-            for v in &values {
-                if *v < number {
-                    better += 1;
-                } else if *v == number {
-                    equal += 1;
-                }
-            }
-        }
-
-        if equal == 0 {
-            return CalcResult::Error {
-                error: Error::NA,
-                origin: cell,
-                message: "Number not found in reference for RANK.AVG".to_string(),
-            };
-        }
-
-        // For ties, average of the ranks. If the equal values occupy positions
-        // (better+1) ..= (better+equal), the average is:
-        // better + (equal + 1) / 2
-        let better_f = better as f64;
-        let equal_f = equal as f64;
-        let rank = better_f + (equal_f + 1.0) / 2.0;
-
-        CalcResult::Number(rank)
-    }
-}