FIX: Don not clone Locales and Languages, pass them by reference

UPDATE: Update "generate locale" utility

FIX: Minor fixes to UI and proper support for locales/timezones

UPDATE: Adds "display language" setting to core

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")?;
+    let mut model = Model::new_empty("formulas-and-errors", "en", "UTC", "en")?;
     // 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")?;
+    let mut model = Model::new_empty("hello-world", "en", "UTC", "en")?;
     // A1
     model.set_user_input(0, 1, 1, "Hello".to_string())?;
     // B1

base/src/actions.rs

@@ -1,5 +1,7 @@
 use crate::constants::{LAST_COLUMN, LAST_ROW};
-use crate::expressions::parser::stringify::{to_string, to_string_displaced, DisplaceData};
+use crate::expressions::parser::stringify::{
+    to_localized_string, to_string_displaced, DisplaceData,
+};
 use crate::expressions::types::CellReferenceRC;
 use crate::model::Model;
 
@@ -8,7 +10,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 Model {
+impl<'a> Model<'a> {
     fn shift_cell_formula(
         &mut self,
         sheet: u32,
@@ -29,7 +31,7 @@ impl Model {
                 column,
             };
             // FIXME: This is not a very performant way if the formula has changed :S.
-            let formula = to_string(node, &cell_reference);
+            let formula = to_localized_string(node, &cell_reference, self.locale, self.language);
             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}"))?;
@@ -108,7 +110,9 @@ impl Model {
         // 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(|| source_cell.get_text(&self.workbook.shared_strings, &self.language));
+            .unwrap_or_else(|| {
+                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)?
@@ -490,9 +494,11 @@ impl Model {
                 .cell(r.row, column)
                 .ok_or("Expected Cell to exist")?;
             let style_idx = cell.get_style();
-            let formula_or_value = self
-                .get_cell_formula(sheet, r.row, column)?
-                .unwrap_or_else(|| cell.get_text(&self.workbook.shared_strings, &self.language));
+            let formula_or_value =
+                self.get_cell_formula(sheet, r.row, column)?
+                    .unwrap_or_else(|| {
+                        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)?;
         }
@@ -577,9 +583,9 @@ impl Model {
                 .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(|| cell.get_text(&self.workbook.shared_strings, &self.language));
+            let formula_or_value = self.get_cell_formula(sheet, row, *c)?.unwrap_or_else(|| {
+                cell.get_localized_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 Model {
+impl<'a> Model<'a> {
     /// Applies `op` element‐wise for arrays/numbers.
     pub(crate) fn handle_arithmetic(
         &mut self,

base/src/cast.rs

@@ -14,7 +14,7 @@ pub(crate) enum NumberOrArray {
     Array(Vec<Vec<ArrayNode>>),
 }
 
-impl Model {
+impl<'a> Model<'a> {
     pub(crate) fn cast_number(&self, s: &str) -> Option<f64> {
         match s.trim().parse::<f64>() {
             Ok(f) => Some(f),
@@ -24,8 +24,16 @@ impl Model {
                 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) {
+                if let Ok((v, _number_format)) =
+                    parse_formatted_number(s, &currencies, decimal_separator, group_separator)
+                {
                     return Some(v);
                 }
                 None

base/src/cell.rs

@@ -122,11 +122,17 @@ impl Cell {
         }
     }
 
-    pub fn get_text(&self, shared_strings: &[String], language: &Language) -> String {
+    pub fn get_localized_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) => v.to_string().to_uppercase(),
+            CellValue::Boolean(v) => {
+                if v {
+                    language.booleans.r#true.to_string()
+                } else {
+                    language.booleans.r#false.to_string()
+                }
+            }
             CellValue::Number(v) => to_excel_precision_str(v),
         }
     }
@@ -171,7 +177,13 @@ impl Cell {
         match self.value(shared_strings, language) {
             CellValue::None => "".to_string(),
             CellValue::String(value) => value,
-            CellValue::Boolean(value) => value.to_string().to_uppercase(),
+            CellValue::Boolean(value) => {
+                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,6 +12,9 @@ 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,19 +79,24 @@ pub enum LexerMode {
 
 /// Tokenize an input
 #[derive(Clone)]
-pub struct Lexer {
+pub struct Lexer<'a> {
     position: usize,
     next_token_position: Option<usize>,
     len: usize,
     chars: Vec<char>,
     mode: LexerMode,
-    locale: Locale,
-    language: Language,
+    locale: &'a Locale,
+    language: &'a Language,
 }
 
-impl Lexer {
+impl<'a> Lexer<'a> {
     /// Creates a new `Lexer` that returns the tokens of a formula.
-    pub fn new(formula: &str, mode: LexerMode, locale: &Locale, language: &Language) -> Lexer {
+    pub fn new(
+        formula: &str,
+        mode: LexerMode,
+        locale: &'a Locale,
+        language: &'a Language,
+    ) -> Lexer<'a> {
         let chars: Vec<char> = formula.chars().collect();
         let len = chars.len();
         Lexer {
@@ -100,8 +105,8 @@ impl Lexer {
             next_token_position: None,
             len,
             mode,
-            locale: locale.clone(),
-            language: language.clone(),
+            locale,
+            language,
         }
     }
 
@@ -110,6 +115,16 @@ impl Lexer {
         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
 
@@ -188,6 +203,7 @@ impl Lexer {
                     ':' => 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 Lexer {
+impl<'a> Lexer<'a> {
     /// 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 Lexer {
+impl<'a> Lexer<'a> {
     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,7 +655,9 @@ fn test_comma() {
 
     // Used for testing locales where the comma is the decimal separator
     let mut lx = new_lexer("12,34", false);
-    lx.locale.numbers.symbols.decimal = ",".to_string();
+    let locale = get_locale("de").unwrap();
+    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_locale,
+    locale::get_default_locale,
 };
 
-fn new_language_lexer(formula: &str, language: &str) -> Lexer {
-    let locale = get_locale("en").unwrap();
+fn new_language_lexer<'a>(formula: &str, language: &str) -> Lexer<'a> {
+    let locale = get_default_locale();
     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(formula: &str, locale: &str, language: &str) -> Lexer {
+fn new_language_lexer<'a>(formula: &str, locale: &str, language: &str) -> Lexer<'a> {
     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,8 +31,12 @@ 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;
@@ -202,28 +206,35 @@ pub enum Node {
 }
 
 #[derive(Clone)]
-pub struct Parser {
-    lexer: lexer::Lexer,
+pub struct Parser<'a> {
+    lexer: lexer::Lexer<'a>,
     worksheets: Vec<String>,
     defined_names: Vec<DefinedNameS>,
     context: CellReferenceRC,
     tables: HashMap<String, Table>,
+    locale: &'a Locale,
+    language: &'a Language,
 }
 
-impl Parser {
+pub fn new_parser_english<'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)
+}
+
+impl<'a> Parser<'a> {
     pub fn new(
         worksheets: Vec<String>,
         defined_names: Vec<DefinedNameS>,
         tables: HashMap<String, Table>,
-    ) -> Parser {
-        let lexer = lexer::Lexer::new(
-            "",
-            lexer::LexerMode::A1,
-            #[allow(clippy::expect_used)]
-            get_locale("en").expect(""),
-            #[allow(clippy::expect_used)]
-            get_language("en").expect(""),
-        );
+        locale: &'a Locale,
+        language: &'a Language,
+    ) -> Parser<'a> {
+        let lexer = lexer::Lexer::new("", lexer::LexerMode::A1, locale, language);
         let context = CellReferenceRC {
             sheet: worksheets.first().map_or("", |v| v).to_string(),
             column: 1,
@@ -235,12 +246,24 @@ impl Parser {
             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>,
@@ -256,6 +279,27 @@ impl Parser {
         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() {
@@ -464,6 +508,7 @@ impl Parser {
 
     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() {
@@ -471,6 +516,20 @@ impl Parser {
             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 {
@@ -482,14 +541,27 @@ impl Parser {
         };
         row.push(first_element);
         let mut next_token = self.lexer.peek_token();
-        // FIXME: this is not respecting the locale
-        while next_token == TokenType::Comma {
+        while next_token == column_separator_token {
             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 {
@@ -527,6 +599,7 @@ impl Parser {
             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,
@@ -536,9 +609,8 @@ impl Parser {
 
                 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 == TokenType::Semicolon {
+                while next_token == column_separator_token {
                     self.lexer.advance_token();
                     let row = match self.parse_array_row() {
                         Ok(s) => s,
@@ -687,12 +759,7 @@ impl Parser {
                             message: err.message,
                         };
                     }
-                    if let Some(function_kind) = Function::get_function(&name) {
-                        return Node::FunctionKind {
-                            kind: function_kind,
-                            args,
-                        };
-                    }
+                    // We should do this *only* importing functions from xlsx
                     if &name == "_xlfn.SINGLE" {
                         if args.len() != 1 {
                             return Node::ParseErrorKind {
@@ -707,6 +774,17 @@ impl Parser {
                             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;
@@ -821,6 +899,7 @@ impl Parser {
             | TokenType::RightBracket
             | TokenType::Colon
             | TokenType::Semicolon
+            | TokenType::Backslash
             | TokenType::RightBrace
             | TokenType::Comma
             | TokenType::Bang
@@ -1020,12 +1099,13 @@ impl Parser {
     }
 
     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() == TokenType::Comma {
+        if &self.lexer.peek_token() == arg_separator_token {
             args.push(Node::EmptyArgKind);
         } else {
             let t = self.parse_expr();
@@ -1035,11 +1115,11 @@ impl Parser {
             args.push(t);
         }
         next_token = self.lexer.peek_token();
-        while next_token == TokenType::Comma {
+        while &next_token == arg_separator_token {
             self.lexer.advance_token();
-            if self.lexer.peek_token() == TokenType::Comma {
+            if &self.lexer.peek_token() == arg_separator_token {
                 args.push(Node::EmptyArgKind);
-                next_token = TokenType::Comma;
+                next_token = arg_separator_token.clone();
             } else if self.lexer.peek_token() == TokenType::RightParenthesis {
                 args.push(Node::EmptyArgKind);
                 return Ok(args);

base/src/expressions/parser/move_formula.rs

@@ -5,6 +5,8 @@ use super::{
 use crate::{
     constants::{LAST_COLUMN, LAST_ROW},
     expressions::token::OpUnary,
+    language::Language,
+    locale::Locale,
 };
 use crate::{
     expressions::types::{Area, CellReferenceRC},
@@ -38,38 +40,78 @@ 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(node: &Node, move_context: &MoveContext) -> String {
-    to_string_moved(node, move_context)
+pub(crate) fn move_formula(
+    node: &Node,
+    move_context: &MoveContext,
+    locale: &Locale,
+    language: &Language,
+) -> String {
+    to_string_moved(node, move_context, locale, language)
 }
 
-fn move_function(name: &str, args: &Vec<Node>, move_context: &MoveContext) -> String {
+fn move_function(
+    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, to_string_moved(el, move_context));
+            arguments = format!(
+                "{},{}",
+                arguments,
+                to_string_moved(el, move_context, locale, language)
+            );
         } else {
             first = false;
-            arguments = to_string_moved(el, move_context);
+            arguments = to_string_moved(el, move_context, locale, language);
         }
     }
     format!("{name}({arguments})")
 }
 
-pub(crate) fn to_string_array_node(node: &ArrayNode) -> String {
+fn format_number_locale(number: f64, locale: &Locale) -> 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) => format!("{value}").to_ascii_uppercase(),
-        ArrayNode::Number(number) => to_excel_precision_str(*number),
+        ArrayNode::Boolean(value) => {
+            if *value {
+                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(node: &Node, move_context: &MoveContext) -> String {
+fn to_string_moved(
+    node: &Node,
+    move_context: &MoveContext,
+    locale: &Locale,
+    language: &Language,
+) -> String {
     use self::Node::*;
     match node {
         BooleanKind(value) => format!("{value}").to_ascii_uppercase(),
-        NumberKind(number) => to_excel_precision_str(*number),
+        NumberKind(number) => format_number_locale(*number, locale),
         StringKind(value) => format!("\"{value}\""),
         ReferenceKind {
             sheet_name,
@@ -329,55 +371,81 @@ fn to_string_moved(node: &Node, move_context: &MoveContext) -> String {
         }
         OpRangeKind { left, right } => format!(
             "{}:{}",
-            to_string_moved(left, move_context),
-            to_string_moved(right, move_context),
+            to_string_moved(left, move_context, locale, language),
+            to_string_moved(right, move_context, locale, language),
         ),
         OpConcatenateKind { left, right } => format!(
             "{}&{}",
-            to_string_moved(left, move_context),
-            to_string_moved(right, move_context),
+            to_string_moved(left, move_context, locale, language),
+            to_string_moved(right, move_context, locale, language),
         ),
         OpSumKind { kind, left, right } => format!(
             "{}{}{}",
-            to_string_moved(left, move_context),
+            to_string_moved(left, move_context, locale, language),
             kind,
-            to_string_moved(right, move_context),
+            to_string_moved(right, move_context, locale, language),
         ),
         OpProductKind { kind, left, right } => {
             let x = match **left {
-                OpSumKind { .. } => format!("({})", to_string_moved(left, move_context)),
-                CompareKind { .. } => format!("({})", to_string_moved(left, move_context)),
-                _ => to_string_moved(left, move_context),
+                OpSumKind { .. } => format!(
+                    "({})",
+                    to_string_moved(left, move_context, locale, language)
+                ),
+                CompareKind { .. } => format!(
+                    "({})",
+                    to_string_moved(left, move_context, locale, language)
+                ),
+                _ => to_string_moved(left, move_context, locale, language),
             };
             let y = match **right {
-                OpSumKind { .. } => format!("({})", to_string_moved(right, move_context)),
-                CompareKind { .. } => format!("({})", to_string_moved(right, move_context)),
-                OpProductKind { .. } => format!("({})", to_string_moved(right, move_context)),
+                OpSumKind { .. } => format!(
+                    "({})",
+                    to_string_moved(right, move_context, locale, language)
+                ),
+                CompareKind { .. } => format!(
+                    "({})",
+                    to_string_moved(right, move_context, locale, language)
+                ),
+                OpProductKind { .. } => format!(
+                    "({})",
+                    to_string_moved(right, move_context, locale, language)
+                ),
                 UnaryKind { .. } => {
-                    format!("({})", to_string_moved(right, move_context))
+                    format!(
+                        "({})",
+                        to_string_moved(right, move_context, locale, language)
+                    )
                 }
-                _ => to_string_moved(right, move_context),
+                _ => to_string_moved(right, move_context, locale, language),
             };
             format!("{x}{kind}{y}")
         }
         OpPowerKind { left, right } => format!(
             "{}^{}",
-            to_string_moved(left, move_context),
-            to_string_moved(right, move_context),
+            to_string_moved(left, move_context, locale, language),
+            to_string_moved(right, move_context, locale, language),
         ),
-        InvalidFunctionKind { name, args } => move_function(name, args, move_context),
+        InvalidFunctionKind { name, args } => {
+            move_function(name, args, move_context, locale, language)
+        }
         FunctionKind { kind, args } => {
-            let name = &kind.to_string();
-            move_function(name, args, move_context)
+            let name = &kind.to_localized_name(language);
+            move_function(name, args, move_context, locale, language)
         }
         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(',');
+                    matrix_string.push(col_separator);
                 } else {
                     first_row = false;
                 }
@@ -387,13 +455,13 @@ fn to_string_moved(node: &Node, move_context: &MoveContext) -> String {
                 let mut row_string = String::new();
                 for el in row {
                     if !first_col {
-                        row_string.push(',');
+                        row_string.push(row_separator);
                     } else {
                         first_col = false;
                     }
 
                     // Reuse your existing element-stringification function
-                    row_string.push_str(&to_string_array_node(el));
+                    row_string.push_str(&to_string_array_node(el, locale, language));
                 }
 
                 // Enclose the row in braces
@@ -410,13 +478,19 @@ fn to_string_moved(node: &Node, move_context: &MoveContext) -> String {
         WrongVariableKind(name) => name.to_string(),
         CompareKind { kind, left, right } => format!(
             "{}{}{}",
-            to_string_moved(left, move_context),
+            to_string_moved(left, move_context, locale, language),
             kind,
-            to_string_moved(right, move_context),
+            to_string_moved(right, move_context, locale, language),
         ),
         UnaryKind { kind, right } => match kind {
-            OpUnary::Minus => format!("-{}", to_string_moved(right, move_context)),
-            OpUnary::Percentage => format!("{}%", to_string_moved(right, move_context)),
+            OpUnary::Minus => format!(
+                "-{}",
+                to_string_moved(right, move_context, locale, language)
+            ),
+            OpUnary::Percentage => format!(
+                "{}%",
+                to_string_moved(right, move_context, locale, language)
+            ),
         },
         ErrorKind(kind) => format!("{kind}"),
         ParseErrorKind {
@@ -429,7 +503,10 @@ fn to_string_moved(node: &Node, move_context: &MoveContext) -> String {
             automatic: _,
             child,
         } => {
-            format!("@{}", to_string_moved(child, move_context))
+            format!(
+                "@{}",
+                to_string_moved(child, move_context, locale, language)
+            )
         }
     }
 }

base/src/expressions/parser/static_analysis.rs

@@ -711,6 +711,7 @@ 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],
@@ -871,12 +872,10 @@ fn get_function_args_signature(kind: &Function, arg_count: usize) -> Vec<Signatu
         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],
@@ -889,6 +888,125 @@ fn get_function_args_signature(kind: &Function, arg_count: usize) -> Vec<Signatu
         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],
     }
 }
 
@@ -914,7 +1032,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), // static_analysis_choose(args, cell),
+        Function::Choose => scalar_arguments(args),
         Function::Column => not_implemented(args),
         Function::Columns => not_implemented(args),
         Function::Cos => scalar_arguments(args),
@@ -961,7 +1079,6 @@ 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),
@@ -990,6 +1107,7 @@ 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),
@@ -1152,7 +1270,6 @@ fn static_analysis_on_function(kind: &Function, args: &[Node]) -> StaticResult {
         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),
@@ -1165,5 +1282,81 @@ fn static_analysis_on_function(kind: &Function, args: &[Node]) -> StaticResult {
         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,6 +3,8 @@ 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 {
@@ -43,17 +45,44 @@ pub enum DisplaceData {
 
 /// This is the internal mode in IronCalc
 pub fn to_rc_format(node: &Node) -> String {
-    stringify(node, None, &DisplaceData::None, false)
+    #[allow(clippy::expect_used)]
+    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_string(node: &Node, context: &CellReferenceRC) -> String {
-    stringify(node, Some(context), &DisplaceData::None, false)
+pub fn to_localized_string(
+    node: &Node,
+    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 {
-    stringify(node, Some(context), &DisplaceData::None, true)
+    #[allow(clippy::expect_used)]
+    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(
@@ -61,7 +90,11 @@ pub fn to_string_displaced(
     context: &CellReferenceRC,
     displace_data: &DisplaceData,
 ) -> String {
-    stringify(node, Some(context), displace_data, false)
+    #[allow(clippy::expect_used)]
+    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.
@@ -273,19 +306,41 @@ 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,
-                stringify(el, context, displace_data, export_to_excel)
+                arg_separator,
+                stringify(
+                    el,
+                    context,
+                    displace_data,
+                    export_to_excel,
+                    locale,
+                    language
+                )
             );
         } else {
             first = false;
-            arguments = stringify(el, context, displace_data, export_to_excel);
+            arguments = stringify(
+                el,
+                context,
+                displace_data,
+                export_to_excel,
+                locale,
+                language,
+            );
         }
     }
     format!("{name}({arguments})")
@@ -321,11 +376,26 @@ fn stringify(
     context: Option<&CellReferenceRC>,
     displace_data: &DisplaceData,
     export_to_excel: bool,
+    locale: &Locale,
+    language: &Language,
 ) -> String {
     use self::Node::*;
     match node {
-        BooleanKind(value) => format!("{value}").to_ascii_uppercase(),
-        NumberKind(number) => to_excel_precision_str(*number),
+        BooleanKind(value) => {
+            if *value {
+                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,
@@ -469,32 +539,95 @@ fn stringify(
         }
         OpRangeKind { left, right } => format!(
             "{}:{}",
-            stringify(left, context, displace_data, export_to_excel),
-            stringify(right, context, displace_data, export_to_excel)
+            stringify(
+                left,
+                context,
+                displace_data,
+                export_to_excel,
+                locale,
+                language
+            ),
+            stringify(
+                right,
+                context,
+                displace_data,
+                export_to_excel,
+                locale,
+                language
+            )
         ),
         OpConcatenateKind { left, right } => format!(
             "{}&{}",
-            stringify(left, context, displace_data, export_to_excel),
-            stringify(right, context, displace_data, export_to_excel)
+            stringify(
+                left,
+                context,
+                displace_data,
+                export_to_excel,
+                locale,
+                language
+            ),
+            stringify(
+                right,
+                context,
+                displace_data,
+                export_to_excel,
+                locale,
+                language
+            )
         ),
         CompareKind { kind, left, right } => format!(
             "{}{}{}",
-            stringify(left, context, displace_data, export_to_excel),
+            stringify(
+                left,
+                context,
+                displace_data,
+                export_to_excel,
+                locale,
+                language
+            ),
             kind,
-            stringify(right, context, displace_data, export_to_excel)
+            stringify(
+                right,
+                context,
+                displace_data,
+                export_to_excel,
+                locale,
+                language
+            )
         ),
         OpSumKind { kind, left, right } => {
-            let left_str = stringify(left, context, displace_data, export_to_excel);
+            let left_str = stringify(
+                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(right, context, displace_data, export_to_excel)
+                    stringify(
+                        right,
+                        context,
+                        displace_data,
+                        export_to_excel,
+                        locale,
+                        language
+                    )
                 )
             } else {
-                stringify(right, context, displace_data, export_to_excel)
+                stringify(
+                    right,
+                    context,
+                    displace_data,
+                    export_to_excel,
+                    locale,
+                    language,
+                )
             };
 
             format!("{left_str}{kind}{right_str}")
@@ -503,16 +636,44 @@ fn stringify(
             let x = match **left {
                 OpSumKind { .. } | CompareKind { .. } => format!(
                     "({})",
-                    stringify(left, context, displace_data, export_to_excel)
+                    stringify(
+                        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(right, context, displace_data, export_to_excel)
+                    stringify(
+                        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}")
         }
@@ -528,7 +689,14 @@ fn stringify(
                 | DefinedNameKind(_)
                 | TableNameKind(_)
                 | WrongVariableKind(_)
-                | WrongRangeKind { .. } => stringify(left, context, displace_data, export_to_excel),
+                | WrongRangeKind { .. } => stringify(
+                    left,
+                    context,
+                    displace_data,
+                    export_to_excel,
+                    locale,
+                    language,
+                ),
                 OpRangeKind { .. }
                 | OpConcatenateKind { .. }
                 | OpProductKind { .. }
@@ -543,7 +711,14 @@ fn stringify(
                 | ImplicitIntersection { .. }
                 | EmptyArgKind => format!(
                     "({})",
-                    stringify(left, context, displace_data, export_to_excel)
+                    stringify(
+                        left,
+                        context,
+                        displace_data,
+                        export_to_excel,
+                        locale,
+                        language
+                    )
                 ),
             };
             let y = match **right {
@@ -556,9 +731,14 @@ fn stringify(
                 | DefinedNameKind(_)
                 | TableNameKind(_)
                 | WrongVariableKind(_)
-                | WrongRangeKind { .. } => {
-                    stringify(right, context, displace_data, export_to_excel)
-                }
+                | WrongRangeKind { .. } => stringify(
+                    right,
+                    context,
+                    displace_data,
+                    export_to_excel,
+                    locale,
+                    language,
+                ),
                 OpRangeKind { .. }
                 | OpConcatenateKind { .. }
                 | OpProductKind { .. }
@@ -574,29 +754,56 @@ fn stringify(
                 | ImplicitIntersection { .. }
                 | EmptyArgKind => format!(
                     "({})",
-                    stringify(right, context, displace_data, export_to_excel)
+                    stringify(
+                        right,
+                        context,
+                        displace_data,
+                        export_to_excel,
+                        locale,
+                        language
+                    )
                 ),
             };
             format!("{x}^{y}")
         }
-        InvalidFunctionKind { name, args } => {
-            format_function(name, args, context, displace_data, export_to_excel)
-        }
+        InvalidFunctionKind { name, args } => format_function(
+            &name.to_ascii_lowercase(),
+            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_string()
+                kind.to_localized_name(language)
             };
-            format_function(&name, args, context, displace_data, export_to_excel)
+            format_function(
+                &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(';');
+                    matrix_string.push(row_separator);
                 } else {
                     first_row = false;
                 }
@@ -604,11 +811,11 @@ fn stringify(
                 let mut row_string = String::new();
                 for el in row {
                     if !first_column {
-                        row_string.push(',');
+                        row_string.push(col_separator);
                     } else {
                         first_column = false;
                     }
-                    row_string.push_str(&to_string_array_node(el));
+                    row_string.push_str(&to_string_array_node(el, locale, language));
                 }
                 matrix_string.push_str(&row_string);
             }
@@ -647,19 +854,40 @@ fn stringify(
                 if needs_parentheses {
                     format!(
                         "-({})",
-                        stringify(right, context, displace_data, export_to_excel)
+                        stringify(
+                            right,
+                            context,
+                            displace_data,
+                            export_to_excel,
+                            locale,
+                            language
+                        )
                     )
                 } else {
                     format!(
                         "-{}",
-                        stringify(right, context, displace_data, export_to_excel)
+                        stringify(
+                            right,
+                            context,
+                            displace_data,
+                            export_to_excel,
+                            locale,
+                            language
+                        )
                     )
                 }
             }
             OpUnary::Percentage => {
                 format!(
                     "{}%",
-                    stringify(right, context, displace_data, export_to_excel)
+                    stringify(
+                        right,
+                        context,
+                        displace_data,
+                        export_to_excel,
+                        locale,
+                        language
+                    )
                 )
             }
         },
@@ -680,17 +908,38 @@ fn stringify(
 
                 add_implicit_intersection(&mut new_node, true);
                 if matches!(&new_node, Node::ImplicitIntersection { .. }) {
-                    return stringify(child, context, displace_data, export_to_excel);
+                    return stringify(
+                        child,
+                        context,
+                        displace_data,
+                        export_to_excel,
+                        locale,
+                        language,
+                    );
                 }
 
                 return format!(
                     "_xlfn.SINGLE({})",
-                    stringify(child, context, displace_data, export_to_excel)
+                    stringify(
+                        child,
+                        context,
+                        displace_data,
+                        export_to_excel,
+                        locale,
+                        language
+                    )
                 );
             }
             format!(
                 "@{}",
-                stringify(child, context, displace_data, export_to_excel)
+                stringify(
+                    child,
+                    context,
+                    displace_data,
+                    export_to_excel,
+                    locale,
+                    language
+                )
             )
         }
     }

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

@@ -4,7 +4,10 @@ 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, to_string},
-        Parser,
+        stringify::to_excel_string,
+        tests::utils::{new_parser, to_english_localized_string},
     },
     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 = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(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_string(&t, &cell_reference);
+        let r = to_english_localized_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,14 +2,15 @@
 
 use std::collections::HashMap;
 
-use crate::expressions::parser::stringify::{to_rc_format, to_string};
-use crate::expressions::parser::{ArrayNode, Node, Parser};
+use crate::expressions::parser::stringify::to_rc_format;
+use crate::expressions::parser::tests::utils::{new_parser, to_english_localized_string};
+use crate::expressions::parser::{ArrayNode, Node};
 use crate::expressions::types::CellReferenceRC;
 
 #[test]
 fn simple_horizontal() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -28,13 +29,16 @@ fn simple_horizontal() {
     );
 
     assert_eq!(to_rc_format(&horizontal), "{1,2,3}");
-    assert_eq!(to_string(&horizontal, &cell_reference), "{1,2,3}");
+    assert_eq!(
+        to_english_localized_string(&horizontal, &cell_reference),
+        "{1,2,3}"
+    );
 }
 
 #[test]
 fn simple_vertical() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -52,13 +56,16 @@ fn simple_vertical() {
         ])
     );
     assert_eq!(to_rc_format(&vertical), "{1;2;3}");
-    assert_eq!(to_string(&vertical, &cell_reference), "{1;2;3}");
+    assert_eq!(
+        to_english_localized_string(&vertical, &cell_reference),
+        "{1;2;3}"
+    );
 }
 
 #[test]
 fn simple_matrix() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -88,5 +95,8 @@ fn simple_matrix() {
         ])
     );
     assert_eq!(to_rc_format(&matrix), "{1,2,3;4,5,6;7,8,9}");
-    assert_eq!(to_string(&matrix, &cell_reference), "{1,2,3;4,5,6;7,8,9}");
+    assert_eq!(
+        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, to_string_displaced, DisplaceData,
-};
-use crate::expressions::parser::{Node, Parser};
+use crate::expressions::parser::stringify::{to_rc_format, to_string_displaced, DisplaceData};
+use crate::expressions::parser::Node;
 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 = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(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 = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(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 = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(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 = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(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 = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(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 = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(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 = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(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 = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(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 = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(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 = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(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 = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(worksheets, vec![], HashMap::new());
 
     let formulas = vec![
         Formula {
@@ -266,14 +266,17 @@ fn test_parser_formulas() {
             },
         );
         assert_eq!(to_rc_format(&t), formula.expected);
-        assert_eq!(to_string(&t, &cell_reference), formula.initial);
+        assert_eq!(
+            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 = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(worksheets, vec![], HashMap::new());
     parser.set_lexer_mode(LexerMode::R1C1);
 
     let formulas = vec![
@@ -330,7 +333,10 @@ fn test_parser_r1c1_formulas() {
                 column: 1,
             },
         );
-        assert_eq!(to_string(&t, &cell_reference), formula.expected);
+        assert_eq!(
+            to_english_localized_string(&t, &cell_reference),
+            formula.expected
+        );
         assert_eq!(to_rc_format(&t), formula.initial);
     }
 }
@@ -338,7 +344,7 @@ fn test_parser_r1c1_formulas() {
 #[test]
 fn test_parser_quotes() {
     let worksheets = vec!["Sheet1".to_string(), "Second Sheet".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -354,7 +360,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 = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -370,7 +376,7 @@ fn test_parser_escape_quotes() {
 #[test]
 fn test_parser_parenthesis() {
     let worksheets = vec!["Sheet1".to_string(), "Second2".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -386,7 +392,7 @@ fn test_parser_parenthesis() {
 #[test]
 fn test_parser_excel_xlfn() {
     let worksheets = vec!["Sheet1".to_string(), "Second2".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -407,7 +413,7 @@ fn test_to_string_displaced() {
         column: 1,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(worksheets, vec![], HashMap::new());
 
     let node = parser.parse("C3", context);
     let displace_data = DisplaceData::Column {
@@ -427,7 +433,7 @@ fn test_to_string_displaced_full_ranges() {
         column: 1,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(worksheets, vec![], HashMap::new());
 
     let node = parser.parse("SUM(3:3)", context);
     let displace_data = DisplaceData::Column {
@@ -460,7 +466,7 @@ fn test_to_string_displaced_too_low() {
         column: 1,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(worksheets, vec![], HashMap::new());
 
     let node = parser.parse("C3", context);
     let displace_data = DisplaceData::Column {
@@ -480,7 +486,7 @@ fn test_to_string_displaced_too_high() {
         column: 1,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(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,13 +1,15 @@
 #![allow(clippy::panic)]
 
-use crate::expressions::parser::{Node, Parser};
+use crate::expressions::parser::Node;
 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 = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!B3
     let cell_reference = CellReferenceRC {
@@ -40,7 +42,7 @@ fn simple() {
 #[test]
 fn simple_add() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!B3
     let cell_reference = CellReferenceRC {

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

@@ -2,14 +2,13 @@
 
 use std::collections::HashMap;
 
-use crate::expressions::parser::stringify::to_string;
-use crate::expressions::parser::Parser;
+use crate::expressions::parser::tests::utils::{new_parser, to_english_localized_string};
 use crate::expressions::types::CellReferenceRC;
 
 #[test]
 fn issue_155_parser() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -18,13 +17,13 @@ fn issue_155_parser() {
         column: 2,
     };
     let t = parser.parse("A$1:A2", &cell_reference);
-    assert_eq!(to_string(&t, &cell_reference), "A$1:A2");
+    assert_eq!(to_english_localized_string(&t, &cell_reference), "A$1:A2");
 }
 
 #[test]
 fn issue_155_parser_case_2() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -33,13 +32,13 @@ fn issue_155_parser_case_2() {
         column: 20,
     };
     let t = parser.parse("C$1:D2", &cell_reference);
-    assert_eq!(to_string(&t, &cell_reference), "C$1:D2");
+    assert_eq!(to_english_localized_string(&t, &cell_reference), "C$1:D2");
 }
 
 #[test]
 fn issue_155_parser_only_row() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -49,13 +48,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_string(&t, &cell_reference), "A1:B$2");
+    assert_eq!(to_english_localized_string(&t, &cell_reference), "A1:B$2");
 }
 
 #[test]
 fn issue_155_parser_only_column() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -65,5 +64,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_string(&t, &cell_reference), "$A1:D3");
+    assert_eq!(to_english_localized_string(&t, &cell_reference), "$A1:D3");
 }

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

@@ -2,14 +2,14 @@
 
 use std::collections::HashMap;
 
-use crate::expressions::parser::stringify::to_string;
-use crate::expressions::parser::{Node, Parser};
+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 = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -19,9 +19,12 @@ fn issue_483_parser() {
     };
     let t = parser.parse("-(A1^1.22)", &cell_reference);
     assert!(matches!(t, Node::UnaryKind { .. }));
-    assert_eq!(to_string(&t, &cell_reference), "-(A1^1.22)");
+    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_string(&t, &cell_reference), "-A1^1.22");
+    assert_eq!(to_english_localized_string(&t, &cell_reference), "-A1^1.22");
 }

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

@@ -0,0 +1,58 @@
+#![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

@@ -0,0 +1 @@
+

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

@@ -1,8 +1,17 @@
 use std::collections::HashMap;
 
-use crate::expressions::parser::move_formula::{move_formula, MoveContext};
-use crate::expressions::parser::Parser;
+use crate::expressions::parser::move_formula::{move_formula as mf, MoveContext};
+use crate::expressions::parser::tests::utils::new_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() {
@@ -15,7 +24,7 @@ fn test_move_formula() {
         column,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(worksheets, vec![], HashMap::new());
 
     // Area is C2:F6
     let area = &Area {
@@ -102,7 +111,7 @@ fn test_move_formula_context_offset() {
         column,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(worksheets, vec![], HashMap::new());
 
     // Area is C2:F6
     let area = &Area {
@@ -140,7 +149,7 @@ fn test_move_formula_area_limits() {
         column,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(worksheets, vec![], HashMap::new());
 
     // Area is C2:F6
     let area = &Area {
@@ -195,7 +204,7 @@ fn test_move_formula_ranges() {
         column,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(worksheets, vec![], HashMap::new());
 
     let area = &Area {
         sheet: 0,
@@ -318,7 +327,7 @@ fn test_move_formula_wrong_reference() {
         height: 5,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(worksheets, vec![], HashMap::new());
 
     // Wrong formulas will NOT be displaced
     let node = parser.parse("Sheet3!AB31", context);
@@ -377,7 +386,7 @@ fn test_move_formula_misc() {
         column,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(worksheets, vec![], HashMap::new());
 
     // Area is C2:F6
     let area = &Area {
@@ -445,7 +454,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 = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(worksheets, vec![], HashMap::new());
 
     // Area is C2:F6
     let area = &Area {
@@ -487,7 +496,7 @@ fn move_formula_implicit_intersetion() {
         column,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(worksheets, vec![], HashMap::new());
 
     // Area is C2:F6
     let area = &Area {
@@ -524,7 +533,7 @@ fn move_formula_implicit_intersetion_with_ranges() {
         column,
     };
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(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, to_string};
-use crate::expressions::parser::Parser;
+use crate::expressions::parser::stringify::to_rc_format;
+use crate::expressions::parser::tests::utils::{new_parser, to_english_localized_string};
 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 = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(worksheets, vec![], HashMap::new());
 
     let formulas = vec![
         Formula {
@@ -59,7 +59,10 @@ fn test_parser_formulas_with_full_ranges() {
             },
         );
         assert_eq!(to_rc_format(&t), formula.formula_r1c1);
-        assert_eq!(to_string(&t, &cell_reference), formula.formula_a1);
+        assert_eq!(
+            to_english_localized_string(&t, &cell_reference),
+            formula.formula_a1
+        );
     }
 
     // Now the inverse
@@ -74,14 +77,17 @@ fn test_parser_formulas_with_full_ranges() {
             },
         );
         assert_eq!(to_rc_format(&t), formula.formula_r1c1);
-        assert_eq!(to_string(&t, &cell_reference), formula.formula_a1);
+        assert_eq!(
+            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 = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -96,7 +102,7 @@ fn test_range_inverse_order() {
         &cell_reference,
     );
     assert_eq!(
-        to_string(&t, &cell_reference),
+        to_english_localized_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,14 +2,13 @@
 
 use std::collections::HashMap;
 
-use crate::expressions::parser::stringify::to_string;
-use crate::expressions::parser::Parser;
+use crate::expressions::parser::tests::utils::{new_parser, to_english_localized_string};
 use crate::expressions::types::CellReferenceRC;
 
 #[test]
 fn exp_order() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(worksheets, vec![], HashMap::new());
 
     // Reference cell is Sheet1!A1
     let cell_reference = CellReferenceRC {
@@ -18,25 +17,34 @@ fn exp_order() {
         column: 1,
     };
     let t = parser.parse("(1 + 2)^3  + 4", &cell_reference);
-    assert_eq!(to_string(&t, &cell_reference), "(1+2)^3+4");
+    assert_eq!(
+        to_english_localized_string(&t, &cell_reference),
+        "(1+2)^3+4"
+    );
 
     let t = parser.parse("(C5 + 3)^R4", &cell_reference);
-    assert_eq!(to_string(&t, &cell_reference), "(C5+3)^R4");
+    assert_eq!(
+        to_english_localized_string(&t, &cell_reference),
+        "(C5+3)^R4"
+    );
 
     let t = parser.parse("(C5 + 3)^(R4*6)", &cell_reference);
-    assert_eq!(to_string(&t, &cell_reference), "(C5+3)^(R4*6)");
+    assert_eq!(
+        to_english_localized_string(&t, &cell_reference),
+        "(C5+3)^(R4*6)"
+    );
 
     let t = parser.parse("(C5)^(R4)", &cell_reference);
-    assert_eq!(to_string(&t, &cell_reference), "C5^R4");
+    assert_eq!(to_english_localized_string(&t, &cell_reference), "C5^R4");
 
     let t = parser.parse("(5)^(4)", &cell_reference);
-    assert_eq!(to_string(&t, &cell_reference), "5^4");
+    assert_eq!(to_english_localized_string(&t, &cell_reference), "5^4");
 }
 
 #[test]
 fn correct_parenthesis() {
     let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
+    let mut parser = new_parser(worksheets, vec![], HashMap::new());
 
     let cell_reference = CellReferenceRC {
         sheet: "Sheet1".to_string(),
@@ -45,26 +53,29 @@ fn correct_parenthesis() {
     };
 
     let t = parser.parse("-(1 + 1)", &cell_reference);
-    assert_eq!(to_string(&t, &cell_reference), "-(1+1)");
+    assert_eq!(to_english_localized_string(&t, &cell_reference), "-(1+1)");
 
     let t = parser.parse("1 - (3 + 4)", &cell_reference);
-    assert_eq!(to_string(&t, &cell_reference), "1-(3+4)");
+    assert_eq!(to_english_localized_string(&t, &cell_reference), "1-(3+4)");
 
     let t = parser.parse("-(1.05*(0.0284 + 0.0046) - 0.0284)", &cell_reference);
     assert_eq!(
-        to_string(&t, &cell_reference),
+        to_english_localized_string(&t, &cell_reference),
         "-(1.05*(0.0284+0.0046)-0.0284)"
     );
 
     let t = parser.parse("1 + (3+5)", &cell_reference);
-    assert_eq!(to_string(&t, &cell_reference), "1+3+5");
+    assert_eq!(to_english_localized_string(&t, &cell_reference), "1+3+5");
 
     let t = parser.parse("1 - (3+5)", &cell_reference);
-    assert_eq!(to_string(&t, &cell_reference), "1-(3+5)");
+    assert_eq!(to_english_localized_string(&t, &cell_reference), "1-(3+5)");
 
     let t = parser.parse("(1 - 3) - (3+5)", &cell_reference);
-    assert_eq!(to_string(&t, &cell_reference), "1-3-(3+5)");
+    assert_eq!(
+        to_english_localized_string(&t, &cell_reference),
+        "1-3-(3+5)"
+    );
 
     let t = parser.parse("1 + (3<5)", &cell_reference);
-    assert_eq!(to_string(&t, &cell_reference), "1+(3<5)");
+    assert_eq!(to_english_localized_string(&t, &cell_reference), "1+(3<5)");
 }

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

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

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

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

base/src/formatter/format.rs

@@ -128,6 +128,9 @@ 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,
@@ -145,13 +148,17 @@ 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: format!(
-                        "{}E{}{:02}",
-                        s.trim_end_matches('0').trim_end_matches('.'),
-                        sign,
-                        exponent.abs()
-                    ),
+                    text,
                     color: None,
                     error: None,
                 }
@@ -752,13 +759,15 @@ fn parse_date(value: &str) -> Result<(i32, String), String> {
 pub(crate) fn parse_formatted_number(
     original: &str,
     currencies: &[&str],
+    decimal_separator: u8,
+    group_separator: u8,
 ) -> Result<(f64, Option<String>), String> {
     let value = original.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())?;
+        let (f, options) = parse_number(p.trim(), decimal_separator, group_separator)?;
         if options.is_scientific {
             return Ok((f / 100.0, Some(scientific_format.to_string())));
         }
@@ -774,7 +783,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())?;
+            let (f, options) = parse_number(p.trim(), decimal_separator, group_separator)?;
             if options.is_scientific {
                 return Ok((f, Some(scientific_format.to_string())));
             }
@@ -783,7 +792,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())?;
+            let (f, options) = parse_number(p.trim(), decimal_separator, group_separator)?;
             if options.is_scientific {
                 return Ok((f, Some(scientific_format.to_string())));
             }
@@ -792,7 +801,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())?;
+            let (f, options) = parse_number(p.trim(), decimal_separator, group_separator)?;
             if options.is_scientific {
                 return Ok((f, Some(scientific_format.to_string())));
             }
@@ -811,7 +820,7 @@ pub(crate) fn parse_formatted_number(
     }
 
     // Lastly we check if it is a number
-    let (f, options) = parse_number(value)?;
+    let (f, options) = parse_number(value, decimal_separator, group_separator)?;
     if options.is_scientific {
         return Ok((f, Some(scientific_format.to_string())));
     }
@@ -834,7 +843,11 @@ 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(value: &str) -> Result<(f64, NumberOptions), String> {
+fn parse_number(
+    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();
@@ -842,8 +855,6 @@ fn parse_number(value: &str) -> Result<(f64, NumberOptions), String> {
         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/test/test_general.rs

@@ -1,4 +1,5 @@
 #![allow(clippy::unwrap_used)]
+#![allow(clippy::expect_used)]
 
 use crate::{
     formatter::format::format_number,
@@ -202,3 +203,9 @@ 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,9 +1,13 @@
 #![allow(clippy::unwrap_used)]
 
-use crate::formatter::format::parse_formatted_number as parse;
+use crate::formatter::format::parse_formatted_number;
 
 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/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 Model {
+impl<'a> Model<'a> {
     /// Returns an array with the list of cell values in the range
     pub(crate) fn prepare_array(
         &mut self,

base/src/functions/database.rs

@@ -9,7 +9,7 @@ use crate::{
 
 use super::util::{compare_values, from_wildcard_to_regex, result_matches_regex};
 
-impl Model {
+impl<'a> Model<'a> {
     // =DAVERAGE(database, field, criteria)
     pub(crate) fn fn_daverage(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
         if args.len() != 3 {

base/src/functions/date_and_time.rs

@@ -4,6 +4,7 @@ use chrono::Months;
 use chrono::NaiveDateTime;
 use chrono::NaiveTime;
 use chrono::Timelike;
+use chrono_tz::Tz;
 
 const SECONDS_PER_DAY: i32 = 86_400;
 const SECONDS_PER_DAY_F64: f64 = SECONDS_PER_DAY as f64;
@@ -469,7 +470,7 @@ fn parse_datevalue_text(value: &str) -> Result<i32, String> {
     }
 }
 
-impl Model {
+impl<'a> Model<'a> {
     fn get_date_serial(
         &mut self,
         node: &Node,
@@ -770,12 +771,12 @@ impl Model {
         Ok(values)
     }
 
-    // Returns the current date/time as an Excel serial number in the model's configured timezone.
+    // Returns the current date/time as an Excel serial number in the given timezone.
     // Used by TODAY() and NOW().
-    fn current_excel_serial(&self) -> Option<f64> {
+    pub(crate) fn current_excel_serial_with_timezone(&self, tz: Tz) -> Option<f64> {
         let seconds = get_milliseconds_since_epoch() / 1000;
         DateTime::from_timestamp(seconds, 0).map(|dt| {
-            let local_time = dt.with_timezone(&self.tz);
+            let local_time = dt.with_timezone(&tz);
             let days_from_1900 = local_time.num_days_from_ce() - EXCEL_DATE_BASE;
             let fraction = (local_time.num_seconds_from_midnight() as f64) / (60.0 * 60.0 * 24.0);
             days_from_1900 as f64 + fraction
@@ -978,7 +979,7 @@ impl Model {
                 message: "Wrong number of arguments".to_string(),
             };
         }
-        match self.current_excel_serial() {
+        match self.current_excel_serial_with_timezone(self.tz) {
             Some(serial) => CalcResult::Number(serial.floor()),
             None => CalcResult::Error {
                 error: Error::ERROR,
@@ -989,14 +990,35 @@ impl Model {
     }
 
     pub(crate) fn fn_now(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if !args.is_empty() {
+        if args.len() > 1 {
             return CalcResult::Error {
                 error: Error::ERROR,
                 origin: cell,
                 message: "Wrong number of arguments".to_string(),
             };
         }
-        match self.current_excel_serial() {
+        let tz = match args.first() {
+            Some(arg0) => {
+                // Parse timezone argument
+                let tz_str = match self.get_string(arg0, cell) {
+                    Ok(s) => s,
+                    Err(e) => return e,
+                };
+                let tz: Tz = match tz_str.parse() {
+                    Ok(tz) => tz,
+                    Err(_) => {
+                        return CalcResult::Error {
+                            error: Error::VALUE,
+                            origin: cell,
+                            message: format!("Invalid timezone: {}", &tz_str),
+                        }
+                    }
+                };
+                tz
+            }
+            None => self.tz,
+        };
+        match self.current_excel_serial_with_timezone(tz) {
             Some(serial) => CalcResult::Number(serial),
             None => CalcResult::Error {
                 error: Error::ERROR,

base/src/functions/engineering/bessel.rs

@@ -12,7 +12,7 @@ use super::transcendental::{bessel_i, bessel_j, bessel_k, bessel_y};
 // Notice that the parameters for Bessel functions in Excel and here have inverted order
 // EXCEL_BESSEL(x, n) => bessel(n, x)
 
-impl Model {
+impl<'a> Model<'a> {
     pub(crate) fn fn_besseli(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
         if args.len() != 2 {
             return CalcResult::new_args_number_error(cell);

base/src/functions/engineering/bit_operations.rs

@@ -7,7 +7,7 @@ use crate::{
 // 2^48-1
 const MAX: f64 = 281474976710655.0;
 
-impl Model {
+impl<'a> Model<'a> {
     // 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 Model {
+impl<'a> Model<'a> {
     fn get_complex_number(
         &mut self,
         node: &Node,

base/src/functions/engineering/convert.rs

@@ -41,7 +41,7 @@ fn convert_temperature(
     }
 }
 
-impl Model {
+impl<'a> Model<'a> {
     // 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 Model {
+impl<'a> Model<'a> {
     // 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 Model {
+impl<'a> Model<'a> {
     // BIN2DEC(number)
     pub(crate) fn fn_bin2dec(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
         if args.len() != 1 {

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 Model {
+impl<'a> Model<'a> {
     fn get_array_of_numbers_generic(
         &mut self,
         arg: &Node,

base/src/functions/information.rs

@@ -4,7 +4,7 @@ use crate::{
     model::{Model, ParsedDefinedName},
 };
 
-impl Model {
+impl<'a> Model<'a> {
     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) {
@@ -373,6 +373,8 @@ impl Model {
         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 {

base/src/functions/logical.rs

@@ -6,7 +6,7 @@ use crate::{
 
 use super::util::compare_values;
 
-impl Model {
+impl<'a> Model<'a> {
     pub(crate) fn fn_true(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
         if args.is_empty() {
             CalcResult::Boolean(true)

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 Model {
+impl<'a> Model<'a> {
     pub(crate) fn fn_index(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
         let row_num;
         let col_num;
@@ -698,7 +698,7 @@ impl Model {
                 let parsed_reference = ParsedReference::parse_reference_formula(
                     Some(cell.sheet),
                     &s,
-                    &self.locale,
+                    self.locale,
                     |name| self.get_sheet_index_by_name(name),
                 );
 
@@ -839,6 +839,10 @@ impl Model {
         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);
@@ -860,7 +864,7 @@ impl Model {
                     message: "argument must be a reference to a single cell".to_string(),
                 };
             }
-            if let Ok(Some(f)) = self.get_cell_formula(left.sheet, left.row, left.column) {
+            if let Ok(Some(f)) = self.get_english_cell_formula(left.sheet, left.row, left.column) {
                 CalcResult::String(f)
             } else {
                 CalcResult::Error {

base/src/functions/mathematical.rs

@@ -1,9 +1,9 @@
 use crate::cast::NumberOrArray;
-use crate::constants::{LAST_COLUMN, LAST_ROW};
+use crate::constants::{EXCEL_PRECISION, LAST_COLUMN, LAST_ROW};
 use crate::expressions::parser::ArrayNode;
 use crate::expressions::types::CellReferenceIndex;
 use crate::functions::math_util::{from_roman, to_roman_with_form};
-use crate::number_format::to_precision;
+use crate::number_format::{to_excel_precision, to_precision};
 use crate::single_number_fn;
 use crate::{
     calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
@@ -47,7 +47,7 @@ pub fn random() -> f64 {
     Math::random()
 }
 
-impl Model {
+impl<'a> Model<'a> {
     pub(crate) fn fn_min(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
         let mut result = f64::NAN;
         for arg in args {
@@ -984,7 +984,9 @@ impl Model {
             };
         }
 
-        let result = f64::floor(value / significance) * significance;
+        // Apply Excel precision to the ratio to handle floating-point rounding errors
+        let ratio = to_excel_precision(value / significance, EXCEL_PRECISION);
+        let result = f64::floor(ratio) * significance;
         CalcResult::Number(result)
     }
 
@@ -1022,7 +1024,7 @@ impl Model {
         cell: CellReferenceIndex,
     ) -> CalcResult {
         let arg_count = args.len();
-        if arg_count > 3 {
+        if !(1..=3).contains(&arg_count) {
             return CalcResult::new_args_number_error(cell);
         }
         let value = match self.get_number(&args[0], cell) {
@@ -1063,7 +1065,7 @@ impl Model {
         cell: CellReferenceIndex,
     ) -> CalcResult {
         let arg_count = args.len();
-        if arg_count > 2 {
+        if !(1..=2).contains(&arg_count) {
             return CalcResult::new_args_number_error(cell);
         }
         let value = match self.get_number(&args[0], cell) {
@@ -1093,7 +1095,7 @@ impl Model {
 
     pub(crate) fn fn_floor_math(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
         let arg_count = args.len();
-        if arg_count > 3 {
+        if !(1..=3).contains(&arg_count) {
             return CalcResult::new_args_number_error(cell);
         }
         let value = match self.get_number(&args[0], cell) {
@@ -1121,10 +1123,14 @@ impl Model {
         }
         let significance = significance.abs();
         if value < 0.0 && mode != 0.0 {
-            let result = f64::ceil(value / significance) * significance;
+            // Apply Excel precision to handle floating-point rounding errors
+            let ratio = to_excel_precision(value / significance, EXCEL_PRECISION);
+            let result = f64::ceil(ratio) * significance;
             CalcResult::Number(result)
         } else {
-            let result = f64::floor(value / significance) * significance;
+            // Apply Excel precision to handle floating-point rounding errors
+            let ratio = to_excel_precision(value / significance, EXCEL_PRECISION);
+            let result = f64::floor(ratio) * significance;
             CalcResult::Number(result)
         }
     }
@@ -1135,7 +1141,7 @@ impl Model {
         cell: CellReferenceIndex,
     ) -> CalcResult {
         let arg_count = args.len();
-        if arg_count > 2 {
+        if !(1..=2).contains(&arg_count) {
             return CalcResult::new_args_number_error(cell);
         }
         let value = match self.get_number(&args[0], cell) {
@@ -1154,7 +1160,9 @@ impl Model {
             return CalcResult::Number(0.0);
         }
 
-        let result = f64::floor(value / significance) * significance;
+        // Apply Excel precision to handle floating-point rounding errors
+        let ratio = to_excel_precision(value / significance, EXCEL_PRECISION);
+        let result = f64::floor(ratio) * significance;
         CalcResult::Number(result)
     }
 
@@ -1209,7 +1217,7 @@ impl Model {
     }
 
     pub(crate) fn fn_trunc(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-        if args.len() > 2 {
+        if !(1..=2).contains(&args.len()) {
             return CalcResult::new_args_number_error(cell);
         }
         let value = match self.get_number(&args[0], cell) {

base/src/functions/mathematical_sum.rs

@@ -0,0 +1,230 @@
+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

@@ -1,733 +0,0 @@
-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.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)
-    }
-
-    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

@@ -0,0 +1,213 @@
+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

@@ -0,0 +1,311 @@
+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

@@ -0,0 +1,397 @@
+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

@@ -0,0 +1,227 @@
+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

@@ -0,0 +1,264 @@
+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

@@ -0,0 +1,135 @@
+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

@@ -0,0 +1,54 @@
+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

@@ -0,0 +1,418 @@
+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

@@ -0,0 +1,194 @@
+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

@@ -0,0 +1,39 @@
+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

@@ -0,0 +1,87 @@
+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

@@ -0,0 +1,108 @@
+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

@@ -0,0 +1,337 @@
+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

@@ -0,0 +1,124 @@
+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

@@ -0,0 +1,26 @@
+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

@@ -0,0 +1,325 @@
+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

@@ -0,0 +1,113 @@
+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

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,94 @@
+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

@@ -0,0 +1,202 @@
+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)
+    }
+}

base/src/functions/statistical/standard_dev.rs

@@ -0,0 +1,519 @@
+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> {
+    pub(crate) fn fn_stdev_p(&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;
+
+        #[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,
+                                _ => {
+                                    // ignore non-numeric
+                                }
+                            }
+                        }
+                    }
+                }
+                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(),
+                                    }
+                                }
+                                _ => {
+                                    // ignore non-numeric
+                                }
+                            }
+                        }
+                    }
+                }
+                error @ CalcResult::Error { .. } => return error,
+                _ => {
+                    // ignore non-numeric
+                }
+            }
+        }
+
+        if count == 0 {
+            return CalcResult::new_error(
+                Error::DIV,
+                cell,
+                "STDEV.P with no numeric data".to_string(),
+            );
+        }
+
+        let n = count as f64;
+        let mut var = (sumsq - (sum * sum) / n) / n;
+
+        // clamp tiny negatives from FP noise
+        if var < 0.0 && var > -1e-12 {
+            var = 0.0;
+        }
+
+        CalcResult::Number(var.sqrt())
+    }
+
+    pub(crate) fn fn_stdev_s(&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;
+
+        #[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,
+                                _ => {
+                                    // ignore non-numeric
+                                }
+                            }
+                        }
+                    }
+                }
+                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(),
+                                    }
+                                }
+                                _ => {
+                                    // ignore non-numeric
+                                }
+                            }
+                        }
+                    }
+                }
+                error @ CalcResult::Error { .. } => return error,
+                _ => {
+                    // ignore non-numeric
+                }
+            }
+        }
+
+        if count <= 1 {
+            return CalcResult::new_error(
+                Error::DIV,
+                cell,
+                "STDEV.S requires at least two numeric values".to_string(),
+            );
+        }
+
+        let n = count as f64;
+        let mut var = (sumsq - (sum * sum) / n) / (n - 1.0);
+
+        if var < 0.0 && var > -1e-12 {
+            var = 0.0;
+        }
+
+        CalcResult::Number(var.sqrt())
+    }
+
+    pub(crate) fn fn_stdeva(&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;
+
+        #[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);
+                                }
+                                CalcResult::String(_) => {
+                                    accumulate(&mut sum, &mut sumsq, &mut count, 0.0);
+                                }
+                                CalcResult::Boolean(value) => {
+                                    let val = if value { 1.0 } else { 0.0 };
+                                    accumulate(&mut sum, &mut sumsq, &mut count, val);
+                                }
+                                error @ CalcResult::Error { .. } => return error,
+                                _ => {
+                                    // ignore non-numeric for now
+                                }
+                            }
+                        }
+                    }
+                }
+                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(),
+                                    }
+                                }
+                                _ => {
+                                    // ignore non-numeric for now
+                                }
+                            }
+                        }
+                    }
+                }
+                error @ CalcResult::Error { .. } => return error,
+                _ => {
+                    // ignore non-numeric for now
+                }
+            }
+        }
+
+        if count <= 1 {
+            return CalcResult::new_error(
+                Error::DIV,
+                cell,
+                "STDEVA requires at least two numeric values".to_string(),
+            );
+        }
+
+        let n = count as f64;
+        let mut var = (sumsq - (sum * sum) / n) / (n - 1.0);
+
+        if var < 0.0 && var > -1e-12 {
+            var = 0.0;
+        }
+
+        CalcResult::Number(var.sqrt())
+    }
+
+    pub(crate) fn fn_stdevpa(&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;
+
+        #[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);
+                                }
+                                CalcResult::String(_) => {
+                                    accumulate(&mut sum, &mut sumsq, &mut count, 0.0);
+                                }
+                                CalcResult::Boolean(value) => {
+                                    let val = if value { 1.0 } else { 0.0 };
+                                    accumulate(&mut sum, &mut sumsq, &mut count, val);
+                                }
+                                error @ CalcResult::Error { .. } => return error,
+                                _ => {
+                                    // ignore non-numeric for now
+                                }
+                            }
+                        }
+                    }
+                }
+                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(),
+                                    }
+                                }
+                                _ => {
+                                    // ignore non-numeric for now
+                                }
+                            }
+                        }
+                    }
+                }
+                error @ CalcResult::Error { .. } => return error,
+                _ => {
+                    // ignore non-numeric for now
+                }
+            }
+        }
+
+        if count == 0 {
+            return CalcResult::new_error(
+                Error::DIV,
+                cell,
+                "STDEVPA with no numeric data".to_string(),
+            );
+        }
+
+        let n = count as f64;
+        let mut var = (sumsq - (sum * sum) / n) / n;
+
+        if var < 0.0 && var > -1e-12 {
+            var = 0.0;
+        }
+
+        CalcResult::Number(var.sqrt())
+    }
+}

base/src/functions/statistical/standardize.rs

@@ -0,0 +1,38 @@
+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_standardize(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        // STANDARDIZE(x, mean, standard_dev)
+        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 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 std_dev <= 0.0 {
+            return CalcResult::Error {
+                error: Error::NUM,
+                origin: cell,
+                message: "standard_dev must be > 0 in STANDARDIZE".to_string(),
+            };
+        }
+
+        let z = (x - mean) / std_dev;
+
+        CalcResult::Number(z)
+    }
+}

base/src/functions/statistical/t_dist.rs

@@ -0,0 +1,588 @@
+use statrs::distribution::{Continuous, ContinuousCDF, StudentsT};
+
+use crate::expressions::types::CellReferenceIndex;
+use crate::{
+    calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
+};
+
+fn mean(xs: &[f64]) -> f64 {
+    let n = xs.len();
+    if n == 0 {
+        return 0.0;
+    }
+    let mut s = 0.0;
+    for &x in xs {
+        s += x;
+    }
+    s / (n as f64)
+}
+
+pub(crate) fn sample_var(xs: &[f64]) -> f64 {
+    let n = xs.len();
+    if n < 2 {
+        return 0.0;
+    }
+    let m = mean(xs);
+    let mut s = 0.0;
+    for &x in xs {
+        let d = x - m;
+        s += d * d;
+    }
+    s / ((n - 1) as f64)
+}
+
+enum TTestType {
+    Paired,
+    TwoSampleEqualVar,
+    TwoSampleUnequalVar,
+}
+
+enum TTestTails {
+    OneTailed,
+    TwoTailed,
+}
+
+impl<'a> Model<'a> {
+    // T.DIST(x, deg_freedom, cumulative)
+    pub(crate) fn fn_t_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 df < 1.0 {
+            return CalcResult::Error {
+                error: Error::NUM,
+                origin: cell,
+                message: "deg_freedom must be >= 1 in T.DIST".to_string(),
+            };
+        }
+
+        let dist = match StudentsT::new(0.0, 1.0, df) {
+            Ok(d) => d,
+            Err(_) => {
+                return CalcResult::Error {
+                    error: Error::NUM,
+                    origin: cell,
+                    message: "Invalid parameters for T.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 T.DIST".to_string(),
+            };
+        }
+
+        CalcResult::Number(result)
+    }
+
+    // T.DIST.2T(x, deg_freedom)
+    pub(crate) fn fn_t_dist_2t(&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 = match self.get_number_no_bools(&args[1], cell) {
+            Ok(f) => f.trunc(),
+            Err(e) => return e,
+        };
+
+        if x < 0.0 {
+            return CalcResult::Error {
+                error: Error::NUM,
+                origin: cell,
+                message: "x must be >= 0 in T.DIST.2T".to_string(),
+            };
+        }
+
+        if df < 1.0 {
+            return CalcResult::Error {
+                error: Error::NUM,
+                origin: cell,
+                message: "deg_freedom must be >= 1 in T.DIST.2T".to_string(),
+            };
+        }
+
+        let dist = match StudentsT::new(0.0, 1.0, df) {
+            Ok(d) => d,
+            Err(_) => {
+                return CalcResult::Error {
+                    error: Error::NUM,
+                    origin: cell,
+                    message: "Invalid parameters for T.DIST.2T".to_string(),
+                }
+            }
+        };
+
+        let upper_tail = 1.0 - dist.cdf(x);
+        let mut result = 2.0 * upper_tail;
+
+        result = result.clamp(0.0, 1.0);
+
+        if !result.is_finite() {
+            return CalcResult::Error {
+                error: Error::NUM,
+                origin: cell,
+                message: "Invalid result for T.DIST.2T".to_string(),
+            };
+        }
+
+        CalcResult::Number(result)
+    }
+
+    // T.DIST.RT(x, deg_freedom)
+    pub(crate) fn fn_t_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 = match self.get_number_no_bools(&args[1], cell) {
+            Ok(f) => f.trunc(),
+            Err(e) => return e,
+        };
+
+        if df < 1.0 {
+            return CalcResult::Error {
+                error: Error::NUM,
+                origin: cell,
+                message: "deg_freedom must be >= 1 in T.DIST.RT".to_string(),
+            };
+        }
+
+        let dist = match StudentsT::new(0.0, 1.0, df) {
+            Ok(d) => d,
+            Err(_) => {
+                return CalcResult::Error {
+                    error: Error::NUM,
+                    origin: cell,
+                    message: "Invalid parameters for T.DIST.RT".to_string(),
+                }
+            }
+        };
+
+        let result = 1.0 - dist.cdf(x);
+
+        if !result.is_finite() || result < 0.0 {
+            return CalcResult::Error {
+                error: Error::NUM,
+                origin: cell,
+                message: "Invalid result for T.DIST.RT".to_string(),
+            };
+        }
+
+        CalcResult::Number(result)
+    }
+
+    // T.INV(probability, deg_freedom)
+    pub(crate) fn fn_t_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 p <= 0.0 || p >= 1.0 || df < 1.0 {
+            return CalcResult::Error {
+                error: Error::NUM,
+                origin: cell,
+                message: "Invalid parameters for T.INV".to_string(),
+            };
+        }
+
+        let dist = match StudentsT::new(0.0, 1.0, df) {
+            Ok(d) => d,
+            Err(_) => {
+                return CalcResult::Error {
+                    error: Error::NUM,
+                    origin: cell,
+                    message: "Invalid parameters for T.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 T.INV".to_string(),
+            };
+        }
+
+        CalcResult::Number(x)
+    }
+
+    // T.INV.2T(probability, deg_freedom)
+    pub(crate) fn fn_t_inv_2t(&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 p <= 0.0 || p > 1.0 || df < 1.0 {
+            return CalcResult::Error {
+                error: Error::NUM,
+                origin: cell,
+                message: "Invalid parameters for T.INV.2T".to_string(),
+            };
+        }
+
+        let dist = match StudentsT::new(0.0, 1.0, df) {
+            Ok(d) => d,
+            Err(_) => {
+                return CalcResult::Error {
+                    error: Error::NUM,
+                    origin: cell,
+                    message: "Invalid parameters for T.INV.2T".to_string(),
+                }
+            }
+        };
+
+        // Two-sided: F(x) = 1 - p/2
+        let target_cdf = 1.0 - p / 2.0;
+        let x = dist.inverse_cdf(target_cdf);
+
+        if !x.is_finite() {
+            return CalcResult::Error {
+                error: Error::NUM,
+                origin: cell,
+                message: "Invalid result for T.INV.2T".to_string(),
+            };
+        }
+
+        CalcResult::Number(x.abs())
+    }
+
+    // T.TEST(array1, array2, tails, type)
+    pub(crate) fn fn_t_test(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        if args.len() != 4 {
+            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(),
+                );
+            }
+        };
+
+        let tails = match self.get_number(&args[2], cell) {
+            Ok(f) => {
+                let tf = f.trunc();
+                if tf == 1.0 {
+                    TTestTails::OneTailed
+                } else if tf == 2.0 {
+                    TTestTails::TwoTailed
+                } else {
+                    return CalcResult::new_error(
+                        Error::NUM,
+                        cell,
+                        "tails must be 1 or 2".to_string(),
+                    );
+                }
+            }
+            Err(e) => return e,
+        };
+        let test_type = match self.get_number(&args[3], cell) {
+            Ok(f) => {
+                let tf = f.trunc();
+                match tf {
+                    1.0 => TTestType::Paired,
+                    2.0 => TTestType::TwoSampleEqualVar,
+                    3.0 => TTestType::TwoSampleUnequalVar,
+                    _ => {
+                        return CalcResult::new_error(
+                            Error::NUM,
+                            cell,
+                            "type must be 1, 2, or 3".to_string(),
+                        );
+                    }
+                }
+            }
+            Err(e) => return e,
+        };
+
+        let (values1, values2): (Vec<f64>, Vec<f64>) = if matches!(test_type, TTestType::Paired) {
+            values1_opts
+                .into_iter()
+                .zip(values2_opts)
+                .filter_map(|(o1, o2)| match (o1, o2) {
+                    (Some(v1), Some(v2)) => Some((v1, v2)),
+                    _ => None, // skip if either is None
+                })
+                .unzip()
+        } else {
+            // keep only numeric entries, ignore non-numeric (Option::None)
+            let v1: Vec<f64> = values1_opts.into_iter().flatten().collect();
+            let v2: Vec<f64> = values2_opts.into_iter().flatten().collect();
+            (v1, v2)
+        };
+
+        let n1 = values1.len();
+        let n2 = values2.len();
+
+        if n1 == 0 || n2 == 0 {
+            return CalcResult::new_error(
+                Error::DIV,
+                cell,
+                "T.TEST requires non-empty samples".to_string(),
+            );
+        }
+
+        let (t_stat, df) = match test_type {
+            TTestType::Paired => {
+                if n1 != n2 {
+                    return CalcResult::new_error(
+                        Error::NA,
+                        cell,
+                        "For paired T.TEST, both samples must have the same length".to_string(),
+                    );
+                }
+                if n1 < 2 {
+                    return CalcResult::new_error(
+                        Error::DIV,
+                        cell,
+                        "Paired T.TEST requires at least two pairs".to_string(),
+                    );
+                }
+
+                let mut diffs = Vec::with_capacity(n1);
+                for i in 0..n1 {
+                    diffs.push(values1[i] - values2[i]);
+                }
+
+                let nd = diffs.len();
+                let md = mean(&diffs);
+                let vd = sample_var(&diffs);
+                if vd <= 0.0 {
+                    return CalcResult::new_error(
+                        Error::DIV,
+                        cell,
+                        "Zero variance in paired T.TEST".to_string(),
+                    );
+                }
+                let sd = vd.sqrt();
+                let t_stat = md / (sd / (nd as f64).sqrt());
+                let df = (nd - 1) as f64;
+                (t_stat, df)
+            }
+
+            // 2: two-sample, equal variance (homoscedastic)
+            TTestType::TwoSampleEqualVar => {
+                if n1 < 2 || n2 < 2 {
+                    return CalcResult::new_error(
+                        Error::DIV,
+                        cell,
+                        "Two-sample T.TEST type 2 requires at least two values in each sample"
+                            .to_string(),
+                    );
+                }
+
+                let m1 = mean(&values1);
+                let m2 = mean(&values2);
+                let v1 = sample_var(&values1);
+                let v2 = sample_var(&values2);
+
+                let df_i = (n1 + n2 - 2) as i32;
+                if df_i <= 0 {
+                    return CalcResult::new_error(
+                        Error::DIV,
+                        cell,
+                        "Degrees of freedom must be positive in T.TEST type 2".to_string(),
+                    );
+                }
+                let df = df_i as f64;
+
+                let sp2 = (((n1 - 1) as f64) * v1 + ((n2 - 1) as f64) * v2) / df; // pooled variance
+
+                if sp2 <= 0.0 {
+                    return CalcResult::new_error(
+                        Error::DIV,
+                        cell,
+                        "Zero pooled variance in T.TEST type 2".to_string(),
+                    );
+                }
+
+                let denom = (sp2 * (1.0 / (n1 as f64) + 1.0 / (n2 as f64))).sqrt();
+                if denom == 0.0 {
+                    return CalcResult::new_error(
+                        Error::DIV,
+                        cell,
+                        "Zero denominator in T.TEST type 2".to_string(),
+                    );
+                }
+
+                let t_stat = (m1 - m2) / denom;
+                (t_stat, df)
+            }
+
+            // two-sample, unequal variance (Welch)
+            TTestType::TwoSampleUnequalVar => {
+                if n1 < 2 || n2 < 2 {
+                    return CalcResult::new_error(
+                        Error::DIV,
+                        cell,
+                        "Two-sample T.TEST type 3 requires at least two values in each sample"
+                            .to_string(),
+                    );
+                }
+
+                let m1 = mean(&values1);
+                let m2 = mean(&values2);
+                let v1 = sample_var(&values1);
+                let v2 = sample_var(&values2);
+
+                let s1n = v1 / (n1 as f64);
+                let s2n = v2 / (n2 as f64);
+                let denom = (s1n + s2n).sqrt();
+                if denom == 0.0 {
+                    return CalcResult::new_error(
+                        Error::DIV,
+                        cell,
+                        "Zero denominator in T.TEST type 3".to_string(),
+                    );
+                }
+
+                let t_stat = (m1 - m2) / denom;
+
+                let num_df = (s1n + s2n).powi(2);
+                let den_df = (s1n * s1n) / ((n1 - 1) as f64) + (s2n * s2n) / ((n2 - 1) as f64);
+                if den_df == 0.0 {
+                    return CalcResult::new_error(
+                        Error::DIV,
+                        cell,
+                        "Invalid degrees of freedom in T.TEST type 3".to_string(),
+                    );
+                }
+                let df = num_df / den_df;
+                (t_stat, df)
+            }
+        };
+
+        if df <= 0.0 {
+            return CalcResult::new_error(
+                Error::DIV,
+                cell,
+                "Degrees of freedom must be positive in T.TEST".to_string(),
+            );
+        }
+
+        let dist = match StudentsT::new(0.0, 1.0, df) {
+            Ok(d) => d,
+            Err(_) => {
+                return CalcResult::new_error(
+                    Error::NUM,
+                    cell,
+                    "Invalid parameters for Student's t distribution".to_string(),
+                );
+            }
+        };
+
+        let t_abs = t_stat.abs();
+        let cdf = dist.cdf(t_abs);
+
+        let mut p = match tails {
+            TTestTails::OneTailed => 1.0 - cdf,
+            TTestTails::TwoTailed => 2.0 * (1.0 - cdf),
+        };
+
+        // 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/variance.rs

@@ -0,0 +1,518 @@
+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> {
+    pub(crate) fn fn_var_p(&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;
+
+        #[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,
+                                _ => {
+                                    // ignore non-numeric
+                                }
+                            }
+                        }
+                    }
+                }
+                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(),
+                                    }
+                                }
+                                _ => {
+                                    // ignore non-numeric
+                                }
+                            }
+                        }
+                    }
+                }
+                error @ CalcResult::Error { .. } => return error,
+                _ => {
+                    // ignore non-numeric
+                }
+            }
+        }
+
+        if count == 0 {
+            return CalcResult::new_error(
+                Error::DIV,
+                cell,
+                "VAR.P with no numeric data".to_string(),
+            );
+        }
+
+        let n = count as f64;
+        let mut var = (sumsq - (sum * sum) / n) / n;
+
+        if var < 0.0 && var > -1e-12 {
+            var = 0.0;
+        }
+
+        CalcResult::Number(var)
+    }
+
+    pub(crate) fn fn_var_s(&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;
+
+        #[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,
+                                _ => {
+                                    // ignore non-numeric
+                                }
+                            }
+                        }
+                    }
+                }
+                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(),
+                                    }
+                                }
+                                _ => {
+                                    // ignore non-numeric
+                                }
+                            }
+                        }
+                    }
+                }
+                error @ CalcResult::Error { .. } => return error,
+                _ => {
+                    // ignore non-numeric
+                }
+            }
+        }
+
+        if count <= 1 {
+            return CalcResult::new_error(
+                Error::DIV,
+                cell,
+                "VAR.S requires at least two numeric values".to_string(),
+            );
+        }
+
+        let n = count as f64;
+        let mut var = (sumsq - (sum * sum) / n) / (n - 1.0);
+
+        if var < 0.0 && var > -1e-12 {
+            var = 0.0;
+        }
+
+        CalcResult::Number(var)
+    }
+
+    pub(crate) fn fn_vara(&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;
+
+        #[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 {
+                        for column in column1..=column2 {
+                            match self.evaluate_cell(CellReferenceIndex {
+                                sheet: left.sheet,
+                                row,
+                                column,
+                            }) {
+                                CalcResult::Number(value) => {
+                                    accumulate(&mut sum, &mut sumsq, &mut count, value);
+                                }
+                                CalcResult::String(_) => {
+                                    accumulate(&mut sum, &mut sumsq, &mut count, 0.0);
+                                }
+                                CalcResult::Boolean(value) => {
+                                    let val = if value { 1.0 } else { 0.0 };
+                                    accumulate(&mut sum, &mut sumsq, &mut count, val);
+                                }
+                                error @ CalcResult::Error { .. } => return error,
+                                _ => {
+                                    // ignore non-numeric for now (A semantics to be added)
+                                }
+                            }
+                        }
+                    }
+                }
+                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(),
+                                    }
+                                }
+                                _ => {
+                                    // ignore non-numeric for now (A semantics to be added)
+                                }
+                            }
+                        }
+                    }
+                }
+                error @ CalcResult::Error { .. } => return error,
+                _ => {
+                    // ignore non-numeric for now (A semantics to be added)
+                }
+            }
+        }
+
+        if count <= 1 {
+            return CalcResult::new_error(
+                Error::DIV,
+                cell,
+                "VARA requires at least two numeric values".to_string(),
+            );
+        }
+
+        let n = count as f64;
+        let mut var = (sumsq - (sum * sum) / n) / (n - 1.0);
+
+        if var < 0.0 && var > -1e-12 {
+            var = 0.0;
+        }
+
+        CalcResult::Number(var)
+    }
+
+    pub(crate) fn fn_varpa(&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;
+
+        #[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);
+                                }
+                                CalcResult::String(_) => {
+                                    accumulate(&mut sum, &mut sumsq, &mut count, 0.0);
+                                }
+                                CalcResult::Boolean(value) => {
+                                    let val = if value { 1.0 } else { 0.0 };
+                                    accumulate(&mut sum, &mut sumsq, &mut count, val);
+                                }
+                                error @ CalcResult::Error { .. } => return error,
+                                _ => {
+                                    // ignore non-numeric for now
+                                }
+                            }
+                        }
+                    }
+                }
+                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(),
+                                    }
+                                }
+                                _ => {
+                                    // ignore non-numeric for now
+                                }
+                            }
+                        }
+                    }
+                }
+                error @ CalcResult::Error { .. } => return error,
+                _ => {
+                    // ignore non-numeric for now
+                }
+            }
+        }
+
+        if count == 0 {
+            return CalcResult::new_error(
+                Error::DIV,
+                cell,
+                "VARPA with no numeric data".to_string(),
+            );
+        }
+
+        let n = count as f64;
+        let mut var = (sumsq - (sum * sum) / n) / n;
+
+        if var < 0.0 && var > -1e-12 {
+            var = 0.0;
+        }
+
+        CalcResult::Number(var)
+    }
+}

base/src/functions/statistical/weibull.rs

@@ -0,0 +1,71 @@
+use statrs::distribution::{Continuous, ContinuousCDF, Weibull};
+
+use crate::expressions::types::CellReferenceIndex;
+use crate::{
+    calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
+};
+
+impl<'a> Model<'a> {
+    // WEIBULL.DIST(x, alpha, beta, cumulative)
+    pub(crate) fn fn_weibull_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 alpha = match self.get_number_no_bools(&args[1], cell) {
+            Ok(f) => f,
+            Err(e) => return e,
+        };
+
+        let beta = 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 || alpha <= 0.0 || beta <= 0.0 {
+            return CalcResult::Error {
+                error: Error::NUM,
+                origin: cell,
+                message: "Invalid parameters for WEIBULL.DIST".to_string(),
+            };
+        }
+
+        // statrs::Weibull: shape = k (alpha), scale = lambda (beta)
+        let dist = match Weibull::new(alpha, beta) {
+            Ok(d) => d,
+            Err(_) => {
+                return CalcResult::Error {
+                    error: Error::NUM,
+                    origin: cell,
+                    message: "Invalid parameters for WEIBULL.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 WEIBULL.DIST".to_string(),
+            };
+        }
+
+        CalcResult::Number(result)
+    }
+}

base/src/functions/statistical/z_test.rs

@@ -0,0 +1,171 @@
+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> {
+    // Z.TEST(array, x, [sigma])
+    pub(crate) fn fn_z_test(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        // 2 or 3 arguments
+        if args.len() < 2 || args.len() > 3 {
+            return CalcResult::new_args_number_error(cell);
+        }
+
+        let array_arg = self.evaluate_node_in_context(&args[0], cell);
+
+        // Flatten first argument into Vec<Option<f64>> (numeric / non-numeric)
+        let values = match array_arg {
+            CalcResult::Range { left, right } => match self.values_from_range(left, right) {
+                Ok(v) => v,
+                Err(error) => return error,
+            },
+            CalcResult::Array(array) => match self.values_from_array(array) {
+                Ok(v) => v,
+                Err(error) => {
+                    return CalcResult::new_error(
+                        Error::VALUE,
+                        cell,
+                        format!("Error in array argument: {:?}", error),
+                    );
+                }
+            },
+            CalcResult::Number(v) => vec![Some(v)],
+            error @ CalcResult::Error { .. } => return error,
+            _ => {
+                return CalcResult::new_error(
+                    Error::VALUE,
+                    cell,
+                    "Z.TEST first argument must be a range or array".to_string(),
+                );
+            }
+        };
+
+        // Collect basic stats on numeric entries
+        let mut sum = 0.0;
+        let mut count: u64 = 0;
+
+        for x in values.iter().flatten() {
+            sum += x;
+            count += 1;
+        }
+
+        // Excel: if array has no numeric values -> #N/A
+        if count == 0 {
+            return CalcResult::new_error(
+                Error::NA,
+                cell,
+                "Z.TEST array has no numeric data".to_string(),
+            );
+        }
+
+        let n = count as f64;
+        let mean = sum / n;
+
+        // x argument (hypothesized population mean)
+        let x_value = match self.evaluate_node_in_context(&args[1], cell) {
+            CalcResult::Number(v) => v,
+            error @ CalcResult::Error { .. } => return error,
+            _ => {
+                return CalcResult::new_error(
+                    Error::VALUE,
+                    cell,
+                    "Z.TEST second argument (x) must be numeric".to_string(),
+                );
+            }
+        };
+
+        // Optional sigma
+        let mut sigma: Option<f64> = None;
+        if args.len() == 3 {
+            match self.evaluate_node_in_context(&args[2], cell) {
+                CalcResult::Number(v) => {
+                    if v == 0.0 {
+                        return CalcResult::new_error(
+                            Error::NUM,
+                            cell,
+                            "Z.TEST sigma cannot be zero".to_string(),
+                        );
+                    }
+                    sigma = Some(v);
+                }
+                error @ CalcResult::Error { .. } => return error,
+                _ => {
+                    return CalcResult::new_error(
+                        Error::VALUE,
+                        cell,
+                        "Z.TEST sigma (third argument) must be numeric".to_string(),
+                    );
+                }
+            }
+        }
+
+        // If sigma omitted, use sample standard deviation STDEV(array)
+        let sigma_value = if let Some(s) = sigma {
+            s
+        } else {
+            // Excel: if only one numeric value and sigma omitted -> #DIV/0!
+            if count <= 1 {
+                return CalcResult::new_error(
+                    Error::DIV,
+                    cell,
+                    "Z.TEST requires at least two values when sigma is omitted".to_string(),
+                );
+            }
+
+            // Compute sum of squared deviations
+            let mut sumsq_dev = 0.0;
+            for x in values.iter().flatten() {
+                let d = x - mean;
+                sumsq_dev += d * d;
+            }
+
+            let var = sumsq_dev / (n - 1.0);
+            if var <= 0.0 {
+                return CalcResult::new_error(
+                    Error::DIV,
+                    cell,
+                    "Z.TEST standard deviation is zero".to_string(),
+                );
+            }
+
+            var.sqrt()
+        };
+
+        // Compute z statistic: (mean - x) / (sigma / sqrt(n))
+        let denom = sigma_value / n.sqrt();
+        if denom == 0.0 {
+            return CalcResult::new_error(
+                Error::DIV,
+                cell,
+                "Z.TEST denominator is zero".to_string(),
+            );
+        }
+
+        let z = (mean - x_value) / denom;
+
+        // Standard normal CDF
+        let dist = match Normal::new(0.0, 1.0) {
+            Ok(d) => d,
+            Err(_) => {
+                return CalcResult::new_error(
+                    Error::NUM,
+                    cell,
+                    "Cannot create standard normal distribution in Z.TEST".to_string(),
+                );
+            }
+        };
+
+        let mut p = 1.0 - dist.cdf(z);
+
+        // 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/subtotal.rs

@@ -32,7 +32,7 @@ pub enum CellTableStatus {
     Filtered,
 }
 
-impl Model {
+impl<'a> Model<'a> {
     fn get_table_for_cell(&self, sheet_index: u32, row: i32, column: i32) -> bool {
         let worksheet = match self.workbook.worksheet(sheet_index) {
             Ok(ws) => ws,

base/src/functions/text.rs

@@ -50,7 +50,7 @@ fn search(search_for: &str, text: &str, start: usize) -> Option<i32> {
     None
 }
 
-impl Model {
+impl<'a> Model<'a> {
     pub(crate) fn fn_concat(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
         let mut result = "".to_string();
         for arg in args {
@@ -149,7 +149,7 @@ impl Model {
                 Ok(s) => s,
                 Err(s) => return s,
             };
-            let d = format_number(value, &format_code, &self.locale);
+            let d = format_number(value, &format_code, self.locale);
             if let Some(_e) = d.error {
                 return CalcResult::Error {
                     error: Error::VALUE,
@@ -1210,7 +1210,15 @@ impl Model {
         match self.evaluate_node_in_context(&args[0], cell) {
             CalcResult::String(text) => {
                 let currencies = vec!["$", "€"];
-                if let Ok((value, _)) = parse_formatted_number(&text, &currencies) {
+                let (decimal_separator, group_separator) =
+                    if self.locale.numbers.symbols.decimal == "," {
+                        (b',', b'.')
+                    } else {
+                        (b'.', b',')
+                    };
+                if let Ok((value, _)) =
+                    parse_formatted_number(&text, &currencies, decimal_separator, group_separator)
+                {
                     return CalcResult::Number(value);
                 };
                 CalcResult::Error {

base/src/functions/xlookup.rs

@@ -118,7 +118,7 @@ fn linear_search(
     None
 }
 
-impl Model {
+impl<'a> Model<'a> {
     /// The XLOOKUP function searches a range or an array, and then returns the item corresponding
     /// to the first match it finds. If no match exists, then XLOOKUP can return the closest (approximate) match.
     /// =XLOOKUP(lookup_value, lookup_array, return_array, [if_not_found], [match_mode], [search_mode])

base/src/language/mod.rs

@@ -2,13 +2,13 @@ use std::{collections::HashMap, sync::OnceLock};
 
 use bitcode::{Decode, Encode};
 
-#[derive(Encode, Decode, Clone)]
+#[derive(Encode, Decode)]
 pub struct Booleans {
     pub r#true: String,
     pub r#false: String,
 }
 
-#[derive(Encode, Decode, Clone)]
+#[derive(Encode, Decode)]
 pub struct Errors {
     pub r#ref: String,
     pub name: String,
@@ -24,10 +24,367 @@ pub struct Errors {
     pub null: String,
 }
 
-#[derive(Encode, Decode, Clone)]
+#[derive(Encode, Decode)]
+pub struct Functions {
+    pub and: String,
+    pub r#false: String,
+    pub r#if: String,
+    pub iferror: String,
+    pub ifna: String,
+    pub ifs: String,
+    pub not: String,
+    pub or: String,
+    pub switch: String,
+    pub r#true: String,
+    pub xor: String,
+    pub log: String,
+    pub log10: String,
+    pub ln: String,
+    pub sin: String,
+    pub cos: String,
+    pub tan: String,
+    pub asin: String,
+    pub acos: String,
+    pub atan: String,
+    pub sinh: String,
+    pub cosh: String,
+    pub tanh: String,
+    pub asinh: String,
+    pub acosh: String,
+    pub atanh: String,
+    pub acot: String,
+    pub acoth: String,
+    pub cot: String,
+    pub coth: String,
+    pub csc: String,
+    pub csch: String,
+    pub sec: String,
+    pub sech: String,
+    pub abs: String,
+    pub pi: String,
+    pub sqrt: String,
+    pub sqrtpi: String,
+    pub atan2: String,
+    pub power: String,
+    pub max: String,
+    pub min: String,
+    pub product: String,
+    pub rand: String,
+    pub randbetween: String,
+    pub round: String,
+    pub rounddown: String,
+    pub roundup: String,
+    pub sum: String,
+    pub sumif: String,
+    pub sumifs: String,
+    pub choose: String,
+    pub column: String,
+    pub columns: String,
+    pub index: String,
+    pub indirect: String,
+    pub hlookup: String,
+    pub lookup: String,
+    pub r#match: String,
+    pub offset: String,
+    pub row: String,
+    pub rows: String,
+    pub vlookup: String,
+    pub xlookup: String,
+    pub concatenate: String,
+    pub exact: String,
+    pub value: String,
+    pub t: String,
+    pub valuetotext: String,
+    pub concat: String,
+    pub find: String,
+    pub left: String,
+    pub len: String,
+    pub lower: String,
+    pub mid: String,
+    pub right: String,
+    pub search: String,
+    pub text: String,
+    pub trim: String,
+    pub unicode: String,
+    pub upper: String,
+    pub isnumber: String,
+    pub isnontext: String,
+    pub istext: String,
+    pub islogical: String,
+    pub isblank: String,
+    pub iserr: String,
+    pub iserror: String,
+    pub isna: String,
+    pub na: String,
+    pub isref: String,
+    pub isodd: String,
+    pub iseven: String,
+    pub errortype: String,
+    pub formulatext: String,
+    pub isformula: String,
+    pub r#type: String,
+    pub sheet: String,
+    pub average: String,
+    pub averagea: String,
+    pub avedev: String,
+    pub averageif: String,
+    pub averageifs: String,
+    pub count: String,
+    pub counta: String,
+    pub countblank: String,
+    pub countif: String,
+    pub countifs: String,
+    pub maxifs: String,
+    pub minifs: String,
+    pub geomean: String,
+    pub year: String,
+    pub day: String,
+    pub month: String,
+    pub eomonth: String,
+    pub date: String,
+    pub datedif: String,
+    pub datevalue: String,
+    pub edate: String,
+    pub networkdays: String,
+    pub networkdaysintl: String,
+    pub time: String,
+    pub timevalue: String,
+    pub hour: String,
+    pub minute: String,
+    pub second: String,
+    pub today: String,
+    pub now: String,
+    pub days: String,
+    pub days360: String,
+    pub weekday: String,
+    pub weeknum: String,
+    pub workday: String,
+    pub workdayintl: String,
+    pub yearfrac: String,
+    pub isoweeknum: String,
+    pub pmt: String,
+    pub pv: String,
+    pub rate: String,
+    pub nper: String,
+    pub fv: String,
+    pub ppmt: String,
+    pub ipmt: String,
+    pub npv: String,
+    pub mirr: String,
+    pub irr: String,
+    pub xirr: String,
+    pub xnpv: String,
+    pub rept: String,
+    pub textafter: String,
+    pub textbefore: String,
+    pub textjoin: String,
+    pub substitute: String,
+    pub ispmt: String,
+    pub rri: String,
+    pub sln: String,
+    pub syd: String,
+    pub nominal: String,
+    pub effect: String,
+    pub pduration: String,
+    pub tbillyield: String,
+    pub tbillprice: String,
+    pub tbilleq: String,
+    pub dollarde: String,
+    pub dollarfr: String,
+    pub ddb: String,
+    pub db: String,
+    pub cumprinc: String,
+    pub cumipmt: String,
+    pub besseli: String,
+    pub besselj: String,
+    pub besselk: String,
+    pub bessely: String,
+    pub erf: String,
+    pub erfprecise: String,
+    pub erfc: String,
+    pub erfcprecise: String,
+    pub bin2dec: String,
+    pub bin2hex: String,
+    pub bin2oct: String,
+    pub dec2bin: String,
+    pub dec2hex: String,
+    pub dec2oct: String,
+    pub hex2bin: String,
+    pub hex2dec: String,
+    pub hex2oct: String,
+    pub oct2bin: String,
+    pub oct2dec: String,
+    pub oct2hex: String,
+    pub bitand: String,
+    pub bitlshift: String,
+    pub bitor: String,
+    pub bitrshift: String,
+    pub bitxor: String,
+    pub complex: String,
+    pub imabs: String,
+    pub imaginary: String,
+    pub imargument: String,
+    pub imconjugate: String,
+    pub imcos: String,
+    pub imcosh: String,
+    pub imcot: String,
+    pub imcsc: String,
+    pub imcsch: String,
+    pub imdiv: String,
+    pub imexp: String,
+    pub imln: String,
+    pub imlog10: String,
+    pub imlog2: String,
+    pub impower: String,
+    pub improduct: String,
+    pub imreal: String,
+    pub imsec: String,
+    pub imsech: String,
+    pub imsin: String,
+    pub imsinh: String,
+    pub imsqrt: String,
+    pub imsub: String,
+    pub imsum: String,
+    pub imtan: String,
+    pub convert: String,
+    pub delta: String,
+    pub gestep: String,
+    pub subtotal: String,
+    pub exp: String,
+    pub fact: String,
+    pub factdouble: String,
+    pub sign: String,
+    pub radians: String,
+    pub degrees: String,
+    pub int: String,
+    pub even: String,
+    pub odd: String,
+    pub ceiling: String,
+    pub ceilingmath: String,
+    pub ceilingprecise: String,
+    pub floor: String,
+    pub floormath: String,
+    pub floorprecise: String,
+    pub isoceiling: String,
+    pub r#mod: String,
+    pub quotient: String,
+    pub mround: String,
+    pub trunc: String,
+    pub gcd: String,
+    pub lcm: String,
+    pub base: String,
+    pub decimal: String,
+    pub roman: String,
+    pub arabic: String,
+    pub combin: String,
+    pub combina: String,
+    pub sumsq: String,
+    pub n: String,
+    pub cell: String,
+    pub info: String,
+    pub sheets: String,
+    pub daverage: String,
+    pub dcount: String,
+    pub dget: String,
+    pub dmax: String,
+    pub dmin: String,
+    pub dsum: String,
+    pub dcounta: String,
+    pub dproduct: String,
+    pub dstdev: String,
+    pub dvar: String,
+    pub dvarp: String,
+    pub dstdevp: String,
+    pub betadist: String,
+    pub betainv: String,
+    pub binomdist: String,
+    pub binomdistrange: String,
+    pub binominv: String,
+    pub chisqdist: String,
+    pub chisqdistrt: String,
+    pub chisqinv: String,
+    pub chisqinvrt: String,
+    pub chisqtest: String,
+    pub confidencenorm: String,
+    pub confidencet: String,
+    pub covariancep: String,
+    pub covariances: String,
+    pub devsq: String,
+    pub expondist: String,
+    pub fdist: String,
+    pub fdistrt: String,
+    pub finv: String,
+    pub finvrt: String,
+    pub fisher: String,
+    pub fisherinv: String,
+    pub ftest: String,
+    pub gamma: String,
+    pub gammadist: String,
+    pub gammainv: String,
+    pub gammaln: String,
+    pub gammalnprecise: String,
+    pub hypgeomdist: String,
+    pub lognormdist: String,
+    pub lognorminv: String,
+    pub negbinomdist: String,
+    pub normdist: String,
+    pub norminv: String,
+    pub normsdist: String,
+    pub normsinv: String,
+    pub pearson: String,
+    pub phi: String,
+    pub poissondist: String,
+    pub standardize: String,
+    pub stdevp: String,
+    pub stdevs: String,
+    pub stdeva: String,
+    pub stdevpa: String,
+    pub tdist: String,
+    pub tdist2t: String,
+    pub tdistrt: String,
+    pub tinv: String,
+    pub tinv2t: String,
+    pub ttest: String,
+    pub varp: String,
+    pub vars: String,
+    pub varpa: String,
+    pub vara: String,
+    pub weibulldist: String,
+    pub ztest: String,
+    pub sumx2my2: String,
+    pub sumx2py2: String,
+    pub sumxmy2: String,
+    pub correl: String,
+    pub rsq: String,
+    pub intercept: String,
+    pub slope: String,
+    pub steyx: String,
+    pub gauss: String,
+    pub harmean: String,
+    pub kurt: String,
+    pub large: String,
+    pub maxa: String,
+    pub median: String,
+    pub mina: String,
+    pub rankavg: String,
+    pub rankeq: String,
+    pub skew: String,
+    pub skewp: String,
+    pub small: String,
+}
+
+#[derive(Encode, Decode)]
 pub struct Language {
+    pub name: String,
+    pub code: String,
     pub booleans: Booleans,
     pub errors: Errors,
+    pub functions: Functions,
+}
+
+pub fn get_default_language() -> &'static Language {
+    #[allow(clippy::unwrap_used)]
+    get_language("en").unwrap()
 }
 
 static LANGUAGES: OnceLock<HashMap<String, Language>> = OnceLock::new();
@@ -39,7 +396,7 @@ fn get_languages() -> &'static HashMap<String, Language> {
     })
 }
 
-pub fn get_language(id: &str) -> Result<&Language, String> {
+pub fn get_language(id: &str) -> Result<&'static Language, String> {
     get_languages()
         .get(id)
         .ok_or_else(|| format!("Language is not supported: '{id}'"))

base/src/lib.rs

@@ -57,8 +57,10 @@ mod test;
 #[cfg(test)]
 pub mod mock_time;
 
+pub use locale::get_supported_locales;
 pub use model::get_milliseconds_since_epoch;
 pub use model::Model;
 pub use user_model::BorderArea;
 pub use user_model::ClipboardData;
 pub use user_model::UserModel;
+pub use utils::get_all_timezones;

base/src/locale/mod.rs

@@ -2,36 +2,39 @@ use std::{collections::HashMap, sync::OnceLock};
 
 use bitcode::{Decode, Encode};
 
-#[derive(Encode, Decode, Clone)]
+#[derive(Encode, Decode)]
 pub struct Locale {
     pub dates: Dates,
     pub numbers: NumbersProperties,
     pub currency: Currency,
 }
 
-#[derive(Encode, Decode, Clone)]
+#[derive(Encode, Decode)]
 pub struct Currency {
     pub iso: String,
     pub symbol: String,
 }
 
-#[derive(Encode, Decode, Clone)]
+#[derive(Encode, Decode)]
 pub struct NumbersProperties {
     pub symbols: NumbersSymbols,
     pub decimal_formats: DecimalFormats,
     pub currency_formats: CurrencyFormats,
 }
 
-#[derive(Encode, Decode, Clone)]
+#[derive(Encode, Decode)]
 pub struct Dates {
     pub day_names: Vec<String>,
     pub day_names_short: Vec<String>,
     pub months: Vec<String>,
     pub months_short: Vec<String>,
     pub months_letter: Vec<String>,
+    pub date_formats: DateFormats,
+    pub time_formats: DateFormats,
+    pub date_time_formats: DateFormats,
 }
 
-#[derive(Encode, Decode, Clone)]
+#[derive(Encode, Decode)]
 pub struct NumbersSymbols {
     pub decimal: String,
     pub group: String,
@@ -49,7 +52,7 @@ pub struct NumbersSymbols {
 }
 
 // See: https://cldr.unicode.org/translation/number-currency-formats/number-and-currency-patterns
-#[derive(Encode, Decode, Clone)]
+#[derive(Encode, Decode)]
 pub struct CurrencyFormats {
     pub standard: String,
     pub standard_alpha_next_to_number: Option<String>,
@@ -59,11 +62,32 @@ pub struct CurrencyFormats {
     pub accounting_no_currency: String,
 }
 
-#[derive(Encode, Decode, Clone)]
+#[derive(Encode, Decode)]
 pub struct DecimalFormats {
     pub standard: String,
 }
 
+#[derive(Encode, Decode)]
+pub struct DateFormats {
+    pub full: String,
+    pub long: String,
+    pub medium: String,
+    pub short: String,
+}
+
+#[derive(Encode, Decode)]
+pub struct TimeFormats {
+    pub full: String,
+    pub long: String,
+    pub medium: String,
+    pub short: String,
+}
+
+pub fn get_default_locale() -> &'static Locale {
+    #[allow(clippy::unwrap_used)]
+    get_locale("en").unwrap()
+}
+
 static LOCALES: OnceLock<HashMap<String, Locale>> = OnceLock::new();
 
 #[allow(clippy::expect_used)]
@@ -73,7 +97,12 @@ fn get_locales() -> &'static HashMap<String, Locale> {
     })
 }
 
-pub fn get_locale(id: &str) -> Result<&Locale, String> {
+/// Get all available locale IDs.
+pub fn get_supported_locales() -> Vec<String> {
+    get_locales().keys().cloned().collect()
+}
+
+pub fn get_locale(id: &str) -> Result<&'static Locale, String> {
     get_locales()
         .get(id)
         .ok_or_else(|| format!("Invalid locale: '{id}'"))

base/src/model.rs

@@ -11,7 +11,7 @@ use crate::{
         lexer::LexerMode,
         parser::{
             move_formula::{move_formula, MoveContext},
-            stringify::{rename_defined_name_in_node, to_rc_format, to_string},
+            stringify::{rename_defined_name_in_node, to_localized_string, to_rc_format},
             Node, Parser,
         },
         token::{get_error_by_name, Error, OpCompare, OpProduct, OpSum, OpUnary},
@@ -24,8 +24,8 @@ use crate::{
     },
     functions::util::compare_values,
     implicit_intersection::implicit_intersection,
-    language::{get_language, Language},
-    locale::{get_locale, Currency, Locale},
+    language::{get_default_language, get_language, Language},
+    locale::{get_locale, Locale},
     types::*,
     utils as common,
 };
@@ -95,7 +95,7 @@ pub(crate) enum ParsedDefinedName {
 /// * A list of cells with its status (evaluating, evaluated, not evaluated)
 /// * A dictionary with the shared strings and their indices.
 ///   This is an optimization for large files (~1 million rows)
-pub struct Model {
+pub struct Model<'a> {
     /// A Rust internal representation of an Excel workbook
     pub workbook: Workbook,
     /// A list of parsed formulas
@@ -105,13 +105,13 @@ pub struct Model {
     /// An optimization to lookup strings faster
     pub(crate) shared_strings: HashMap<String, usize>,
     /// An instance of the parser
-    pub(crate) parser: Parser,
+    pub(crate) parser: Parser<'a>,
     /// The list of cells with formulas that are evaluated or being evaluated
     pub(crate) cells: HashMap<(u32, i32, i32), CellState>,
     /// The locale of the model
-    pub(crate) locale: Locale,
+    pub(crate) locale: &'a Locale,
     /// The language used
-    pub(crate) language: Language,
+    pub(crate) language: &'a Language,
     /// The timezone used to evaluate the model
     pub(crate) tz: Tz,
     /// The view id. A view consists of a selected sheet and ranges.
@@ -129,7 +129,7 @@ pub struct CellIndex {
     pub column: i32,
 }
 
-impl Model {
+impl<'a> Model<'a> {
     pub(crate) fn evaluate_node_with_reference(
         &mut self,
         node: &Node,
@@ -375,7 +375,7 @@ impl Model {
             }
             FunctionKind { kind, args } => self.evaluate_function(kind, args, cell),
             InvalidFunctionKind { name, args: _ } => {
-                CalcResult::new_error(Error::ERROR, cell, format!("Invalid function: {name}"))
+                CalcResult::new_error(Error::NAME, cell, format!("Invalid function: {name}"))
             }
             ArrayKind(s) => CalcResult::Array(s.to_owned()),
             DefinedNameKind((name, scope, _)) => {
@@ -680,7 +680,7 @@ impl Model {
     /// ```rust
     /// # use ironcalc_base::Model;
     /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
-    /// let mut model = Model::new_empty("model", "en", "UTC")?;
+    /// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
     /// assert_eq!(model.workbook.worksheet(0)?.color, None);
     /// model.set_sheet_color(0, "#DBBE29")?;
     /// assert_eq!(model.workbook.worksheet(0)?.color, Some("#DBBE29".to_string()));
@@ -721,7 +721,7 @@ impl Model {
             BooleanCell { v, .. } => CalcResult::Boolean(*v),
             NumberCell { v, .. } => CalcResult::Number(*v),
             ErrorCell { ei, .. } => {
-                let message = ei.to_localized_error_string(&self.language);
+                let message = ei.to_localized_error_string(self.language);
                 CalcResult::new_error(ei.clone(), cell_reference, message)
             }
             SharedString { si, .. } => {
@@ -747,7 +747,7 @@ impl Model {
                     CalcResult::Error {
                         error: ei.clone(),
                         origin: cell_reference,
-                        message: ei.to_localized_error_string(&self.language),
+                        message: ei.to_localized_error_string(self.language),
                     }
                 }
             }
@@ -761,7 +761,7 @@ impl Model {
     /// ```rust
     /// # use ironcalc_base::Model;
     /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
-    /// let mut model = Model::new_empty("model", "en", "UTC")?;
+    /// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
     /// assert_eq!(model.is_empty_cell(0, 1, 1)?, true);
     /// model.set_user_input(0, 1, 1, "Attention is all you need".to_string());
     /// assert_eq!(model.is_empty_cell(0, 1, 1)?, false);
@@ -839,9 +839,9 @@ impl Model {
     /// # use ironcalc_base::Model;
     /// # use ironcalc_base::cell::CellValue;
     /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
-    /// let mut model = Model::new_empty("model", "en", "UTC")?;
+    /// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
     /// model.set_user_input(0, 1, 1, "Stella!".to_string());
-    /// let model2 = Model::from_bytes(&model.to_bytes())?;
+    /// let model2 = Model::from_bytes(&model.to_bytes(), "en")?;
     /// assert_eq!(
     ///     model2.get_cell_value_by_index(0, 1, 1),
     ///     Ok(CellValue::String("Stella!".to_string()))
@@ -852,10 +852,10 @@ impl Model {
     ///
     /// See also:
     /// * [Model::to_bytes]
-    pub fn from_bytes(s: &[u8]) -> Result<Model, String> {
+    pub fn from_bytes(s: &[u8], language_id: &'a str) -> Result<Model<'a>, String> {
         let workbook: Workbook =
             bitcode::decode(s).map_err(|e| format!("Error parsing workbook: {e}"))?;
-        Model::from_workbook(workbook)
+        Model::from_workbook(workbook, language_id)
     }
 
     /// Returns a model from a Workbook object
@@ -866,9 +866,9 @@ impl Model {
     /// # use ironcalc_base::Model;
     /// # use ironcalc_base::cell::CellValue;
     /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
-    /// let mut model = Model::new_empty("model", "en", "UTC")?;
+    /// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
     /// model.set_user_input(0, 1, 1, "Stella!".to_string());
-    /// let model2 = Model::from_workbook(model.workbook)?;
+    /// let model2 = Model::from_workbook(model.workbook, "en")?;
     /// assert_eq!(
     ///     model2.get_cell_value_by_index(0, 1, 1),
     ///     Ok(CellValue::String("Stella!".to_string()))
@@ -876,7 +876,7 @@ impl Model {
     /// # Ok(())
     /// # }
     /// ```
-    pub fn from_workbook(workbook: Workbook) -> Result<Model, String> {
+    pub fn from_workbook(workbook: Workbook, language_id: &str) -> Result<Model<'_>, String> {
         let parsed_formulas = Vec::new();
         let worksheets = &workbook.worksheets;
 
@@ -892,20 +892,27 @@ impl Model {
         //     }
         //     tables.push(tables_in_sheet);
         // }
-        let parser = Parser::new(worksheet_names, defined_names, workbook.tables.clone());
+
         let cells = HashMap::new();
-        let locale = get_locale(&workbook.settings.locale)
-            .map_err(|_| "Invalid locale".to_string())?
-            .clone();
+        let locale =
+            get_locale(&workbook.settings.locale).map_err(|_| "Invalid locale".to_string())?;
         let tz: Tz = workbook
             .settings
             .tz
             .parse()
             .map_err(|_| format!("Invalid timezone: {}", workbook.settings.tz))?;
 
-        // FIXME: Add support for display languages
-        #[allow(clippy::expect_used)]
-        let language = get_language("en").expect("").clone();
+        let language = match get_language(language_id) {
+            Ok(lang) => lang,
+            Err(_) => return Err("Invalid language".to_string()),
+        };
+        let parser = Parser::new(
+            worksheet_names,
+            defined_names,
+            workbook.tables.clone(),
+            locale,
+            language,
+        );
         let mut shared_strings = HashMap::new();
         for (index, s) in workbook.shared_strings.iter().enumerate() {
             shared_strings.insert(s.to_string(), index);
@@ -938,7 +945,7 @@ impl Model {
     /// # use ironcalc_base::Model;
     /// # use ironcalc_base::expressions::types::CellReferenceIndex;
     /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
-    /// let mut model = Model::new_empty("model", "en", "UTC")?;
+    /// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
     /// model.set_user_input(0, 1, 1, "Stella!".to_string());
     /// let reference = model.parse_reference("Sheet1!D40");
     /// assert_eq!(reference, Some(CellReferenceIndex {sheet: 0, row: 40, column: 4}));
@@ -1004,7 +1011,7 @@ impl Model {
     /// # use ironcalc_base::Model;
     /// # use ironcalc_base::expressions::types::{Area, CellReferenceIndex};
     /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
-    /// let mut model = Model::new_empty("model", "en", "UTC")?;
+    /// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
     /// let source = CellReferenceIndex { sheet: 0, row: 3, column: 1};
     /// let target = CellReferenceIndex { sheet: 0, row: 50, column: 1};
     /// let area = Area { sheet: 0, row: 1, column: 1, width: 5, height: 4};
@@ -1060,6 +1067,8 @@ impl Model {
                     row_delta: target.row - source.row,
                     column_delta: target.column - source.column,
                 },
+                self.locale,
+                self.language,
             );
             Ok(format!("={formula_str}"))
         } else {
@@ -1074,7 +1083,7 @@ impl Model {
     /// ```rust
     /// # use ironcalc_base::Model;
     /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
-    /// let mut model = Model::new_empty("model", "en", "UTC")?;
+    /// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
     /// let (sheet, row, column) = (0, 1, 1);
     /// model.set_user_input(sheet, row, column, "=B1*D4".to_string());
     /// let (target_row, target_column) = (30, 1);
@@ -1098,7 +1107,7 @@ impl Model {
         let cell = self.workbook.worksheet(sheet)?.cell(row, column);
         let result = match cell {
             Some(cell) => match cell.get_formula() {
-                None => cell.get_text(&self.workbook.shared_strings, &self.language),
+                None => cell.get_localized_text(&self.workbook.shared_strings, self.language),
                 Some(i) => {
                     let formula = &self.parsed_formulas[sheet as usize][i as usize];
                     let cell_ref = CellReferenceRC {
@@ -1106,7 +1115,10 @@ impl Model {
                         row: target_row,
                         column: target_column,
                     };
-                    format!("={}", to_string(formula, &cell_ref))
+                    format!(
+                        "={}",
+                        to_localized_string(formula, &cell_ref, self.locale, self.language)
+                    )
                 }
             },
             None => "".to_string(),
@@ -1122,7 +1134,7 @@ impl Model {
     /// # use ironcalc_base::Model;
     /// # use ironcalc_base::expressions::types::CellReferenceIndex;
     /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
-    /// let mut model = Model::new_empty("model", "en", "UTC")?;
+    /// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
     /// let source = CellReferenceIndex {sheet: 0, row: 1, column: 1};
     /// let target = CellReferenceIndex {sheet: 0, row: 30, column: 1};
     /// let result = model.extend_copied_value("=B1*D4", &source, &target)?;
@@ -1164,7 +1176,10 @@ impl Model {
                 row: target.row,
                 column: target.column,
             };
-            return Ok(format!("={}", to_string(formula, &cell_reference)));
+            return Ok(format!(
+                "={}",
+                to_localized_string(formula, &cell_reference, self.locale, self.language)
+            ));
         };
         Ok(value.to_string())
     }
@@ -1176,7 +1191,7 @@ impl Model {
     /// ```rust
     /// # use ironcalc_base::Model;
     /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
-    /// let mut model = Model::new_empty("model", "en", "UTC")?;
+    /// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
     /// let (sheet, row, column) = (0, 1, 1);
     /// model.set_user_input(sheet, row, column, "=SIN(B1*C3)+1".to_string());
     /// model.evaluate();
@@ -1187,7 +1202,7 @@ impl Model {
     /// ```
     ///
     /// See also:
-    /// * [Model::get_cell_content()]
+    /// * [Model::get_localized_cell_content()]
     pub fn get_cell_formula(
         &self,
         sheet: u32,
@@ -1209,7 +1224,47 @@ impl Model {
                         row,
                         column,
                     };
-                    Ok(Some(format!("={}", to_string(formula, &cell_ref))))
+                    Ok(Some(format!(
+                        "={}",
+                        to_localized_string(formula, &cell_ref, self.locale, self.language)
+                    )))
+                }
+                None => Ok(None),
+            },
+            None => Ok(None),
+        }
+    }
+
+    /// Returns the text for the formula in (`sheet`, `row`, `column`) in English if any
+    ///
+    /// See also:
+    /// * [Model::get_localized_cell_content()]
+    pub(crate) fn get_english_cell_formula(
+        &self,
+        sheet: u32,
+        row: i32,
+        column: i32,
+    ) -> Result<Option<String>, String> {
+        let worksheet = self.workbook.worksheet(sheet)?;
+        match worksheet.cell(row, column) {
+            Some(cell) => match cell.get_formula() {
+                Some(formula_index) => {
+                    let formula = &self
+                        .parsed_formulas
+                        .get(sheet as usize)
+                        .ok_or("missing sheet")?
+                        .get(formula_index as usize)
+                        .ok_or("missing formula")?;
+                    let cell_ref = CellReferenceRC {
+                        sheet: worksheet.get_name(),
+                        row,
+                        column,
+                    };
+                    let language_en = get_default_language();
+                    Ok(Some(format!(
+                        "={}",
+                        to_localized_string(formula, &cell_ref, self.locale, language_en)
+                    )))
                 }
                 None => Ok(None),
             },
@@ -1225,13 +1280,13 @@ impl Model {
     /// ```rust
     /// # use ironcalc_base::Model;
     /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
-    /// let mut model = Model::new_empty("model", "en", "UTC")?;
+    /// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
     /// let (sheet, row, column) = (0, 1, 1);
     /// model.set_user_input(sheet, row, column, "Hello!".to_string())?;
-    /// assert_eq!(model.get_cell_content(sheet, row, column)?, "Hello!".to_string());
+    /// assert_eq!(model.get_localized_cell_content(sheet, row, column)?, "Hello!".to_string());
     ///
     /// model.update_cell_with_text(sheet, row, column, "Goodbye!")?;
-    /// assert_eq!(model.get_cell_content(sheet, row, column)?, "Goodbye!".to_string());
+    /// assert_eq!(model.get_localized_cell_content(sheet, row, column)?, "Goodbye!".to_string());
     /// # Ok(())
     /// # }
     /// ```
@@ -1250,7 +1305,7 @@ impl Model {
     ) -> Result<(), String> {
         let style_index = self.get_cell_style_index(sheet, row, column)?;
         let new_style_index;
-        if common::value_needs_quoting(value, &self.language) {
+        if common::value_needs_quoting(value, self.language) {
             new_style_index = self
                 .workbook
                 .styles
@@ -1275,13 +1330,13 @@ impl Model {
     /// ```rust
     /// # use ironcalc_base::Model;
     /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
-    /// let mut model = Model::new_empty("model", "en", "UTC")?;
+    /// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
     /// let (sheet, row, column) = (0, 1, 1);
     /// model.set_user_input(sheet, row, column, "TRUE".to_string())?;
-    /// assert_eq!(model.get_cell_content(sheet, row, column)?, "TRUE".to_string());
+    /// assert_eq!(model.get_localized_cell_content(sheet, row, column)?, "TRUE".to_string());
     ///
     /// model.update_cell_with_bool(sheet, row, column, false)?;
-    /// assert_eq!(model.get_cell_content(sheet, row, column)?, "FALSE".to_string());
+    /// assert_eq!(model.get_localized_cell_content(sheet, row, column)?, "FALSE".to_string());
     /// # Ok(())
     /// # }
     /// ```
@@ -1317,13 +1372,13 @@ impl Model {
     /// ```rust
     /// # use ironcalc_base::Model;
     /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
-    /// let mut model = Model::new_empty("model", "en", "UTC")?;
+    /// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
     /// let (sheet, row, column) = (0, 1, 1);
     /// model.set_user_input(sheet, row, column, "42".to_string())?;
-    /// assert_eq!(model.get_cell_content(sheet, row, column)?, "42".to_string());
+    /// assert_eq!(model.get_localized_cell_content(sheet, row, column)?, "42".to_string());
     ///
     /// model.update_cell_with_number(sheet, row, column, 23.0)?;
-    /// assert_eq!(model.get_cell_content(sheet, row, column)?, "23".to_string());
+    /// assert_eq!(model.get_localized_cell_content(sheet, row, column)?, "23".to_string());
     /// # Ok(())
     /// # }
     /// ```
@@ -1360,15 +1415,15 @@ impl Model {
     /// ```rust
     /// # use ironcalc_base::Model;
     /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
-    /// let mut model = Model::new_empty("model", "en", "UTC")?;
+    /// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
     /// let (sheet, row, column) = (0, 1, 1);
     /// model.set_user_input(sheet, row, column, "=A2*2".to_string())?;
     /// model.evaluate();
-    /// assert_eq!(model.get_cell_content(sheet, row, column)?, "=A2*2".to_string());
+    /// assert_eq!(model.get_localized_cell_content(sheet, row, column)?, "=A2*2".to_string());
     ///
     /// model.update_cell_with_formula(sheet, row, column, "=A3*2".to_string())?;
     /// model.evaluate();
-    /// assert_eq!(model.get_cell_content(sheet, row, column)?, "=A3*2".to_string());
+    /// assert_eq!(model.get_localized_cell_content(sheet, row, column)?, "=A3*2".to_string());
     /// # Ok(())
     /// # }
     /// ```
@@ -1413,7 +1468,7 @@ impl Model {
     /// # use ironcalc_base::Model;
     /// # use ironcalc_base::cell::CellValue;
     /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
-    /// let mut model = Model::new_empty("model", "en", "UTC")?;
+    /// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
     /// model.set_user_input(0, 1, 1, "100$".to_string());
     /// model.set_user_input(0, 2, 1, "125$".to_string());
     /// model.set_user_input(0, 3, 1, "-10$".to_string());
@@ -1441,7 +1496,7 @@ impl Model {
         let style_index = self.get_cell_style_index(sheet, row, column)?;
         if let Some(new_value) = value.strip_prefix('\'') {
             // First check if it needs quoting
-            let new_style = if common::value_needs_quoting(new_value, &self.language) {
+            let new_style = if common::value_needs_quoting(new_value, self.language) {
                 self.workbook
                     .styles
                     .get_style_with_quote_prefix(style_index)?
@@ -1478,8 +1533,16 @@ impl Model {
                 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',')
+                    };
                 //  We try to parse as number
-                if let Ok((v, number_format)) = parse_formatted_number(&value, &currencies) {
+                if let Ok((v, number_format)) =
+                    parse_formatted_number(&value, &currencies, decimal_separator, group_separator)
+                {
                     if let Some(num_fmt) = number_format {
                         // Should not apply the format in the following cases:
                         // - we assign a date to already date-formatted cell
@@ -1506,7 +1569,7 @@ impl Model {
                 // Check is it is error value
                 let upper = value.to_uppercase();
                 let worksheet = self.workbook.worksheet_mut(sheet)?;
-                match get_error_by_name(&upper, &self.language) {
+                match get_error_by_name(&upper, self.language) {
                     Some(error) => {
                         worksheet.set_cell_with_error(row, column, error, new_style_index)?;
                     }
@@ -1685,7 +1748,7 @@ impl Model {
             .cell(row, column)
             .cloned()
             .unwrap_or_default();
-        let cell_value = cell.value(&self.workbook.shared_strings, &self.language);
+        let cell_value = cell.value(&self.workbook.shared_strings, self.language);
         Ok(cell_value)
     }
 
@@ -1700,7 +1763,7 @@ impl Model {
     /// ```rust
     /// # use ironcalc_base::Model;
     /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
-    /// let mut model = Model::new_empty("model", "en", "UTC")?;
+    /// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
     /// let (sheet, row, column) = (0, 1, 1);
     /// model.set_user_input(sheet, row, column, "=1/3".to_string());
     /// model.evaluate();
@@ -1719,8 +1782,8 @@ impl Model {
             Some(cell) => {
                 let format = self.get_style_for_cell(sheet_index, row, column)?.num_fmt;
                 let formatted_value =
-                    cell.formatted_value(&self.workbook.shared_strings, &self.language, |value| {
-                        format_number(value, &format, &self.locale).text
+                    cell.formatted_value(&self.workbook.shared_strings, self.language, |value| {
+                        format_number(value, &format, self.locale).text
                     });
                 Ok(formatted_value)
             }
@@ -1736,10 +1799,16 @@ impl Model {
         })
     }
 
-    /// Returns a string with the cell content. If there is a formula returns the formula
+    /// Returns a string with the cell content in the given language and locale.
+    /// If there is a formula returns the formula
     /// If the cell is empty returns the empty string
-    /// Raises an error if there is no worksheet
-    pub fn get_cell_content(&self, sheet: u32, row: i32, column: i32) -> Result<String, String> {
+    /// Returns an error if there is no worksheet
+    pub fn get_localized_cell_content(
+        &self,
+        sheet: u32,
+        row: i32,
+        column: i32,
+    ) -> Result<String, String> {
         let worksheet = self.workbook.worksheet(sheet)?;
         let cell = match worksheet.cell(row, column) {
             Some(c) => c,
@@ -1753,9 +1822,12 @@ impl Model {
                     row,
                     column,
                 };
-                Ok(format!("={}", to_string(formula, &cell_ref)))
+                Ok(format!(
+                    "={}",
+                    to_localized_string(formula, &cell_ref, self.locale, self.language)
+                ))
             }
-            None => Ok(cell.get_text(&self.workbook.shared_strings, &self.language)),
+            None => Ok(cell.get_localized_text(&self.workbook.shared_strings, self.language)),
         }
     }
 
@@ -1807,7 +1879,7 @@ impl Model {
     /// ```rust
     /// # use ironcalc_base::Model;
     /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
-    /// let mut model = Model::new_empty("model", "en", "UTC")?;
+    /// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
     /// let (sheet, row, column) = (0, 1, 1);
     /// model.set_user_input(sheet, row, column, "100$".to_string());
     /// model.cell_clear_contents(sheet, row, column);
@@ -1834,7 +1906,7 @@ impl Model {
     /// ```rust
     /// # use ironcalc_base::Model;
     /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
-    /// let mut model = Model::new_empty("model", "en", "UTC")?;
+    /// let mut model = Model::new_empty("model", "en", "UTC", "en")?;
     /// let (sheet, row, column) = (0, 1, 1);
     /// model.set_user_input(sheet, row, column, "100$".to_string());
     /// model.cell_clear_all(sheet, row, column);
@@ -1958,29 +2030,6 @@ impl Model {
         Ok(rows.join("\n"))
     }
 
-    /// Sets the currency of the model.
-    /// Currently we only support `USD`, `EUR`, `GBP` and `JPY`
-    /// NB: This is not preserved in the JSON.
-    pub fn set_currency(&mut self, iso: &str) -> Result<(), &str> {
-        // TODO: Add a full list
-        let symbol = if iso == "USD" {
-            "$"
-        } else if iso == "EUR" {
-            "€"
-        } else if iso == "GBP" {
-            "£"
-        } else if iso == "JPY" {
-            "¥"
-        } else {
-            return Err("Unsupported currency");
-        };
-        self.locale.currency = Currency {
-            symbol: symbol.to_string(),
-            iso: iso.to_string(),
-        };
-        Ok(())
-    }
-
     /// Returns the number of frozen rows in `sheet`
     pub fn get_frozen_rows_count(&self, sheet: u32) -> Result<i32, String> {
         if let Some(worksheet) = self.workbook.worksheets.get(sheet as usize) {
@@ -2106,12 +2155,9 @@ impl Model {
         }
 
         // Make sure the formula is valid
-        match common::ParsedReference::parse_reference_formula(
-            None,
-            formula,
-            &self.locale,
-            |name| self.get_sheet_index_by_name(name),
-        ) {
+        match common::ParsedReference::parse_reference_formula(None, formula, self.locale, |name| {
+            self.get_sheet_index_by_name(name)
+        }) {
             Ok(_) => {}
             Err(_) => {
                 return Err("Formula: Invalid defined name formula".to_string());
@@ -2296,6 +2342,57 @@ impl Model {
     pub fn delete_row_style(&mut self, sheet: u32, row: i32) -> Result<(), String> {
         self.workbook.worksheet_mut(sheet)?.delete_row_style(row)
     }
+
+    /// Sets the locale of the model
+    pub fn set_locale(&mut self, locale_id: &str) -> Result<(), String> {
+        let locale = match get_locale(locale_id) {
+            Ok(l) => l,
+            Err(_) => return Err(format!("Invalid locale: {locale_id}")),
+        };
+        self.parser.set_locale(locale);
+        self.locale = locale;
+        self.workbook.settings.locale = locale_id.to_string();
+        self.evaluate();
+        Ok(())
+    }
+
+    /// Sets the timezone of the model
+    pub fn set_timezone(&mut self, timezone: &str) -> Result<(), String> {
+        let tz: Tz = match &timezone.parse() {
+            Ok(tz) => *tz,
+            Err(_) => return Err(format!("Invalid timezone: {}", &timezone)),
+        };
+        self.tz = tz;
+        self.workbook.settings.tz = timezone.to_string();
+        self.evaluate();
+        Ok(())
+    }
+
+    /// Sets the language
+    pub fn set_language(&mut self, language_id: &str) -> Result<(), String> {
+        let language = match get_language(language_id) {
+            Ok(l) => l,
+            Err(_) => return Err(format!("Invalid language: {language_id}")),
+        };
+        self.parser.set_language(language);
+        self.language = language;
+        Ok(())
+    }
+
+    /// Gets the current language
+    pub fn get_language(&self) -> String {
+        self.language.name.clone()
+    }
+
+    /// Gets the timezone of the model
+    pub fn get_timezone(&self) -> String {
+        self.workbook.settings.tz.clone()
+    }
+
+    /// Gets the locale of the model
+    pub fn get_locale(&self) -> String {
+        self.workbook.settings.locale.clone()
+    }
 }
 
 #[cfg(test)]

base/src/new_empty.rs

@@ -8,13 +8,13 @@ use crate::{
     expressions::{
         lexer::LexerMode,
         parser::{
-            stringify::{rename_sheet_in_node, to_rc_format, to_string},
+            stringify::{rename_sheet_in_node, to_localized_string, to_rc_format},
             Parser,
         },
         types::CellReferenceRC,
     },
-    language::get_language,
-    locale::get_locale,
+    language::{get_default_language, get_language},
+    locale::{get_default_locale, get_locale},
     model::{get_milliseconds_since_epoch, Model, ParsedDefinedName},
     types::{
         DefinedName, Metadata, SheetState, Workbook, WorkbookSettings, WorkbookView, Worksheet,
@@ -37,7 +37,7 @@ fn is_valid_sheet_name(name: &str) -> bool {
     !name.is_empty() && name.chars().count() <= 31 && !name.contains(&invalid[..])
 }
 
-impl Model {
+impl<'a> Model<'a> {
     /// Creates a new worksheet. Note that it does not check if the name or the sheet_id exists
     fn new_empty_worksheet(name: &str, sheet_id: u32, view_ids: &[&u32]) -> Worksheet {
         let mut views = HashMap::new();
@@ -81,7 +81,14 @@ impl Model {
         index + 1
     }
 
+    // This function parses all the internal formulas in all the worksheets
+    // (in the default language ("en") and locale ("en") and the RC format)
     pub(crate) fn parse_formulas(&mut self) {
+        let locale = self.locale;
+        let language = self.language;
+
+        self.parser.set_locale(get_default_locale());
+        self.parser.set_language(get_default_language());
         self.parser.set_lexer_mode(LexerMode::R1C1);
         let worksheets = &self.workbook.worksheets;
         for worksheet in worksheets {
@@ -99,6 +106,8 @@ impl Model {
             self.parsed_formulas.push(parse_formula);
         }
         self.parser.set_lexer_mode(LexerMode::A1);
+        self.parser.set_locale(locale);
+        self.parser.set_language(language);
     }
 
     pub(crate) fn parse_defined_names(&mut self) {
@@ -108,7 +117,7 @@ impl Model {
                 ParsedReference::parse_reference_formula(
                     None,
                     &defined_name.formula,
-                    &self.locale,
+                    self.locale,
                     |name| self.get_sheet_index_by_name(name),
                 ) {
                 match reference {
@@ -290,7 +299,7 @@ impl Model {
         for defined_name in &mut self.workbook.defined_names {
             let mut t = self.parser.parse(&defined_name.formula, cell_reference);
             rename_sheet_in_node(&mut t, sheet_index, new_name);
-            let formula = to_string(&t, cell_reference);
+            let formula = to_localized_string(&t, cell_reference, self.locale, self.language);
             defined_names.push(DefinedName {
                 name: defined_name.name.clone(),
                 formula,
@@ -355,15 +364,24 @@ impl Model {
     }
 
     /// Creates a new workbook with one empty sheet
-    pub fn new_empty(name: &str, locale_id: &str, timezone: &str) -> Result<Model, String> {
+    pub fn new_empty(
+        name: &'a str,
+        locale_id: &'a str,
+        timezone: &'a str,
+        language_id: &'a str,
+    ) -> Result<Model<'a>, String> {
         let tz: Tz = match &timezone.parse() {
             Ok(tz) => *tz,
             Err(_) => return Err(format!("Invalid timezone: {}", &timezone)),
         };
         let locale = match get_locale(locale_id) {
-            Ok(l) => l.clone(),
+            Ok(l) => l,
             Err(_) => return Err(format!("Invalid locale: {locale_id}")),
         };
+        let language = match get_language(language_id) {
+            Ok(l) => l,
+            Err(_) => return Err(format!("Invalid language: {language_id}")),
+        };
 
         let milliseconds = get_milliseconds_since_epoch();
         let seconds = milliseconds / 1000;
@@ -409,13 +427,9 @@ impl Model {
         let parsed_formulas = Vec::new();
         let worksheets = &workbook.worksheets;
         let worksheet_names = worksheets.iter().map(|s| s.get_name()).collect();
-        let parser = Parser::new(worksheet_names, vec![], HashMap::new());
+        let parser = Parser::new(worksheet_names, vec![], HashMap::new(), locale, language);
         let cells = HashMap::new();
 
-        // FIXME: Add support for display languages
-        #[allow(clippy::expect_used)]
-        let language = get_language("en").expect("").clone();
-
         let mut model = Model {
             workbook,
             shared_strings: HashMap::new(),

base/src/styles.rs

@@ -213,7 +213,7 @@ impl Styles {
 }
 
 // TODO: Try to find a better spot for styles setters
-impl Model {
+impl<'a> Model<'a> {
     pub fn set_cell_style(
         &mut self,
         sheet: u32,

base/src/test/engineering/test_number_basis.rs

@@ -150,7 +150,7 @@ fn fn_hex2dec() {
     model._set("A4", r#"=HEX2DEC("FE")"#);
 
     model._set("B1", "=HEX2DEC()");
-    model._set("B2", "=HHEX2DEC(1,2,3)");
+    model._set("B2", "=HEX2DEC(1,2,3)");
 
     model.evaluate();
 

base/src/test/mod.rs

@@ -1,11 +1,11 @@
 mod test_actions;
+mod test_arabic_roman;
 mod test_binary_search;
 mod test_cell;
 mod test_cell_clear_contents;
 mod test_circular_references;
 mod test_column_width;
 mod test_criteria;
-mod test_currency;
 mod test_date_and_time;
 mod test_datedif_leap_month_end;
 mod test_days360_month_end;
@@ -39,12 +39,14 @@ mod test_metadata;
 mod test_model_cell_clear_all;
 mod test_model_is_empty_cell;
 mod test_move_formula;
+mod test_mround_trunc_int;
 mod test_quote_prefix;
 mod test_row_column_styles;
 mod test_set_user_input;
 mod test_sheet_markup;
 mod test_sheets;
 mod test_styles;
+mod test_sumsq;
 mod test_trigonometric;
 mod test_true_false;
 mod test_weekday_return_types;
@@ -55,12 +57,19 @@ mod test_yearfrac_basis;
 pub(crate) mod util;
 
 mod engineering;
+mod statistical;
 mod test_fn_offset;
 mod test_number_format;
 
 mod test_arrays;
+mod test_cell_info_n_sheets;
+mod test_combin_combina;
 mod test_escape_quotes;
+mod test_even_odd;
+mod test_exp_sign;
 mod test_extend;
+mod test_floor;
+mod test_fn_datevalue_timevalue;
 mod test_fn_fv;
 mod test_fn_round;
 mod test_fn_type;
@@ -70,7 +79,9 @@ mod test_get_cell_content;
 mod test_implicit_intersection;
 mod test_issue_155;
 mod test_issue_483;
+mod test_language;
 mod test_ln;
+mod test_locale;
 mod test_log;
 mod test_log10;
 mod test_mod_quotient;
@@ -80,5 +91,6 @@ mod test_percentage;
 mod test_set_functions_error_handling;
 mod test_sheet_names;
 mod test_today;
+mod test_trigonometric_reciprocals;
 mod test_types;
 mod user_model;

base/src/test/statistical/mod.rs

@@ -0,0 +1,24 @@
+mod test_fn_avedev;
+mod test_fn_binom;
+mod test_fn_chisq;
+mod test_fn_chisq_test;
+mod test_fn_confidence;
+mod test_fn_covariance;
+mod test_fn_devsq;
+mod test_fn_expon_dist;
+mod test_fn_f;
+mod test_fn_f_test;
+mod test_fn_fisher;
+mod test_fn_gauss;
+mod test_fn_hyp_geom_dist;
+mod test_fn_log_norm;
+mod test_fn_norm_dist;
+mod test_fn_pearson;
+mod test_fn_phi;
+mod test_fn_poisson;
+mod test_fn_stdev;
+mod test_fn_t_dist;
+mod test_fn_t_test;
+mod test_fn_var;
+mod test_fn_weibull;
+mod test_fn_z_test;

base/src/test/statistical/test_fn_avedev.rs

@@ -0,0 +1,40 @@
+#![allow(clippy::unwrap_used)]
+
+use crate::test::util::new_empty_model;
+
+#[test]
+fn smoke_test() {
+    let mut model = new_empty_model();
+    model._set("A1", "=STDEV.P(10, 12, 23, 23, 16, 23, 21)");
+    model._set("A2", "=STDEV.S(10, 12, 23, 23, 16, 23, 21)");
+    model.evaluate();
+
+    assert_eq!(model._get_text("A1"), *"5.174505793");
+
+    assert_eq!(model._get_text("A2"), *"5.589105048");
+}
+
+#[test]
+fn numbers() {
+    let mut model = new_empty_model();
+
+    model._set("A2", "24");
+    model._set("A3", "25");
+    model._set("A4", "27");
+    model._set("A5", "23");
+    model._set("A6", "45");
+    model._set("A7", "23.5");
+    model._set("A8", "34");
+    model._set("A9", "23");
+    model._set("A10", "23");
+    model._set("A11", "TRUE");
+    model._set("A12", "'23");
+    model._set("A13", "Text");
+    model._set("A14", "FALSE");
+    model._set("A15", "45");
+
+    model._set("B1", "=AVEDEV(A2:A15)");
+    model.evaluate();
+
+    assert_eq!(model._get_text("B1"), *"7.25");
+}

base/src/test/statistical/test_fn_binom.rs

@@ -0,0 +1,86 @@
+#![allow(clippy::unwrap_used)]
+
+use crate::test::util::new_empty_model;
+
+#[test]
+fn test_fn_binom_dist_smoke() {
+    let mut model = new_empty_model();
+    model._set("A1", "=BINOM.DIST(6, 10, 0.5, TRUE)");
+    model._set("A2", "=BINOM.DIST(6, 10, 0.5, FALSE)");
+    model._set("A3", "=BINOM.DIST(6, 10, 0.5)"); // wrong args
+    model._set("A4", "=BINOM.DIST(6, 10, 0.5, TRUE, FALSE)"); // too many args
+    model.evaluate();
+
+    // P(X <= 6) for X ~ Bin(10, 0.5) = 0.828125
+    assert_eq!(model._get_text("A1"), *"0.828125");
+
+    // P(X = 6) for X ~ Bin(10, 0.5) = 0.205078125
+    assert_eq!(model._get_text("A2"), *"0.205078125");
+
+    assert_eq!(model._get_text("A3"), *"#ERROR!");
+    assert_eq!(model._get_text("A4"), *"#ERROR!");
+}
+
+#[test]
+fn test_fn_binom_dist_range_smoke() {
+    let mut model = new_empty_model();
+    model._set("A1", "=BINOM.DIST.RANGE(60, 0.75, 48)");
+    model._set("A2", "=BINOM.DIST.RANGE(60, 0.75, 45, 50)");
+    model._set("A3", "=BINOM.DIST.RANGE(60, 1.2, 45, 50)"); // p > 1 -> #NUM!
+    model._set("A4", "=BINOM.DIST.RANGE(60, 0.75, 50, 45)"); // lower > upper -> #NUM!");
+    model.evaluate();
+
+    assert_eq!(model._get_text("A1"), *"0.083974967");
+
+    assert_eq!(model._get_text("A2"), *"0.523629793");
+
+    assert_eq!(model._get_text("A3"), *"#NUM!");
+    assert_eq!(model._get_text("A4"), *"#NUM!");
+}
+
+#[test]
+fn test_fn_binom_inv_smoke() {
+    let mut model = new_empty_model();
+    model._set("A1", "=BINOM.INV(6, 0.5, 0.75)");
+    model._set("A2", "=BINOM.INV(6, 0.5, -0.1)"); // alpha < 0 -> #NUM!
+    model._set("A3", "=BINOM.INV(6, 1.2, 0.75)"); // p > 1 -> #NUM!
+    model._set("A4", "=BINOM.INV(6, 0.5)"); // args error
+    model.evaluate();
+
+    assert_eq!(model._get_text("A1"), *"4");
+    assert_eq!(model._get_text("A2"), *"#NUM!");
+    assert_eq!(model._get_text("A3"), *"#NUM!");
+    assert_eq!(model._get_text("A4"), *"#ERROR!");
+}
+
+#[test]
+fn test_fn_negbinom_dist_smoke() {
+    let mut model = new_empty_model();
+
+    // Valid: PMF (non-cumulative) and CDF (cumulative)
+    model._set("A1", "=NEGBINOM.DIST(10, 5, 0.25, FALSE)");
+    model._set("A2", "=NEGBINOM.DIST(10, 5, 0.25, TRUE)");
+
+    // Wrong number of arguments -> #ERROR!
+    model._set("A3", "=NEGBINOM.DIST(10, 5, 0.25)");
+    model._set("A4", "=NEGBINOM.DIST(10, 5, 0.25, TRUE, FALSE)");
+
+    // Domain errors:
+    // p < 0 or p > 1 -> #NUM!
+    model._set("A5", "=NEGBINOM.DIST(10, 5, 1.5, TRUE)");
+    // number_f < 0 -> #NUM!
+    model._set("A6", "=NEGBINOM.DIST(-1, 5, 0.25, TRUE)");
+    // number_s < 1 -> #NUM!
+    model._set("A7", "=NEGBINOM.DIST(10, 0, 0.25, TRUE)");
+
+    model.evaluate();
+
+    assert_eq!(model._get_text("A1"), *"0.05504866");
+    assert_eq!(model._get_text("A2"), *"0.313514058");
+
+    assert_eq!(model._get_text("A3"), *"#ERROR!");
+    assert_eq!(model._get_text("A4"), *"#ERROR!");
+    assert_eq!(model._get_text("A5"), *"#NUM!");
+    assert_eq!(model._get_text("A6"), *"#NUM!");
+    assert_eq!(model._get_text("A7"), *"#NUM!");
+}