UPDATE: Add a dialog when 'Share' buttons is clickled

.github/workflows/pypi.yml

@@ -32,9 +32,9 @@ jobs:
           manylinux: auto
           working-directory: bindings/python
       - name: Upload wheels
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: wheels-${{ runner.os }}-${{ matrix.target }}
+          name: wheels
           path: bindings/python/dist
 
   windows:
@@ -56,9 +56,9 @@ jobs:
           sccache: 'true'
           working-directory: bindings/python
       - name: Upload wheels
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: wheels-${{ runner.os }}-${{ matrix.target }}
+          name: wheels
           path: bindings/python/dist
 
   macos:
@@ -79,9 +79,9 @@ jobs:
           sccache: 'true'
           working-directory: bindings/python
       - name: Upload wheels
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: wheels-${{ runner.os }}-${{ matrix.target }}
+          name: wheels
           path: bindings/python/dist
 
   sdist:
@@ -95,9 +95,9 @@ jobs:
           args: --out dist
           working-directory: bindings/python
       - name: Upload sdist
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: wheels-${{ runner.os }}-sdist
+          name: wheels
           path: bindings/python/dist
 
   publish-to-test-pypi:
@@ -107,8 +107,9 @@ jobs:
     runs-on: ubuntu-latest
     needs: [linux, windows, macos, sdist]
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         with:
+          name: wheels
           path: bindings/python/
       - name: Publish distribution 📦 to Test PyPI
         uses: PyO3/maturin-action@v1
@@ -117,7 +118,7 @@ jobs:
           MATURIN_REPOSITORY_URL: "https://test.pypi.org/legacy/"
         with:
           command: upload
-          args: "--skip-existing **/*.whl **/*.tar.gz"
+          args: --skip-existing *
           working-directory: bindings/python
 
   publish-pypi:
@@ -127,8 +128,9 @@ jobs:
     runs-on: ubuntu-latest
     needs: [linux, windows, macos, sdist]
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         with:
+          name: wheels
           path: bindings/python/
       - name: Publish distribution 📦 to PyPI
         uses: PyO3/maturin-action@v1
@@ -137,5 +139,5 @@ jobs:
           MATURIN_REPOSITORY_URL: "https://upload.pypi.org/legacy/"
         with:
           command: upload
-          args: "--skip-existing **/*.whl **/*.tar.gz"
+          args: --skip-existing *
           working-directory: bindings/python

Cargo.lock

@@ -414,7 +414,7 @@ dependencies = [
 
 [[package]]
 name = "ironcalc"
-version = "0.5.0"
+version = "0.3.0"
 dependencies = [
  "bitcode",
  "chrono",
@@ -430,7 +430,7 @@ dependencies = [
 
 [[package]]
 name = "ironcalc_base"
-version = "0.5.0"
+version = "0.3.0"
 dependencies = [
  "bitcode",
  "chrono",
@@ -448,7 +448,7 @@ dependencies = [
 
 [[package]]
 name = "ironcalc_nodejs"
-version = "0.5.0"
+version = "0.3.1"
 dependencies = [
  "ironcalc",
  "napi",
@@ -721,10 +721,11 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.25.0"
+version = "0.23.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f239d656363bcee73afef85277f1b281e8ac6212a1d42aa90e55b90ed43c47a4"
+checksum = "57fe09249128b3173d092de9523eaa75136bf7ba85e0d69eca241c7939c933cc"
 dependencies = [
+ "cfg-if",
  "indoc",
  "libc",
  "memoffset",
@@ -738,9 +739,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.25.0"
+version = "0.23.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "755ea671a1c34044fa165247aaf6f419ca39caa6003aee791a0df2713d8f1b6d"
+checksum = "1cd3927b5a78757a0d71aa9dff669f903b1eb64b54142a9bd9f757f8fde65fd7"
 dependencies = [
  "once_cell",
  "target-lexicon",
@@ -748,9 +749,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.25.0"
+version = "0.23.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc95a2e67091e44791d4ea300ff744be5293f394f1bafd9f78c080814d35956e"
+checksum = "dab6bb2102bd8f991e7749f130a70d05dd557613e39ed2deeee8e9ca0c4d548d"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -758,9 +759,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.25.0"
+version = "0.23.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a179641d1b93920829a62f15e87c0ed791b6c8db2271ba0fd7c2686090510214"
+checksum = "91871864b353fd5ffcb3f91f2f703a22a9797c91b9ab497b1acac7b07ae509c7"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -770,9 +771,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.25.0"
+version = "0.23.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dff85ebcaab8c441b0e3f7ae40a6963ecea8a9f5e74f647e33fcf5ec9a1e89e"
+checksum = "43abc3b80bc20f3facd86cd3c60beed58c3e2aa26213f3cda368de39c60a27e4"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -783,9 +784,8 @@ dependencies = [
 
 [[package]]
 name = "pyroncalc"
-version = "0.5.6"
+version = "0.3.0"
 dependencies = [
- "bitcode",
  "ironcalc",
  "pyo3",
  "serde",
@@ -979,9 +979,9 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.13.2"
+version = "0.12.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a"
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "thiserror"
@@ -1070,7 +1070,7 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm"
-version = "0.5.3"
+version = "0.3.2"
 dependencies = [
  "ironcalc_base",
  "serde",

README.md

@@ -77,7 +77,7 @@ And visit <http://0.0.0.0:8000/ironcalc/>
 Add the dependency to `Cargo.toml`:
 ```toml
 [dependencies]
-ironcalc = { git = "https://github.com/ironcalc/IronCalc", version = "0.5"}
+ironcalc = { git = "https://github.com/ironcalc/IronCalc", version = "0.1"}
 ```
 
 And then use this code in `main.rs`:

base/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ironcalc_base"
-version = "0.5.0"
+version = "0.3.0"
 authors = ["Nicolás Hatcher <nicolas@theuniverse.today>"]
 edition = "2021"
 homepage = "https://www.ironcalc.com"

base/src/actions.rs

@@ -1,6 +1,5 @@
 use crate::constants::{LAST_COLUMN, LAST_ROW};
-use crate::expressions::parser::stringify::{to_string, to_string_displaced, DisplaceData};
+use crate::expressions::parser::stringify::DisplaceData;
-use crate::expressions::types::CellReferenceRC;
 use crate::model::Model;
 
 // NOTE: There is a difference with Excel behaviour when deleting cells/rows/columns
@@ -9,45 +8,16 @@ use crate::model::Model;
 // I feel this is unimportant for now.
 
 impl Model {
-    fn shift_cell_formula(
-        &mut self,
-        sheet: u32,
-        row: i32,
-        column: i32,
-        displace_data: &DisplaceData,
-    ) -> Result<(), String> {
-        if let Some(f) = self
-            .workbook
-            .worksheet(sheet)?
-            .cell(row, column)
-            .and_then(|c| c.get_formula())
-        {
-            let node = &self.parsed_formulas[sheet as usize][f as usize].clone();
-            let cell_reference = CellReferenceRC {
-                sheet: self.workbook.worksheets[sheet as usize].get_name(),
-                row,
-                column,
-            };
-            // FIXME: This is not a very performant way if the formula has changed :S.
-            let formula = to_string(node, &cell_reference);
-            let formula_displaced = to_string_displaced(node, &cell_reference, displace_data);
-            if formula != formula_displaced {
-                self.update_cell_with_formula(sheet, row, column, format!("={formula_displaced}"))?;
-            }
-        }
-        Ok(())
-    }
     /// This function iterates over all cells in the model and shifts their formulas according to the displacement data.
     ///
     /// # Arguments
     ///
     /// * `displace_data` - A reference to `DisplaceData` describing the displacement's direction and magnitude.
-    fn displace_cells(&mut self, displace_data: &DisplaceData) -> Result<(), String> {
+    fn displace_cells(&mut self, displace_data: &DisplaceData) {
         let cells = self.get_all_cells();
         for cell in cells {
-            self.shift_cell_formula(cell.index, cell.row, cell.column, displace_data)?;
+            self.shift_cell_formula(cell.index, cell.row, cell.column, displace_data);
         }
-        Ok(())
     }
 
     /// Retrieves the column indices for a specific row in a given sheet, sorted in ascending or descending order.
@@ -164,7 +134,7 @@ impl Model {
                 column,
                 delta: column_count,
             }),
-        )?;
+        );
 
         // In the list of columns:
         // * Keep all the columns to the left
@@ -244,7 +214,7 @@ impl Model {
                 column,
                 delta: -column_count,
             }),
-        )?;
+        );
         let worksheet = &mut self.workbook.worksheet_mut(sheet)?;
 
         // deletes all the column styles
@@ -368,7 +338,7 @@ impl Model {
                 row,
                 delta: row_count,
             }),
-        )?;
+        );
 
         Ok(())
     }
@@ -429,7 +399,7 @@ impl Model {
                 row,
                 delta: -row_count,
             }),
-        )?;
+        );
         Ok(())
     }
 
@@ -450,14 +420,14 @@ impl Model {
         sheet: u32,
         column: i32,
         delta: i32,
-    ) -> Result<(), String> {
+    ) -> Result<(), &'static str> {
         // Check boundaries
         let target_column = column + delta;
         if !(1..=LAST_COLUMN).contains(&target_column) {
-            return Err("Target column out of boundaries".to_string());
+            return Err("Target column out of boundaries");
         }
         if !(1..=LAST_COLUMN).contains(&column) {
-            return Err("Initial column out of boundaries".to_string());
+            return Err("Initial column out of boundaries");
         }
 
         // TODO: Add the actual displacement of data and styles
@@ -469,7 +439,7 @@ impl Model {
                 column,
                 delta,
             }),
-        )?;
+        );
 
         Ok(())
     }

base/src/arithmetic.rs

@@ -1,158 +0,0 @@
-use crate::{
-    calc_result::CalcResult,
-    cast::NumberOrArray,
-    expressions::{
-        parser::{ArrayNode, Node},
-        token::Error,
-        types::CellReferenceIndex,
-    },
-    model::Model,
-};
-
-/// Unify how we map booleans/strings to f64
-fn to_f64(value: &ArrayNode) -> Result<f64, Error> {
-    match value {
-        ArrayNode::Number(f) => Ok(*f),
-        ArrayNode::Boolean(b) => Ok(if *b { 1.0 } else { 0.0 }),
-        ArrayNode::String(s) => match s.parse::<f64>() {
-            Ok(f) => Ok(f),
-            Err(_) => Err(Error::VALUE),
-        },
-        ArrayNode::Error(err) => Err(err.clone()),
-    }
-}
-
-impl Model {
-    /// Applies `op` element‐wise for arrays/numbers.
-    pub(crate) fn handle_arithmetic(
-        &mut self,
-        left: &Node,
-        right: &Node,
-        cell: CellReferenceIndex,
-        op: &dyn Fn(f64, f64) -> Result<f64, Error>,
-    ) -> CalcResult {
-        let l = match self.get_number_or_array(left, cell) {
-            Ok(f) => f,
-            Err(s) => {
-                return s;
-            }
-        };
-        let r = match self.get_number_or_array(right, cell) {
-            Ok(f) => f,
-            Err(s) => {
-                return s;
-            }
-        };
-        match (l, r) {
-            // -----------------------------------------------------
-            // Case 1: Both are numbers
-            // -----------------------------------------------------
-            (NumberOrArray::Number(f1), NumberOrArray::Number(f2)) => match op(f1, f2) {
-                Ok(x) => CalcResult::Number(x),
-                Err(Error::DIV) => CalcResult::Error {
-                    error: Error::DIV,
-                    origin: cell,
-                    message: "Divide by 0".to_string(),
-                },
-                Err(Error::VALUE) => CalcResult::Error {
-                    error: Error::VALUE,
-                    origin: cell,
-                    message: "Invalid number".to_string(),
-                },
-                Err(e) => CalcResult::Error {
-                    error: e,
-                    origin: cell,
-                    message: "Unknown error".to_string(),
-                },
-            },
-
-            // -----------------------------------------------------
-            // Case 2: left is Number, right is Array
-            // -----------------------------------------------------
-            (NumberOrArray::Number(f1), NumberOrArray::Array(a2)) => {
-                let mut array = Vec::new();
-                for row in a2 {
-                    let mut data_row = Vec::new();
-                    for node in row {
-                        match to_f64(&node) {
-                            Ok(f2) => match op(f1, f2) {
-                                Ok(x) => data_row.push(ArrayNode::Number(x)),
-                                Err(Error::DIV) => data_row.push(ArrayNode::Error(Error::DIV)),
-                                Err(Error::VALUE) => data_row.push(ArrayNode::Error(Error::VALUE)),
-                                Err(e) => data_row.push(ArrayNode::Error(e)),
-                            },
-                            Err(err) => data_row.push(ArrayNode::Error(err)),
-                        }
-                    }
-                    array.push(data_row);
-                }
-                CalcResult::Array(array)
-            }
-
-            // -----------------------------------------------------
-            // Case 3: left is Array, right is Number
-            // -----------------------------------------------------
-            (NumberOrArray::Array(a1), NumberOrArray::Number(f2)) => {
-                let mut array = Vec::new();
-                for row in a1 {
-                    let mut data_row = Vec::new();
-                    for node in row {
-                        match to_f64(&node) {
-                            Ok(f1) => match op(f1, f2) {
-                                Ok(x) => data_row.push(ArrayNode::Number(x)),
-                                Err(Error::DIV) => data_row.push(ArrayNode::Error(Error::DIV)),
-                                Err(Error::VALUE) => data_row.push(ArrayNode::Error(Error::VALUE)),
-                                Err(e) => data_row.push(ArrayNode::Error(e)),
-                            },
-                            Err(err) => data_row.push(ArrayNode::Error(err)),
-                        }
-                    }
-                    array.push(data_row);
-                }
-                CalcResult::Array(array)
-            }
-
-            // -----------------------------------------------------
-            // Case 4: Both are arrays
-            // -----------------------------------------------------
-            (NumberOrArray::Array(a1), NumberOrArray::Array(a2)) => {
-                let n1 = a1.len();
-                let m1 = a1.first().map(|r| r.len()).unwrap_or(0);
-                let n2 = a2.len();
-                let m2 = a2.first().map(|r| r.len()).unwrap_or(0);
-                let n = n1.max(n2);
-                let m = m1.max(m2);
-
-                let mut array = Vec::new();
-                for i in 0..n {
-                    let row1 = a1.get(i);
-                    let row2 = a2.get(i);
-
-                    let mut data_row = Vec::new();
-                    for j in 0..m {
-                        let val1 = row1.and_then(|r| r.get(j));
-                        let val2 = row2.and_then(|r| r.get(j));
-
-                        match (val1, val2) {
-                            (Some(v1), Some(v2)) => match (to_f64(v1), to_f64(v2)) {
-                                (Ok(f1), Ok(f2)) => match op(f1, f2) {
-                                    Ok(x) => data_row.push(ArrayNode::Number(x)),
-                                    Err(Error::DIV) => data_row.push(ArrayNode::Error(Error::DIV)),
-                                    Err(Error::VALUE) => {
-                                        data_row.push(ArrayNode::Error(Error::VALUE))
-                                    }
-                                    Err(e) => data_row.push(ArrayNode::Error(e)),
-                                },
-                                (Err(e), _) | (_, Err(e)) => data_row.push(ArrayNode::Error(e)),
-                            },
-                            // Mismatched dimensions => #VALUE!
-                            _ => data_row.push(ArrayNode::Error(Error::VALUE)),
-                        }
-                    }
-                    array.push(data_row);
-                }
-                CalcResult::Array(array)
-            }
-        }
-    }
-}

base/src/calc_result.rs

@@ -1,6 +1,6 @@
 use std::cmp::Ordering;
 
-use crate::expressions::{parser::ArrayNode, token::Error, types::CellReferenceIndex};
+use crate::expressions::{token::Error, types::CellReferenceIndex};
 
 #[derive(Clone)]
 pub struct Range {
@@ -24,7 +24,6 @@ pub(crate) enum CalcResult {
     },
     EmptyCell,
     EmptyArg,
-    Array(Vec<Vec<ArrayNode>>),
 }
 
 impl CalcResult {

base/src/cast.rs

@@ -1,85 +1,11 @@
 use crate::{
     calc_result::{CalcResult, Range},
-    expressions::{
+    expressions::{parser::Node, token::Error, types::CellReferenceIndex},
-        parser::{ArrayNode, Node},
+    implicit_intersection::implicit_intersection,
-        token::Error,
-        types::CellReferenceIndex,
-    },
     model::Model,
 };
 
-pub(crate) enum NumberOrArray {
-    Number(f64),
-    Array(Vec<Vec<ArrayNode>>),
-}
-
 impl Model {
-    pub(crate) fn get_number_or_array(
-        &mut self,
-        node: &Node,
-        cell: CellReferenceIndex,
-    ) -> Result<NumberOrArray, CalcResult> {
-        match self.evaluate_node_in_context(node, cell) {
-            CalcResult::Number(f) => Ok(NumberOrArray::Number(f)),
-            CalcResult::String(s) => match s.parse::<f64>() {
-                Ok(f) => Ok(NumberOrArray::Number(f)),
-                _ => Err(CalcResult::new_error(
-                    Error::VALUE,
-                    cell,
-                    "Expecting number".to_string(),
-                )),
-            },
-            CalcResult::Boolean(f) => {
-                if f {
-                    Ok(NumberOrArray::Number(1.0))
-                } else {
-                    Ok(NumberOrArray::Number(0.0))
-                }
-            }
-            CalcResult::EmptyCell | CalcResult::EmptyArg => Ok(NumberOrArray::Number(0.0)),
-            CalcResult::Range { left, right } => {
-                let sheet = left.sheet;
-                if sheet != right.sheet {
-                    return Err(CalcResult::Error {
-                        error: Error::ERROR,
-                        origin: cell,
-                        message: "3D ranges are not allowed".to_string(),
-                    });
-                }
-                // we need to convert the range into an array
-                let mut array = Vec::new();
-                for row in left.row..=right.row {
-                    let mut row_data = Vec::new();
-                    for column in left.column..=right.column {
-                        let value =
-                            match self.evaluate_cell(CellReferenceIndex { sheet, column, row }) {
-                                CalcResult::String(s) => ArrayNode::String(s),
-                                CalcResult::Number(f) => ArrayNode::Number(f),
-                                CalcResult::Boolean(b) => ArrayNode::Boolean(b),
-                                CalcResult::Error { error, .. } => ArrayNode::Error(error),
-                                CalcResult::Range { .. } => {
-                                    // if we do things right this can never happen.
-                                    // the evaluation of a cell should never return a range
-                                    ArrayNode::Number(0.0)
-                                }
-                                CalcResult::EmptyCell => ArrayNode::Number(0.0),
-                                CalcResult::EmptyArg => ArrayNode::Number(0.0),
-                                CalcResult::Array(_) => {
-                                    // if we do things right this can never happen.
-                                    // the evaluation of a cell should never return an array
-                                    ArrayNode::Number(0.0)
-                                }
-                            };
-                        row_data.push(value);
-                    }
-                    array.push(row_data);
-                }
-                Ok(NumberOrArray::Array(array))
-            }
-            CalcResult::Array(s) => Ok(NumberOrArray::Array(s)),
-            error @ CalcResult::Error { .. } => Err(error),
-        }
-    }
     pub(crate) fn get_number(
         &mut self,
         node: &Node,
@@ -113,18 +39,21 @@ impl Model {
             }
             CalcResult::EmptyCell | CalcResult::EmptyArg => Ok(0.0),
             error @ CalcResult::Error { .. } => Err(error),
-            CalcResult::Range { .. } => Err(CalcResult::Error {
+            CalcResult::Range { left, right } => {
-                error: Error::NIMPL,
+                match implicit_intersection(&cell, &Range { left, right }) {
+                    Some(cell_reference) => {
+                        let result = self.evaluate_cell(cell_reference);
+                        self.cast_to_number(result, cell_reference)
+                    }
+                    None => Err(CalcResult::Error {
+                        error: Error::VALUE,
                         origin: cell,
-                message: "Arrays not supported yet".to_string(),
+                        message: "Invalid reference (number)".to_string(),
-            }),
-            CalcResult::Array(_) => Err(CalcResult::Error {
-                error: Error::NIMPL,
-                origin: cell,
-                message: "Arrays not supported yet".to_string(),
                     }),
                 }
             }
+        }
+    }
 
     pub(crate) fn get_number_no_bools(
         &mut self,
@@ -170,18 +99,21 @@ impl Model {
             }
             CalcResult::EmptyCell | CalcResult::EmptyArg => Ok("".to_string()),
             error @ CalcResult::Error { .. } => Err(error),
-            CalcResult::Range { .. } => Err(CalcResult::Error {
+            CalcResult::Range { left, right } => {
-                error: Error::NIMPL,
+                match implicit_intersection(&cell, &Range { left, right }) {
+                    Some(cell_reference) => {
+                        let result = self.evaluate_cell(cell_reference);
+                        self.cast_to_string(result, cell_reference)
+                    }
+                    None => Err(CalcResult::Error {
+                        error: Error::VALUE,
                         origin: cell,
-                message: "Arrays not supported yet".to_string(),
+                        message: "Invalid reference (string)".to_string(),
-            }),
-            CalcResult::Array(_) => Err(CalcResult::Error {
-                error: Error::NIMPL,
-                origin: cell,
-                message: "Arrays not supported yet".to_string(),
                     }),
                 }
             }
+        }
+    }
 
     pub(crate) fn get_boolean(
         &mut self,
@@ -219,18 +151,21 @@ impl Model {
             CalcResult::Boolean(b) => Ok(b),
             CalcResult::EmptyCell | CalcResult::EmptyArg => Ok(false),
             error @ CalcResult::Error { .. } => Err(error),
-            CalcResult::Range { .. } => Err(CalcResult::Error {
+            CalcResult::Range { left, right } => {
-                error: Error::NIMPL,
+                match implicit_intersection(&cell, &Range { left, right }) {
+                    Some(cell_reference) => {
+                        let result = self.evaluate_cell(cell_reference);
+                        self.cast_to_bool(result, cell_reference)
+                    }
+                    None => Err(CalcResult::Error {
+                        error: Error::VALUE,
                         origin: cell,
-                message: "Arrays not supported yet".to_string(),
+                        message: "Invalid reference (bool)".to_string(),
-            }),
-            CalcResult::Array(_) => Err(CalcResult::Error {
-                error: Error::NIMPL,
-                origin: cell,
-                message: "Arrays not supported yet".to_string(),
                     }),
                 }
             }
+        }
+    }
 
     // tries to return a reference. That is either a reference or a formula that evaluates to a range/reference
     pub(crate) fn get_reference(

base/src/diffs.rs

@@ -0,0 +1,138 @@
+use crate::{
+    expressions::{
+        parser::{
+            move_formula::ref_is_in_area,
+            stringify::{to_string, to_string_displaced, DisplaceData},
+            walk::forward_references,
+        },
+        types::{Area, CellReferenceIndex, CellReferenceRC},
+    },
+    model::Model,
+};
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
+#[serde(untagged, deny_unknown_fields)]
+pub enum CellValue {
+    Value(String),
+    None,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
+pub struct SetCellValue {
+    cell: CellReferenceIndex,
+    new_value: CellValue,
+    old_value: CellValue,
+}
+
+impl Model {
+    #[allow(clippy::expect_used)]
+    pub(crate) fn shift_cell_formula(
+        &mut self,
+        sheet: u32,
+        row: i32,
+        column: i32,
+        displace_data: &DisplaceData,
+    ) {
+        if let Some(f) = self
+            .workbook
+            .worksheet(sheet)
+            .expect("Worksheet must exist")
+            .cell(row, column)
+            .expect("Cell must exist")
+            .get_formula()
+        {
+            let node = &self.parsed_formulas[sheet as usize][f as usize].clone();
+            let cell_reference = CellReferenceRC {
+                sheet: self.workbook.worksheets[sheet as usize].get_name(),
+                row,
+                column,
+            };
+            // FIXME: This is not a very performant way if the formula has changed :S.
+            let formula = to_string(node, &cell_reference);
+            let formula_displaced = to_string_displaced(node, &cell_reference, displace_data);
+            if formula != formula_displaced {
+                self.update_cell_with_formula(sheet, row, column, format!("={formula_displaced}"))
+                    .expect("Failed to shift cell formula");
+            }
+        }
+    }
+
+    #[allow(clippy::expect_used)]
+    pub fn forward_references(
+        &mut self,
+        source_area: &Area,
+        target: &CellReferenceIndex,
+    ) -> Result<Vec<SetCellValue>, String> {
+        let mut diff_list: Vec<SetCellValue> = Vec::new();
+        let target_area = &Area {
+            sheet: target.sheet,
+            row: target.row,
+            column: target.column,
+            width: source_area.width,
+            height: source_area.height,
+        };
+        // Walk over every formula
+        let cells = self.get_all_cells();
+        for cell in cells {
+            if let Some(f) = self
+                .workbook
+                .worksheet(cell.index)
+                .expect("Worksheet must exist")
+                .cell(cell.row, cell.column)
+                .expect("Cell must exist")
+                .get_formula()
+            {
+                let sheet = cell.index;
+                let row = cell.row;
+                let column = cell.column;
+
+                // If cell is in the source or target area, skip
+                if ref_is_in_area(sheet, row, column, source_area)
+                    || ref_is_in_area(sheet, row, column, target_area)
+                {
+                    continue;
+                }
+
+                // Get the formula
+                // Get a copy of the AST
+                let node = &mut self.parsed_formulas[sheet as usize][f as usize].clone();
+                let cell_reference = CellReferenceRC {
+                    sheet: self.workbook.worksheets[sheet as usize].get_name(),
+                    column: cell.column,
+                    row: cell.row,
+                };
+                let context = CellReferenceIndex { sheet, column, row };
+                let formula = to_string(node, &cell_reference);
+                let target_sheet_name = &self.workbook.worksheets[target.sheet as usize].name;
+                forward_references(
+                    node,
+                    &context,
+                    source_area,
+                    target.sheet,
+                    target_sheet_name,
+                    target.row,
+                    target.column,
+                );
+
+                // If the string representation of the formula has changed update the cell
+                let updated_formula = to_string(node, &cell_reference);
+                if formula != updated_formula {
+                    self.update_cell_with_formula(
+                        sheet,
+                        row,
+                        column,
+                        format!("={updated_formula}"),
+                    )?;
+                    // Update the diff list
+                    diff_list.push(SetCellValue {
+                        cell: CellReferenceIndex { sheet, column, row },
+                        new_value: CellValue::Value(format!("={}", updated_formula)),
+                        old_value: CellValue::Value(format!("={}", formula)),
+                    });
+                }
+            }
+        }
+        Ok(diff_list)
+    }
+}

base/src/expressions/lexer/mod.rs

@@ -187,7 +187,6 @@ impl Lexer {
                     ']' => TokenType::RightBracket,
                     ':' => TokenType::Colon,
                     ';' => TokenType::Semicolon,
-                    '@' => TokenType::At,
                     ',' => {
                         if self.locale.numbers.symbols.decimal == "," {
                             match self.consume_number(',') {

base/src/expressions/lexer/structured_references.rs

@@ -23,19 +23,19 @@ impl Lexer {
             // TODO(TD): There are better ways of doing this :)
             let rest_of_formula: String = self.chars[self.position..self.len].iter().collect();
             let specifier = if rest_of_formula.starts_with("#This Row]") {
-                self.position += "#This Row]".len();
+                self.position += "#This Row]".bytes().len();
                 TableSpecifier::ThisRow
             } else if rest_of_formula.starts_with("#All]") {
-                self.position += "#All]".len();
+                self.position += "#All]".bytes().len();
                 TableSpecifier::All
             } else if rest_of_formula.starts_with("#Data]") {
-                self.position += "#Data]".len();
+                self.position += "#Data]".bytes().len();
                 TableSpecifier::Data
             } else if rest_of_formula.starts_with("#Headers]") {
-                self.position += "#Headers]".len();
+                self.position += "#Headers]".bytes().len();
                 TableSpecifier::Headers
             } else if rest_of_formula.starts_with("#Totals]") {
-                self.position += "#Totals]".len();
+                self.position += "#Totals]".bytes().len();
                 TableSpecifier::Totals
             } else {
                 return Err(LexerError {

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

@@ -1,5 +1,4 @@
 mod test_common;
-mod test_implicit_intersection;
 mod test_language;
 mod test_locale;
 mod test_ranges;

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

@@ -1,25 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::expressions::{
-    lexer::{Lexer, LexerMode},
-    token::TokenType::*,
-};
-use crate::language::get_language;
-use crate::locale::get_locale;
-
-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)
-}
-
-#[test]
-fn sum_implicit_intersection() {
-    let mut lx = new_lexer("sum(@A1:A3)");
-    assert_eq!(lx.next_token(), Ident("sum".to_string()));
-    assert_eq!(lx.next_token(), LeftParenthesis);
-    assert_eq!(lx.next_token(), At);
-    assert!(matches!(lx.next_token(), Range { .. }));
-    assert_eq!(lx.next_token(), RightParenthesis);
-    assert_eq!(lx.next_token(), EOF);
-}

base/src/expressions/parser/mod.rs

@@ -1,5 +1,5 @@
 /*!
-# GRAMMAR
+# GRAMAR
 
 <pre class="rust">
 opComp   => '=' | '<' | '>' | '<=' } '>=' | '<>'
@@ -12,8 +12,7 @@ term    => factor (opFactor factor)*
 factor  => prod (opProd prod)*
 prod    => power ('^' power)*
 power   => (unaryOp)* range '%'*
-range   => implicit (':' primary)?
+range   => primary (':' primary)?
-implicit=> '@' primary | primary
 primary => '(' expr ')'
         => number
         => function '(' f_args ')'
@@ -46,8 +45,8 @@ use super::utils::number_to_column;
 use token::OpCompare;
 
 pub mod move_formula;
-pub mod static_analysis;
 pub mod stringify;
+pub mod walk;
 
 #[cfg(test)]
 mod tests;
@@ -82,9 +81,6 @@ fn get_table_column_by_name(table_column_name: &str, table: &Table) -> Option<i3
     None
 }
 
-// DefinedNameS is a tuple with the name of the defined name, the index of the sheet and the formula
-pub type DefinedNameS = (String, Option<u32>, String);
-
 pub(crate) struct Reference<'a> {
     sheet_name: &'a Option<String>,
     sheet_index: u32,
@@ -94,14 +90,6 @@ pub(crate) struct Reference<'a> {
     column: i32,
 }
 
-#[derive(PartialEq, Clone, Debug)]
-pub enum ArrayNode {
-    Boolean(bool),
-    Number(f64),
-    String(String),
-    Error(token::Error),
-}
-
 #[derive(PartialEq, Clone, Debug)]
 pub enum Node {
     BooleanKind(bool),
@@ -175,14 +163,10 @@ pub enum Node {
         name: String,
         args: Vec<Node>,
     },
-    ArrayKind(Vec<Vec<ArrayNode>>),
+    ArrayKind(Vec<Node>),
-    DefinedNameKind(DefinedNameS),
+    DefinedNameKind((String, Option<u32>)),
     TableNameKind(String),
     WrongVariableKind(String),
-    ImplicitIntersection {
-        automatic: bool,
-        child: Box<Node>,
-    },
     CompareKind {
         kind: OpCompare,
         left: Box<Node>,
@@ -205,7 +189,7 @@ pub enum Node {
 pub struct Parser {
     lexer: lexer::Lexer,
     worksheets: Vec<String>,
-    defined_names: Vec<DefinedNameS>,
+    defined_names: Vec<(String, Option<u32>)>,
     context: CellReferenceRC,
     tables: HashMap<String, Table>,
 }
@@ -213,7 +197,7 @@ pub struct Parser {
 impl Parser {
     pub fn new(
         worksheets: Vec<String>,
-        defined_names: Vec<DefinedNameS>,
+        defined_names: Vec<(String, Option<u32>)>,
         tables: HashMap<String, Table>,
     ) -> Parser {
         let lexer = lexer::Lexer::new(
@@ -244,7 +228,7 @@ impl Parser {
     pub fn set_worksheets_and_names(
         &mut self,
         worksheets: Vec<String>,
-        defined_names: Vec<DefinedNameS>,
+        defined_names: Vec<(String, Option<u32>)>,
     ) {
         self.worksheets = worksheets;
         self.defined_names = defined_names;
@@ -268,17 +252,17 @@ impl Parser {
 
     // Returns:
     //  * None: If there is no defined name by that name
-    //  * Some((Some(index), formula)): If there is a defined name local to that sheet
+    //  * Some(Some(index)): If there is a defined name local to that sheet
     //  * Some(None): If there is a global defined name
-    fn get_defined_name(&self, name: &str, sheet: u32) -> Option<(Option<u32>, String)> {
+    fn get_defined_name(&self, name: &str, sheet: u32) -> Option<Option<u32>> {
-        for (df_name, df_scope, df_formula) in &self.defined_names {
+        for (df_name, df_scope) in &self.defined_names {
             if name.to_lowercase() == df_name.to_lowercase() && df_scope == &Some(sheet) {
-                return Some((*df_scope, df_formula.to_owned()));
+                return Some(*df_scope);
             }
         }
-        for (df_name, df_scope, df_formula) in &self.defined_names {
+        for (df_name, df_scope) in &self.defined_names {
             if name.to_lowercase() == df_name.to_lowercase() && df_scope.is_none() {
-                return Some((None, df_formula.to_owned()));
+                return Some(None);
             }
         }
         None
@@ -427,7 +411,7 @@ impl Parser {
     }
 
     fn parse_range(&mut self) -> Node {
-        let t = self.parse_implicit();
+        let t = self.parse_primary();
         if let Node::ParseErrorKind { .. } = t {
             return t;
         }
@@ -446,65 +430,6 @@ impl Parser {
         t
     }
 
-    fn parse_implicit(&mut self) -> Node {
-        let next_token = self.lexer.peek_token();
-        if next_token == TokenType::At {
-            self.lexer.advance_token();
-            let t = self.parse_primary();
-            if let Node::ParseErrorKind { .. } = t {
-                return t;
-            }
-            return Node::ImplicitIntersection {
-                automatic: false,
-                child: Box::new(t),
-            };
-        }
-        self.parse_primary()
-    }
-
-    fn parse_array_row(&mut self) -> Result<Vec<ArrayNode>, Node> {
-        let mut row = Vec::new();
-        // and array can only have numbers, string or booleans
-        // otherwise it is a syntax error
-        let first_element = 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),
-            error @ Node::ParseErrorKind { .. } => return Err(error),
-            _ => {
-                return Err(Node::ParseErrorKind {
-                    formula: self.lexer.get_formula(),
-                    message: "Invalid value in array".to_string(),
-                    position: self.lexer.get_position() as usize,
-                });
-            }
-        };
-        row.push(first_element);
-        let mut next_token = self.lexer.peek_token();
-        // FIXME: this is not respecting the locale
-        while next_token == TokenType::Comma {
-            self.lexer.advance_token();
-            let value = match self.parse_expr() {
-                Node::BooleanKind(s) => ArrayNode::Boolean(s),
-                Node::NumberKind(s) => ArrayNode::Number(s),
-                Node::StringKind(s) => ArrayNode::String(s),
-                Node::ErrorKind(kind) => ArrayNode::Error(kind),
-                error @ Node::ParseErrorKind { .. } => return Err(error),
-                _ => {
-                    return Err(Node::ParseErrorKind {
-                        formula: self.lexer.get_formula(),
-                        message: "Invalid value in array".to_string(),
-                        position: self.lexer.get_position() as usize,
-                    });
-                }
-            };
-            row.push(value);
-            next_token = self.lexer.peek_token();
-        }
-        Ok(row)
-    }
-
     fn parse_primary(&mut self) -> Node {
         let next_token = self.lexer.next_token();
         match next_token {
@@ -526,35 +451,21 @@ impl Parser {
             TokenType::Number(s) => Node::NumberKind(s),
             TokenType::String(s) => Node::StringKind(s),
             TokenType::LeftBrace => {
-                // It's an array. It's a collection of rows all of the same dimension
+                let t = self.parse_expr();
-
+                if let Node::ParseErrorKind { .. } = t {
-                let first_row = match self.parse_array_row() {
+                    return t;
-                    Ok(s) => s,
+                }
-                    Err(error) => return error,
-                };
-                let length = first_row.len();
-
-                let mut matrix = Vec::new();
-                matrix.push(first_row);
-                // FIXME: this is not respecting the locale
                 let mut next_token = self.lexer.peek_token();
+                let mut args: Vec<Node> = vec![t];
                 while next_token == TokenType::Semicolon {
                     self.lexer.advance_token();
-                    let row = match self.parse_array_row() {
+                    let p = self.parse_expr();
-                        Ok(s) => s,
+                    if let Node::ParseErrorKind { .. } = p {
-                        Err(error) => return error,
+                        return p;
-                    };
+                    }
                     next_token = self.lexer.peek_token();
-                    if row.len() != length {
+                    args.push(p);
-                        return Node::ParseErrorKind {
-                            formula: self.lexer.get_formula(),
-                            position: self.lexer.get_position() as usize,
-                            message: "All rows in an array should be the same length".to_string(),
-                        };
                 }
-                    matrix.push(row);
-                }
-
                 if let Err(err) = self.lexer.expect(TokenType::RightBrace) {
                     return Node::ParseErrorKind {
                         formula: self.lexer.get_formula(),
@@ -562,7 +473,7 @@ impl Parser {
                         message: err.message,
                     };
                 }
-                Node::ArrayKind(matrix)
+                Node::ArrayKind(args)
             }
             TokenType::Reference {
                 sheet,
@@ -693,20 +604,6 @@ impl Parser {
                             args,
                         };
                     }
-                    if &name == "_xlfn.SINGLE" {
-                        if args.len() != 1 {
-                            return Node::ParseErrorKind {
-                                formula: self.lexer.get_formula(),
-                                position: self.lexer.get_position() as usize,
-                                message: "Implicit Intersection requires just one argument"
-                                    .to_string(),
-                            };
-                        }
-                        return Node::ImplicitIntersection {
-                            automatic: false,
-                            child: Box::new(args[0].clone()),
-                        };
-                    }
                     return Node::InvalidFunctionKind { name, args };
                 }
                 let context = &self.context;
@@ -723,8 +620,8 @@ impl Parser {
                 };
 
                 // Could be a defined name or a table
-                if let Some((scope, formula)) = self.get_defined_name(&name, context_sheet_index) {
+                if let Some(scope) = self.get_defined_name(&name, context_sheet_index) {
-                    return Node::DefinedNameKind((name, scope, formula));
+                    return Node::DefinedNameKind((name, scope));
                 }
                 let name_lower = name.to_lowercase();
                 for table_name in self.tables.keys() {
@@ -809,14 +706,6 @@ impl Parser {
                     message: "Unexpected token: 'POWER'".to_string(),
                 }
             }
-            TokenType::At => {
-                // A primary Node cannot start with an operator
-                Node::ParseErrorKind {
-                    formula: self.lexer.get_formula(),
-                    position: 0,
-                    message: "Unexpected token: '@'".to_string(),
-                }
-            }
             TokenType::RightParenthesis
             | TokenType::RightBracket
             | TokenType::Colon

base/src/expressions/parser/move_formula.rs

@@ -1,6 +1,6 @@
 use super::{
     stringify::{stringify_reference, DisplaceData},
-    ArrayNode, Node, Reference,
+    Node, Reference,
 };
 use crate::{
     constants::{LAST_COLUMN, LAST_ROW},
@@ -56,15 +56,6 @@ fn move_function(name: &str, args: &Vec<Node>, move_context: &MoveContext) -> St
     format!("{}({})", name, arguments)
 }
 
-pub(crate) fn to_string_array_node(node: &ArrayNode) -> String {
-    match node {
-        ArrayNode::Boolean(value) => format!("{}", value).to_ascii_uppercase(),
-        ArrayNode::Number(number) => to_excel_precision_str(*number),
-        ArrayNode::String(value) => format!("\"{}\"", value),
-        ArrayNode::Error(kind) => format!("{}", kind),
-    }
-}
-
 fn to_string_moved(node: &Node, move_context: &MoveContext) -> String {
     use self::Node::*;
     match node {
@@ -371,41 +362,20 @@ fn to_string_moved(node: &Node, move_context: &MoveContext) -> String {
             move_function(name, args, move_context)
         }
         ArrayKind(args) => {
-            let mut first_row = true;
+            // This code is a placeholder. Arrays are not yet implemented
-            let mut matrix_string = String::new();
+            let mut first = true;
-
+            let mut arguments = "".to_string();
-            // Each element in `args` is assumed to be one "row" (itself a `Vec<T>`).
+            for el in args {
-            for row in args {
+                if !first {
-                if !first_row {
+                    arguments = format!("{},{}", arguments, to_string_moved(el, move_context));
-                    matrix_string.push(',');
                 } else {
-                    first_row = false;
+                    first = false;
+                    arguments = to_string_moved(el, move_context);
                 }
-
-                // Build the string for the current row
-                let mut first_col = true;
-                let mut row_string = String::new();
-                for el in row {
-                    if !first_col {
-                        row_string.push(',');
-                    } else {
-                        first_col = false;
             }
-
+            format!("{{{}}}", arguments)
-                    // Reuse your existing element-stringification function
-                    row_string.push_str(&to_string_array_node(el));
         }
-
+        DefinedNameKind((name, _)) => name.to_string(),
-                // Enclose the row in braces
-                matrix_string.push('{');
-                matrix_string.push_str(&row_string);
-                matrix_string.push('}');
-            }
-
-            // Enclose the whole matrix in braces
-            format!("{{{}}}", matrix_string)
-        }
-        DefinedNameKind((name, ..)) => name.to_string(),
         TableNameKind(name) => name.to_string(),
         WrongVariableKind(name) => name.to_string(),
         CompareKind { kind, left, right } => format!(
@@ -425,11 +395,5 @@ fn to_string_moved(node: &Node, move_context: &MoveContext) -> String {
             position: _,
         } => formula.to_string(),
         EmptyArgKind => "".to_string(),
-        ImplicitIntersection {
-            automatic: _,
-            child,
-        } => {
-            format!("@{}", to_string_moved(child, move_context))
-        }
     }
 }

base/src/expressions/parser/static_analysis.rs

@@ -1,984 +0,0 @@
-use crate::functions::Function;
-
-use super::Node;
-
-use once_cell::sync::Lazy;
-use regex::Regex;
-
-#[allow(clippy::expect_used)]
-static RE: Lazy<Regex> =
-    Lazy::new(|| Regex::new(r":[A-Z]*[0-9]*$").expect("Regex is known to be valid"));
-
-fn is_range_reference(s: &str) -> bool {
-    RE.is_match(s)
-}
-
-/*
-
-# NOTES on the Implicit Intersection operator: @
-
- Sometimes we obtain a range where we expected a single argument. This can happen:
-
- * As an argument of a function, eg: `SIN(A1:A5)`
- * As the result of a computation of a formula `=A1:A5`
-
- In previous versions of the Friendly Giant the spreadsheet engine would perform an operation called _implicit intersection_
- that tries to find a single cell within the range. It works by picking a cell in the range that is the same row or the same column
- as the cell. If there is just one we return that otherwise we return the `#REF!` error.
-
- Examples:
-
- * Siting on `C3` the formula `=D1:D5` will return `D3`
- * Sitting on `C3` the formula `=D:D` will return `D3`
- * Sitting on `C3` the formula `=A1:A7` will return `A3`
- * Sitting on `C3` the formula `=A5:A8` will return `#REF!`
- * Sitting on `C3` the formula `D1:G7` will return `#REF!`
-
- Today's version of the engine will result in a dynamic array spilling the result through several cells.
- To force the old behaviour we can use the _implicit intersection operator_: @
-
- * `=@A1:A7` or `=SIN(@A1:A7)
-
- When parsing formulas that come form old workbooks this is done automatically.
- We call this version of the II operator the _automatic_ II operator.
-
- We can also insert the II operator in places where before was impossible:
-
- * `=SUM(@A1:A7)`
-
- This formulas will not be compatible with old versions of the engine. The FG will stringify this as `=SUM(_xlfn.SIMPLE(A1:A7))`.
- */
-
-/// Transverses the formula tree adding the implicit intersection operator in all arguments of functions that
-/// expect a scalar but get a range.
-///  * A:A => @A:A
-///  * SIN(A1:D1) => SIN(@A1:D1)
-///
-/// Assumes formula return a scalar
-pub fn add_implicit_intersection(node: &mut Node, add: bool) {
-    match node {
-        Node::BooleanKind(_)
-        | Node::NumberKind(_)
-        | Node::StringKind(_)
-        | Node::ErrorKind(_)
-        | Node::EmptyArgKind
-        | Node::ParseErrorKind { .. }
-        | Node::WrongReferenceKind { .. }
-        | Node::WrongRangeKind { .. }
-        | Node::InvalidFunctionKind { .. }
-        | Node::ArrayKind(_)
-        | Node::ReferenceKind { .. } => {}
-        Node::ImplicitIntersection { child, .. } => {
-            // We need to check wether the II can be automatic or not
-            let mut new_node = child.as_ref().clone();
-            add_implicit_intersection(&mut new_node, add);
-            if matches!(&new_node, Node::ImplicitIntersection { .. }) {
-                *node = new_node
-            }
-        }
-        Node::RangeKind {
-            row1,
-            column1,
-            row2,
-            column2,
-            sheet_name,
-            sheet_index,
-            absolute_row1,
-            absolute_column1,
-            absolute_row2,
-            absolute_column2,
-        } => {
-            if add {
-                *node = Node::ImplicitIntersection {
-                    automatic: true,
-                    child: Box::new(Node::RangeKind {
-                        sheet_name: sheet_name.clone(),
-                        sheet_index: *sheet_index,
-                        absolute_row1: *absolute_row1,
-                        absolute_column1: *absolute_column1,
-                        row1: *row1,
-                        column1: *column1,
-                        absolute_row2: *absolute_row2,
-                        absolute_column2: *absolute_column2,
-                        row2: *row2,
-                        column2: *column2,
-                    }),
-                };
-            }
-        }
-        Node::OpRangeKind { left, right } => {
-            if add {
-                *node = Node::ImplicitIntersection {
-                    automatic: true,
-                    child: Box::new(Node::OpRangeKind {
-                        left: left.clone(),
-                        right: right.clone(),
-                    }),
-                }
-            }
-        }
-
-        // operations
-        Node::UnaryKind { right, .. } => add_implicit_intersection(right, add),
-        Node::OpConcatenateKind { left, right }
-        | Node::OpSumKind { left, right, .. }
-        | Node::OpProductKind { left, right, .. }
-        | Node::OpPowerKind { left, right, .. }
-        | Node::CompareKind { left, right, .. } => {
-            add_implicit_intersection(left, add);
-            add_implicit_intersection(right, add);
-        }
-
-        Node::DefinedNameKind(v) => {
-            if add {
-                // Not all defined names deserve the II operator
-                // For instance =Sheet1!A1 doesn't need to be intersected
-                if is_range_reference(&v.2) {
-                    *node = Node::ImplicitIntersection {
-                        automatic: true,
-                        child: Box::new(Node::DefinedNameKind(v.to_owned())),
-                    }
-                }
-            }
-        }
-        Node::WrongVariableKind(v) => {
-            if add {
-                *node = Node::ImplicitIntersection {
-                    automatic: true,
-                    child: Box::new(Node::WrongVariableKind(v.to_owned())),
-                }
-            }
-        }
-        Node::TableNameKind(_) => {
-            // noop for now
-        }
-        Node::FunctionKind { kind, args } => {
-            let arg_count = args.len();
-            let signature = get_function_args_signature(kind, arg_count);
-            for index in 0..arg_count {
-                if matches!(signature[index], Signature::Scalar)
-                    && matches!(
-                        run_static_analysis_on_node(&args[index]),
-                        StaticResult::Range(_, _) | StaticResult::Unknown
-                    )
-                {
-                    add_implicit_intersection(&mut args[index], true);
-                } else {
-                    add_implicit_intersection(&mut args[index], false);
-                }
-            }
-            if add
-                && matches!(
-                    run_static_analysis_on_node(node),
-                    StaticResult::Range(_, _) | StaticResult::Unknown
-                )
-            {
-                *node = Node::ImplicitIntersection {
-                    automatic: true,
-                    child: Box::new(node.clone()),
-                }
-            }
-        }
-    };
-}
-
-pub(crate) enum StaticResult {
-    Scalar,
-    Array(i32, i32),
-    Range(i32, i32),
-    Unknown,
-    // TODO: What if one of the dimensions is known?
-    // what if the dimensions are unknown but bounded?
-}
-
-fn static_analysis_op_nodes(left: &Node, right: &Node) -> StaticResult {
-    let lhs = run_static_analysis_on_node(left);
-    let rhs = run_static_analysis_on_node(right);
-    match (lhs, rhs) {
-        (StaticResult::Scalar, StaticResult::Scalar) => StaticResult::Scalar,
-        (StaticResult::Scalar, StaticResult::Array(a, b) | StaticResult::Range(a, b)) => {
-            StaticResult::Array(a, b)
-        }
-
-        (StaticResult::Array(a, b) | StaticResult::Range(a, b), StaticResult::Scalar) => {
-            StaticResult::Array(a, b)
-        }
-        (
-            StaticResult::Array(a1, b1) | StaticResult::Range(a1, b1),
-            StaticResult::Array(a2, b2) | StaticResult::Range(a2, b2),
-        ) => StaticResult::Array(a1.max(a2), b1.max(b2)),
-
-        (_, StaticResult::Unknown) => StaticResult::Unknown,
-        (StaticResult::Unknown, _) => StaticResult::Unknown,
-    }
-}
-
-// Returns:
-//  * Scalar if we can proof the result of the evaluation is a scalar
-//  * Array(a, b) if we know it will be an a x b array.
-//  * Range(a, b) if we know it will be a a x b range.
-//  * Unknown if we cannot guaranty either
-fn run_static_analysis_on_node(node: &Node) -> StaticResult {
-    match node {
-        Node::BooleanKind(_)
-        | Node::NumberKind(_)
-        | Node::StringKind(_)
-        | Node::ErrorKind(_)
-        | Node::EmptyArgKind => StaticResult::Scalar,
-        Node::UnaryKind { right, .. } => run_static_analysis_on_node(right),
-        Node::ParseErrorKind { .. } => {
-            // StaticResult::Unknown is also valid
-            StaticResult::Scalar
-        }
-        Node::WrongReferenceKind { .. } => {
-            // StaticResult::Unknown is also valid
-            StaticResult::Scalar
-        }
-        Node::WrongRangeKind { .. } => {
-            // StaticResult::Unknown or Array is also valid
-            StaticResult::Scalar
-        }
-        Node::InvalidFunctionKind { .. } => {
-            // StaticResult::Unknown is also valid
-            StaticResult::Scalar
-        }
-        Node::ArrayKind(array) => {
-            let n = array.len() as i32;
-            // FIXME: This is a placeholder until we implement arrays
-            StaticResult::Array(n, 1)
-        }
-        Node::RangeKind {
-            row1,
-            column1,
-            row2,
-            column2,
-            ..
-        } => StaticResult::Range(row2 - row1, column2 - column1),
-        Node::OpRangeKind { .. } => {
-            // TODO: We could do a bit better here
-            StaticResult::Unknown
-        }
-        Node::ReferenceKind { .. } => StaticResult::Scalar,
-
-        // binary operations
-        Node::OpConcatenateKind { left, right } => static_analysis_op_nodes(left, right),
-        Node::OpSumKind { left, right, .. } => static_analysis_op_nodes(left, right),
-        Node::OpProductKind { left, right, .. } => static_analysis_op_nodes(left, right),
-        Node::OpPowerKind { left, right, .. } => static_analysis_op_nodes(left, right),
-        Node::CompareKind { left, right, .. } => static_analysis_op_nodes(left, right),
-
-        // defined names
-        Node::DefinedNameKind(_) => StaticResult::Unknown,
-        Node::WrongVariableKind(_) => StaticResult::Unknown,
-        Node::TableNameKind(_) => StaticResult::Unknown,
-        Node::FunctionKind { kind, args } => static_analysis_on_function(kind, args),
-        Node::ImplicitIntersection { .. } => StaticResult::Scalar,
-    }
-}
-
-// If all the arguments are scalars the function will return a scalar
-// If any of the arguments is a range or an array it will return an array
-fn scalar_arguments(args: &[Node]) -> StaticResult {
-    let mut n = 0;
-    let mut m = 0;
-    for arg in args {
-        match run_static_analysis_on_node(arg) {
-            StaticResult::Scalar => {
-                // noop
-            }
-            StaticResult::Array(a, b) | StaticResult::Range(a, b) => {
-                n = n.max(a);
-                m = m.max(b);
-            }
-            StaticResult::Unknown => return StaticResult::Unknown,
-        }
-    }
-    if n == 0 && m == 0 {
-        return StaticResult::Scalar;
-    }
-    StaticResult::Array(n, m)
-}
-
-// We only care if the function can return a range or not
-fn not_implemented(_args: &[Node]) -> StaticResult {
-    StaticResult::Scalar
-}
-
-fn static_analysis_offset(args: &[Node]) -> StaticResult {
-    // If first argument is a single cell reference and there are no4th and 5th argument,
-    // or they are 1, then it is a scalar
-    let arg_count = args.len();
-    if arg_count < 3 {
-        // Actually an error
-        return StaticResult::Scalar;
-    }
-    if !matches!(args[0], Node::ReferenceKind { .. }) {
-        return StaticResult::Unknown;
-    }
-    if arg_count == 3 {
-        return StaticResult::Scalar;
-    }
-    match args[3] {
-        Node::NumberKind(f) => {
-            if f != 1.0 {
-                return StaticResult::Unknown;
-            }
-        }
-        _ => return StaticResult::Unknown,
-    };
-    if arg_count == 4 {
-        return StaticResult::Scalar;
-    }
-    match args[4] {
-        Node::NumberKind(f) => {
-            if f != 1.0 {
-                return StaticResult::Unknown;
-            }
-        }
-        _ => return StaticResult::Unknown,
-    };
-    StaticResult::Unknown
-}
-
-// fn static_analysis_choose(_args: &[Node]) -> StaticResult {
-//     // We will always insert the @ in CHOOSE, but technically it is only needed if one of the elements is a range
-//     StaticResult::Unknown
-// }
-
-fn static_analysis_indirect(_args: &[Node]) -> StaticResult {
-    // We will always insert the @, but we don't need to do that in every scenario`
-    StaticResult::Unknown
-}
-
-fn static_analysis_index(_args: &[Node]) -> StaticResult {
-    // INDEX has two forms, but they are indistinguishable at parse time.
-    StaticResult::Unknown
-}
-
-#[derive(Clone)]
-enum Signature {
-    Scalar,
-    Vector,
-    Error,
-}
-
-fn args_signature_no_args(arg_count: usize) -> Vec<Signature> {
-    if arg_count == 0 {
-        vec![]
-    } else {
-        vec![Signature::Error; arg_count]
-    }
-}
-
-fn args_signature_scalars(
-    arg_count: usize,
-    required_count: usize,
-    optional_count: usize,
-) -> Vec<Signature> {
-    if arg_count >= required_count && arg_count <= required_count + optional_count {
-        vec![Signature::Scalar; arg_count]
-    } else {
-        vec![Signature::Error; arg_count]
-    }
-}
-
-fn args_signature_one_vector(arg_count: usize) -> Vec<Signature> {
-    if arg_count == 1 {
-        vec![Signature::Vector]
-    } else {
-        vec![Signature::Error; arg_count]
-    }
-}
-
-fn args_signature_sumif(arg_count: usize) -> Vec<Signature> {
-    if arg_count == 2 {
-        vec![Signature::Vector, Signature::Scalar]
-    } else if arg_count == 3 {
-        vec![Signature::Vector, Signature::Scalar, Signature::Vector]
-    } else {
-        vec![Signature::Error; arg_count]
-    }
-}
-
-// 1 or none scalars
-fn args_signature_sheet(arg_count: usize) -> Vec<Signature> {
-    if arg_count == 0 {
-        vec![]
-    } else if arg_count == 1 {
-        vec![Signature::Scalar]
-    } else {
-        vec![Signature::Error; arg_count]
-    }
-}
-
-fn args_signature_hlookup(arg_count: usize) -> Vec<Signature> {
-    if arg_count == 3 {
-        vec![Signature::Vector, Signature::Vector, Signature::Scalar]
-    } else if arg_count == 4 {
-        vec![
-            Signature::Vector,
-            Signature::Vector,
-            Signature::Scalar,
-            Signature::Vector,
-        ]
-    } else {
-        vec![Signature::Error; arg_count]
-    }
-}
-
-fn args_signature_index(arg_count: usize) -> Vec<Signature> {
-    if arg_count == 2 {
-        vec![Signature::Vector, Signature::Scalar]
-    } else if arg_count == 3 {
-        vec![Signature::Vector, Signature::Scalar, Signature::Scalar]
-    } else if arg_count == 4 {
-        vec![
-            Signature::Vector,
-            Signature::Scalar,
-            Signature::Scalar,
-            Signature::Scalar,
-        ]
-    } else {
-        vec![Signature::Error; arg_count]
-    }
-}
-
-fn args_signature_lookup(arg_count: usize) -> Vec<Signature> {
-    if arg_count == 2 {
-        vec![Signature::Vector, Signature::Vector]
-    } else if arg_count == 3 {
-        vec![Signature::Vector, Signature::Vector, Signature::Vector]
-    } else {
-        vec![Signature::Error; arg_count]
-    }
-}
-
-fn args_signature_match(arg_count: usize) -> Vec<Signature> {
-    if arg_count == 2 {
-        vec![Signature::Vector, Signature::Vector]
-    } else if arg_count == 3 {
-        vec![Signature::Vector, Signature::Vector, Signature::Scalar]
-    } else {
-        vec![Signature::Error; arg_count]
-    }
-}
-
-fn args_signature_offset(arg_count: usize) -> Vec<Signature> {
-    if arg_count == 3 {
-        vec![Signature::Vector, Signature::Scalar, Signature::Scalar]
-    } else if arg_count == 4 {
-        vec![
-            Signature::Vector,
-            Signature::Scalar,
-            Signature::Scalar,
-            Signature::Scalar,
-        ]
-    } else if arg_count == 5 {
-        vec![
-            Signature::Vector,
-            Signature::Scalar,
-            Signature::Scalar,
-            Signature::Scalar,
-            Signature::Scalar,
-        ]
-    } else {
-        vec![Signature::Error; arg_count]
-    }
-}
-
-fn args_signature_row(arg_count: usize) -> Vec<Signature> {
-    if arg_count == 0 {
-        vec![]
-    } else if arg_count == 1 {
-        vec![Signature::Vector]
-    } else {
-        vec![Signature::Error; arg_count]
-    }
-}
-
-fn args_signature_xlookup(arg_count: usize) -> Vec<Signature> {
-    if !(3..=6).contains(&arg_count) {
-        return vec![Signature::Error; arg_count];
-    }
-    let mut result = vec![Signature::Scalar; arg_count];
-    result[0] = Signature::Vector;
-    result[1] = Signature::Vector;
-    result[2] = Signature::Vector;
-    result
-}
-
-fn args_signature_textafter(arg_count: usize) -> Vec<Signature> {
-    if !(2..=6).contains(&arg_count) {
-        vec![Signature::Scalar; arg_count]
-    } else {
-        vec![Signature::Error; arg_count]
-    }
-}
-
-fn args_signature_textjoin(arg_count: usize) -> Vec<Signature> {
-    if arg_count >= 3 {
-        let mut result = vec![Signature::Vector; arg_count];
-        result[0] = Signature::Scalar;
-        result[1] = Signature::Scalar;
-        result
-    } else {
-        vec![Signature::Error; arg_count]
-    }
-}
-
-fn args_signature_npv(arg_count: usize) -> Vec<Signature> {
-    if arg_count < 2 {
-        return vec![Signature::Error; arg_count];
-    }
-    let mut result = vec![Signature::Vector; arg_count];
-    result[0] = Signature::Scalar;
-    result
-}
-
-fn args_signature_irr(arg_count: usize) -> Vec<Signature> {
-    if arg_count > 2 {
-        vec![Signature::Error; arg_count]
-    } else if arg_count == 1 {
-        vec![Signature::Vector]
-    } else {
-        vec![Signature::Vector, Signature::Scalar]
-    }
-}
-
-fn args_signature_xirr(arg_count: usize) -> Vec<Signature> {
-    if arg_count == 2 {
-        vec![Signature::Vector; arg_count]
-    } else if arg_count == 3 {
-        vec![Signature::Vector, Signature::Vector, Signature::Scalar]
-    } else {
-        vec![Signature::Error; arg_count]
-    }
-}
-
-fn args_signature_mirr(arg_count: usize) -> Vec<Signature> {
-    if arg_count != 3 {
-        vec![Signature::Error; arg_count]
-    } else {
-        vec![Signature::Vector, Signature::Scalar, Signature::Scalar]
-    }
-}
-
-fn args_signature_xnpv(arg_count: usize) -> Vec<Signature> {
-    if arg_count != 3 {
-        vec![Signature::Error; arg_count]
-    } else {
-        vec![Signature::Scalar, Signature::Vector, Signature::Vector]
-    }
-}
-
-// FIXME: This is terrible duplications of efforts. We use the signature in at least three different places:
-// 1. When computing the function
-// 2. Checking the arguments to see if we need to insert the implicit intersection operator
-// 3. Understanding the return value
-//
-// The signature of the functions should be defined only once
-
-// Given a function and a number of arguments this returns the arguments at each position
-// are expected to be scalars or vectors (array/ranges).
-// Sets signature::Error to all arguments if the number of arguments is incorrect.
-fn get_function_args_signature(kind: &Function, arg_count: usize) -> Vec<Signature> {
-    match kind {
-        Function::And => vec![Signature::Vector; arg_count],
-        Function::False => args_signature_no_args(arg_count),
-        Function::If => args_signature_scalars(arg_count, 2, 1),
-        Function::Iferror => args_signature_scalars(arg_count, 2, 0),
-        Function::Ifna => args_signature_scalars(arg_count, 2, 0),
-        Function::Ifs => vec![Signature::Scalar; arg_count],
-        Function::Not => args_signature_scalars(arg_count, 1, 0),
-        Function::Or => vec![Signature::Vector; arg_count],
-        Function::Switch => vec![Signature::Scalar; arg_count],
-        Function::True => args_signature_no_args(arg_count),
-        Function::Xor => vec![Signature::Vector; arg_count],
-        Function::Abs => args_signature_scalars(arg_count, 1, 0),
-        Function::Acos => args_signature_scalars(arg_count, 1, 0),
-        Function::Acosh => args_signature_scalars(arg_count, 1, 0),
-        Function::Asin => args_signature_scalars(arg_count, 1, 0),
-        Function::Asinh => args_signature_scalars(arg_count, 1, 0),
-        Function::Atan => args_signature_scalars(arg_count, 1, 0),
-        Function::Atan2 => args_signature_scalars(arg_count, 2, 0),
-        Function::Atanh => args_signature_scalars(arg_count, 1, 0),
-        Function::Choose => vec![Signature::Scalar; arg_count],
-        Function::Column => args_signature_row(arg_count),
-        Function::Columns => args_signature_one_vector(arg_count),
-        Function::Cos => args_signature_scalars(arg_count, 1, 0),
-        Function::Cosh => args_signature_scalars(arg_count, 1, 0),
-        Function::Max => vec![Signature::Vector; arg_count],
-        Function::Min => vec![Signature::Vector; arg_count],
-        Function::Pi => args_signature_no_args(arg_count),
-        Function::Power => args_signature_scalars(arg_count, 2, 0),
-        Function::Product => vec![Signature::Vector; arg_count],
-        Function::Round => args_signature_scalars(arg_count, 2, 0),
-        Function::Rounddown => args_signature_scalars(arg_count, 2, 0),
-        Function::Roundup => args_signature_scalars(arg_count, 2, 0),
-        Function::Sin => args_signature_scalars(arg_count, 1, 0),
-        Function::Sinh => args_signature_scalars(arg_count, 1, 0),
-        Function::Sqrt => args_signature_scalars(arg_count, 1, 0),
-        Function::Sqrtpi => args_signature_scalars(arg_count, 1, 0),
-        Function::Sum => vec![Signature::Vector; arg_count],
-        Function::Sumif => args_signature_sumif(arg_count),
-        Function::Sumifs => vec![Signature::Vector; arg_count],
-        Function::Tan => args_signature_scalars(arg_count, 1, 0),
-        Function::Tanh => args_signature_scalars(arg_count, 1, 0),
-        Function::ErrorType => args_signature_scalars(arg_count, 1, 0),
-        Function::Isblank => args_signature_scalars(arg_count, 1, 0),
-        Function::Iserr => args_signature_scalars(arg_count, 1, 0),
-        Function::Iserror => args_signature_scalars(arg_count, 1, 0),
-        Function::Iseven => args_signature_scalars(arg_count, 1, 0),
-        Function::Isformula => args_signature_scalars(arg_count, 1, 0),
-        Function::Islogical => args_signature_scalars(arg_count, 1, 0),
-        Function::Isna => args_signature_scalars(arg_count, 1, 0),
-        Function::Isnontext => args_signature_scalars(arg_count, 1, 0),
-        Function::Isnumber => args_signature_scalars(arg_count, 1, 0),
-        Function::Isodd => args_signature_scalars(arg_count, 1, 0),
-        Function::Isref => args_signature_one_vector(arg_count),
-        Function::Istext => args_signature_scalars(arg_count, 1, 0),
-        Function::Na => args_signature_no_args(arg_count),
-        Function::Sheet => args_signature_sheet(arg_count),
-        Function::Type => args_signature_one_vector(arg_count),
-        Function::Hlookup => args_signature_hlookup(arg_count),
-        Function::Index => args_signature_index(arg_count),
-        Function::Indirect => args_signature_scalars(arg_count, 1, 0),
-        Function::Lookup => args_signature_lookup(arg_count),
-        Function::Match => args_signature_match(arg_count),
-        Function::Offset => args_signature_offset(arg_count),
-        Function::Row => args_signature_row(arg_count),
-        Function::Rows => args_signature_one_vector(arg_count),
-        Function::Vlookup => args_signature_hlookup(arg_count),
-        Function::Xlookup => args_signature_xlookup(arg_count),
-        Function::Concat => vec![Signature::Vector; arg_count],
-        Function::Concatenate => vec![Signature::Scalar; arg_count],
-        Function::Exact => args_signature_scalars(arg_count, 2, 0),
-        Function::Find => args_signature_scalars(arg_count, 2, 1),
-        Function::Left => args_signature_scalars(arg_count, 1, 1),
-        Function::Len => args_signature_scalars(arg_count, 1, 0),
-        Function::Lower => args_signature_scalars(arg_count, 1, 0),
-        Function::Mid => args_signature_scalars(arg_count, 3, 0),
-        Function::Rept => args_signature_scalars(arg_count, 2, 0),
-        Function::Right => args_signature_scalars(arg_count, 2, 1),
-        Function::Search => args_signature_scalars(arg_count, 2, 1),
-        Function::Substitute => args_signature_scalars(arg_count, 3, 1),
-        Function::T => args_signature_scalars(arg_count, 1, 0),
-        Function::Text => args_signature_scalars(arg_count, 2, 0),
-        Function::Textafter => args_signature_textafter(arg_count),
-        Function::Textbefore => args_signature_textafter(arg_count),
-        Function::Textjoin => args_signature_textjoin(arg_count),
-        Function::Trim => args_signature_scalars(arg_count, 1, 0),
-        Function::Upper => args_signature_scalars(arg_count, 1, 0),
-        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::Averagea => vec![Signature::Vector; arg_count],
-        Function::Averageif => args_signature_sumif(arg_count),
-        Function::Averageifs => vec![Signature::Vector; arg_count],
-        Function::Count => vec![Signature::Vector; arg_count],
-        Function::Counta => vec![Signature::Vector; arg_count],
-        Function::Countblank => vec![Signature::Vector; arg_count],
-        Function::Countif => args_signature_sumif(arg_count),
-        Function::Countifs => vec![Signature::Vector; arg_count],
-        Function::Maxifs => vec![Signature::Vector; arg_count],
-        Function::Minifs => vec![Signature::Vector; arg_count],
-        Function::Date => args_signature_scalars(arg_count, 3, 0),
-        Function::Day => args_signature_scalars(arg_count, 1, 0),
-        Function::Edate => args_signature_scalars(arg_count, 2, 0),
-        Function::Eomonth => args_signature_scalars(arg_count, 2, 0),
-        Function::Month => args_signature_scalars(arg_count, 1, 0),
-        Function::Now => args_signature_no_args(arg_count),
-        Function::Today => args_signature_no_args(arg_count),
-        Function::Year => args_signature_scalars(arg_count, 1, 0),
-        Function::Cumipmt => args_signature_scalars(arg_count, 6, 0),
-        Function::Cumprinc => args_signature_scalars(arg_count, 6, 0),
-        Function::Db => args_signature_scalars(arg_count, 4, 1),
-        Function::Ddb => args_signature_scalars(arg_count, 4, 1),
-        Function::Dollarde => args_signature_scalars(arg_count, 2, 0),
-        Function::Dollarfr => args_signature_scalars(arg_count, 2, 0),
-        Function::Effect => args_signature_scalars(arg_count, 2, 0),
-        Function::Fv => args_signature_scalars(arg_count, 3, 2),
-        Function::Ipmt => args_signature_scalars(arg_count, 4, 2),
-        Function::Irr => args_signature_irr(arg_count),
-        Function::Ispmt => args_signature_scalars(arg_count, 4, 0),
-        Function::Mirr => args_signature_mirr(arg_count),
-        Function::Nominal => args_signature_scalars(arg_count, 2, 0),
-        Function::Nper => args_signature_scalars(arg_count, 3, 2),
-        Function::Npv => args_signature_npv(arg_count),
-        Function::Pduration => args_signature_scalars(arg_count, 3, 0),
-        Function::Pmt => args_signature_scalars(arg_count, 3, 2),
-        Function::Ppmt => args_signature_scalars(arg_count, 4, 2),
-        Function::Pv => args_signature_scalars(arg_count, 3, 2),
-        Function::Rate => args_signature_scalars(arg_count, 3, 3),
-        Function::Rri => args_signature_scalars(arg_count, 3, 0),
-        Function::Sln => args_signature_scalars(arg_count, 3, 0),
-        Function::Syd => args_signature_scalars(arg_count, 4, 0),
-        Function::Tbilleq => args_signature_scalars(arg_count, 3, 0),
-        Function::Tbillprice => args_signature_scalars(arg_count, 3, 0),
-        Function::Tbillyield => args_signature_scalars(arg_count, 3, 0),
-        Function::Xirr => args_signature_xirr(arg_count),
-        Function::Xnpv => args_signature_xnpv(arg_count),
-        Function::Besseli => args_signature_scalars(arg_count, 2, 0),
-        Function::Besselj => args_signature_scalars(arg_count, 2, 0),
-        Function::Besselk => args_signature_scalars(arg_count, 2, 0),
-        Function::Bessely => args_signature_scalars(arg_count, 2, 0),
-        Function::Erf => args_signature_scalars(arg_count, 1, 1),
-        Function::Erfc => args_signature_scalars(arg_count, 1, 0),
-        Function::ErfcPrecise => args_signature_scalars(arg_count, 1, 0),
-        Function::ErfPrecise => args_signature_scalars(arg_count, 1, 0),
-        Function::Bin2dec => args_signature_scalars(arg_count, 1, 0),
-        Function::Bin2hex => args_signature_scalars(arg_count, 1, 0),
-        Function::Bin2oct => args_signature_scalars(arg_count, 1, 0),
-        Function::Dec2Bin => args_signature_scalars(arg_count, 1, 0),
-        Function::Dec2hex => args_signature_scalars(arg_count, 1, 0),
-        Function::Dec2oct => args_signature_scalars(arg_count, 1, 0),
-        Function::Hex2bin => args_signature_scalars(arg_count, 1, 0),
-        Function::Hex2dec => args_signature_scalars(arg_count, 1, 0),
-        Function::Hex2oct => args_signature_scalars(arg_count, 1, 0),
-        Function::Oct2bin => args_signature_scalars(arg_count, 1, 0),
-        Function::Oct2dec => args_signature_scalars(arg_count, 1, 0),
-        Function::Oct2hex => args_signature_scalars(arg_count, 1, 0),
-        Function::Bitand => args_signature_scalars(arg_count, 2, 0),
-        Function::Bitlshift => args_signature_scalars(arg_count, 2, 0),
-        Function::Bitor => args_signature_scalars(arg_count, 2, 0),
-        Function::Bitrshift => args_signature_scalars(arg_count, 2, 0),
-        Function::Bitxor => args_signature_scalars(arg_count, 2, 0),
-        Function::Complex => args_signature_scalars(arg_count, 2, 1),
-        Function::Imabs => args_signature_scalars(arg_count, 1, 0),
-        Function::Imaginary => args_signature_scalars(arg_count, 1, 0),
-        Function::Imargument => args_signature_scalars(arg_count, 1, 0),
-        Function::Imconjugate => args_signature_scalars(arg_count, 1, 0),
-        Function::Imcos => args_signature_scalars(arg_count, 1, 0),
-        Function::Imcosh => args_signature_scalars(arg_count, 1, 0),
-        Function::Imcot => args_signature_scalars(arg_count, 1, 0),
-        Function::Imcsc => args_signature_scalars(arg_count, 1, 0),
-        Function::Imcsch => args_signature_scalars(arg_count, 1, 0),
-        Function::Imdiv => args_signature_scalars(arg_count, 2, 0),
-        Function::Imexp => args_signature_scalars(arg_count, 1, 0),
-        Function::Imln => args_signature_scalars(arg_count, 1, 0),
-        Function::Imlog10 => args_signature_scalars(arg_count, 1, 0),
-        Function::Imlog2 => args_signature_scalars(arg_count, 1, 0),
-        Function::Impower => args_signature_scalars(arg_count, 2, 0),
-        Function::Improduct => args_signature_scalars(arg_count, 2, 0),
-        Function::Imreal => args_signature_scalars(arg_count, 1, 0),
-        Function::Imsec => args_signature_scalars(arg_count, 1, 0),
-        Function::Imsech => args_signature_scalars(arg_count, 1, 0),
-        Function::Imsin => args_signature_scalars(arg_count, 1, 0),
-        Function::Imsinh => args_signature_scalars(arg_count, 1, 0),
-        Function::Imsqrt => args_signature_scalars(arg_count, 1, 0),
-        Function::Imsub => args_signature_scalars(arg_count, 2, 0),
-        Function::Imsum => args_signature_scalars(arg_count, 2, 0),
-        Function::Imtan => args_signature_scalars(arg_count, 1, 0),
-        Function::Convert => args_signature_scalars(arg_count, 3, 0),
-        Function::Delta => args_signature_scalars(arg_count, 1, 1),
-        Function::Gestep => args_signature_scalars(arg_count, 1, 1),
-        Function::Subtotal => args_signature_npv(arg_count),
-        Function::Rand => args_signature_no_args(arg_count),
-        Function::Randbetween => args_signature_scalars(arg_count, 2, 0),
-        Function::Formulatext => args_signature_scalars(arg_count, 1, 0),
-        Function::Unicode => args_signature_scalars(arg_count, 1, 0),
-        Function::Geomean => vec![Signature::Vector; arg_count],
-    }
-}
-
-// Returns the type of the result (Scalar, Array or Range) depending on the arguments
-fn static_analysis_on_function(kind: &Function, args: &[Node]) -> StaticResult {
-    match kind {
-        Function::And => StaticResult::Scalar,
-        Function::False => StaticResult::Scalar,
-        Function::If => scalar_arguments(args),
-        Function::Iferror => scalar_arguments(args),
-        Function::Ifna => scalar_arguments(args),
-        Function::Ifs => not_implemented(args),
-        Function::Not => StaticResult::Scalar,
-        Function::Or => StaticResult::Scalar,
-        Function::Switch => not_implemented(args),
-        Function::True => StaticResult::Scalar,
-        Function::Xor => StaticResult::Scalar,
-        Function::Abs => scalar_arguments(args),
-        Function::Acos => scalar_arguments(args),
-        Function::Acosh => scalar_arguments(args),
-        Function::Asin => scalar_arguments(args),
-        Function::Asinh => scalar_arguments(args),
-        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::Column => not_implemented(args),
-        Function::Columns => not_implemented(args),
-        Function::Cos => scalar_arguments(args),
-        Function::Cosh => scalar_arguments(args),
-        Function::Max => StaticResult::Scalar,
-        Function::Min => StaticResult::Scalar,
-        Function::Pi => StaticResult::Scalar,
-        Function::Power => scalar_arguments(args),
-        Function::Product => not_implemented(args),
-        Function::Round => scalar_arguments(args),
-        Function::Rounddown => scalar_arguments(args),
-        Function::Roundup => scalar_arguments(args),
-        Function::Sin => scalar_arguments(args),
-        Function::Sinh => scalar_arguments(args),
-        Function::Sqrt => scalar_arguments(args),
-        Function::Sqrtpi => StaticResult::Scalar,
-        Function::Sum => StaticResult::Scalar,
-        Function::Sumif => not_implemented(args),
-        Function::Sumifs => not_implemented(args),
-        Function::Tan => scalar_arguments(args),
-        Function::Tanh => scalar_arguments(args),
-        Function::ErrorType => not_implemented(args),
-        Function::Isblank => not_implemented(args),
-        Function::Iserr => not_implemented(args),
-        Function::Iserror => not_implemented(args),
-        Function::Iseven => not_implemented(args),
-        Function::Isformula => not_implemented(args),
-        Function::Islogical => not_implemented(args),
-        Function::Isna => not_implemented(args),
-        Function::Isnontext => not_implemented(args),
-        Function::Isnumber => not_implemented(args),
-        Function::Isodd => not_implemented(args),
-        Function::Isref => not_implemented(args),
-        Function::Istext => not_implemented(args),
-        Function::Na => StaticResult::Scalar,
-        Function::Sheet => StaticResult::Scalar,
-        Function::Type => not_implemented(args),
-        Function::Hlookup => not_implemented(args),
-        Function::Index => static_analysis_index(args),
-        Function::Indirect => static_analysis_indirect(args),
-        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),
-        Function::Xlookup => not_implemented(args),
-        Function::Concat => not_implemented(args),
-        Function::Concatenate => not_implemented(args),
-        Function::Exact => not_implemented(args),
-        Function::Find => not_implemented(args),
-        Function::Left => not_implemented(args),
-        Function::Len => not_implemented(args),
-        Function::Lower => not_implemented(args),
-        Function::Mid => not_implemented(args),
-        Function::Rept => not_implemented(args),
-        Function::Right => not_implemented(args),
-        Function::Search => not_implemented(args),
-        Function::Substitute => not_implemented(args),
-        Function::T => not_implemented(args),
-        Function::Text => not_implemented(args),
-        Function::Textafter => not_implemented(args),
-        Function::Textbefore => not_implemented(args),
-        Function::Textjoin => not_implemented(args),
-        Function::Trim => not_implemented(args),
-        Function::Unicode => not_implemented(args),
-        Function::Upper => not_implemented(args),
-        Function::Value => not_implemented(args),
-        Function::Valuetotext => not_implemented(args),
-        Function::Average => not_implemented(args),
-        Function::Averagea => not_implemented(args),
-        Function::Averageif => not_implemented(args),
-        Function::Averageifs => not_implemented(args),
-        Function::Count => not_implemented(args),
-        Function::Counta => not_implemented(args),
-        Function::Countblank => not_implemented(args),
-        Function::Countif => not_implemented(args),
-        Function::Countifs => not_implemented(args),
-        Function::Maxifs => not_implemented(args),
-        Function::Minifs => not_implemented(args),
-        Function::Date => not_implemented(args),
-        Function::Day => not_implemented(args),
-        Function::Edate => not_implemented(args),
-        Function::Month => not_implemented(args),
-        Function::Now => not_implemented(args),
-        Function::Today => not_implemented(args),
-        Function::Year => not_implemented(args),
-        Function::Cumipmt => not_implemented(args),
-        Function::Cumprinc => not_implemented(args),
-        Function::Db => not_implemented(args),
-        Function::Ddb => not_implemented(args),
-        Function::Dollarde => not_implemented(args),
-        Function::Dollarfr => not_implemented(args),
-        Function::Effect => not_implemented(args),
-        Function::Fv => not_implemented(args),
-        Function::Ipmt => not_implemented(args),
-        Function::Irr => not_implemented(args),
-        Function::Ispmt => not_implemented(args),
-        Function::Mirr => not_implemented(args),
-        Function::Nominal => not_implemented(args),
-        Function::Nper => not_implemented(args),
-        Function::Npv => not_implemented(args),
-        Function::Pduration => not_implemented(args),
-        Function::Pmt => not_implemented(args),
-        Function::Ppmt => not_implemented(args),
-        Function::Pv => not_implemented(args),
-        Function::Rate => not_implemented(args),
-        Function::Rri => not_implemented(args),
-        Function::Sln => not_implemented(args),
-        Function::Syd => not_implemented(args),
-        Function::Tbilleq => not_implemented(args),
-        Function::Tbillprice => not_implemented(args),
-        Function::Tbillyield => not_implemented(args),
-        Function::Xirr => not_implemented(args),
-        Function::Xnpv => not_implemented(args),
-        Function::Besseli => scalar_arguments(args),
-        Function::Besselj => scalar_arguments(args),
-        Function::Besselk => scalar_arguments(args),
-        Function::Bessely => scalar_arguments(args),
-        Function::Erf => scalar_arguments(args),
-        Function::Erfc => scalar_arguments(args),
-        Function::ErfcPrecise => scalar_arguments(args),
-        Function::ErfPrecise => scalar_arguments(args),
-        Function::Bin2dec => scalar_arguments(args),
-        Function::Bin2hex => scalar_arguments(args),
-        Function::Bin2oct => scalar_arguments(args),
-        Function::Dec2Bin => scalar_arguments(args),
-        Function::Dec2hex => scalar_arguments(args),
-        Function::Dec2oct => scalar_arguments(args),
-        Function::Hex2bin => scalar_arguments(args),
-        Function::Hex2dec => scalar_arguments(args),
-        Function::Hex2oct => scalar_arguments(args),
-        Function::Oct2bin => scalar_arguments(args),
-        Function::Oct2dec => scalar_arguments(args),
-        Function::Oct2hex => scalar_arguments(args),
-        Function::Bitand => scalar_arguments(args),
-        Function::Bitlshift => scalar_arguments(args),
-        Function::Bitor => scalar_arguments(args),
-        Function::Bitrshift => scalar_arguments(args),
-        Function::Bitxor => scalar_arguments(args),
-        Function::Complex => scalar_arguments(args),
-        Function::Imabs => scalar_arguments(args),
-        Function::Imaginary => scalar_arguments(args),
-        Function::Imargument => scalar_arguments(args),
-        Function::Imconjugate => scalar_arguments(args),
-        Function::Imcos => scalar_arguments(args),
-        Function::Imcosh => scalar_arguments(args),
-        Function::Imcot => scalar_arguments(args),
-        Function::Imcsc => scalar_arguments(args),
-        Function::Imcsch => scalar_arguments(args),
-        Function::Imdiv => scalar_arguments(args),
-        Function::Imexp => scalar_arguments(args),
-        Function::Imln => scalar_arguments(args),
-        Function::Imlog10 => scalar_arguments(args),
-        Function::Imlog2 => scalar_arguments(args),
-        Function::Impower => scalar_arguments(args),
-        Function::Improduct => scalar_arguments(args),
-        Function::Imreal => scalar_arguments(args),
-        Function::Imsec => scalar_arguments(args),
-        Function::Imsech => scalar_arguments(args),
-        Function::Imsin => scalar_arguments(args),
-        Function::Imsinh => scalar_arguments(args),
-        Function::Imsqrt => scalar_arguments(args),
-        Function::Imsub => scalar_arguments(args),
-        Function::Imsum => scalar_arguments(args),
-        Function::Imtan => scalar_arguments(args),
-        Function::Convert => not_implemented(args),
-        Function::Delta => not_implemented(args),
-        Function::Gestep => not_implemented(args),
-        Function::Subtotal => not_implemented(args),
-        Function::Rand => not_implemented(args),
-        Function::Randbetween => scalar_arguments(args),
-        Function::Eomonth => scalar_arguments(args),
-        Function::Formulatext => not_implemented(args),
-        Function::Geomean => not_implemented(args),
-    }
-}

base/src/expressions/parser/stringify.rs

@@ -1,7 +1,5 @@
 use super::{super::utils::quote_name, Node, Reference};
 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::OpUnary;
 use crate::{expressions::types::CellReferenceRC, number_format::to_excel_precision_str};
 
@@ -36,21 +34,10 @@ pub enum DisplaceData {
     None,
 }
 
-/// This is the internal mode in IronCalc
 pub fn to_rc_format(node: &Node) -> String {
     stringify(node, None, &DisplaceData::None, false)
 }
 
-/// 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)
-}
-
-/// 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)
-}
-
 pub fn to_string_displaced(
     node: &Node,
     context: &CellReferenceRC,
@@ -59,10 +46,18 @@ pub fn to_string_displaced(
     stringify(node, Some(context), displace_data, false)
 }
 
+pub fn to_string(node: &Node, context: &CellReferenceRC) -> String {
+    stringify(node, Some(context), &DisplaceData::None, false)
+}
+
+pub fn to_excel_string(node: &Node, context: &CellReferenceRC) -> String {
+    stringify(node, Some(context), &DisplaceData::None, true)
+}
+
 /// Converts a local reference to a string applying some displacement if needed.
 /// It uses A1 style if context is not None. If context is None it uses R1C1 style
 /// If full_row is true then the row details will be omitted in the A1 case
-/// If full_column is true then column details will be omitted.
+/// If full_colum is true then column details will be omitted.
 pub(crate) fn stringify_reference(
     context: Option<&CellReferenceRC>,
     displace_data: &DisplaceData,
@@ -240,7 +235,7 @@ fn format_function(
     args: &Vec<Node>,
     context: Option<&CellReferenceRC>,
     displace_data: &DisplaceData,
-    export_to_excel: bool,
+    use_original_name: bool,
 ) -> String {
     let mut first = true;
     let mut arguments = "".to_string();
@@ -249,46 +244,21 @@ fn format_function(
             arguments = format!(
                 "{},{}",
                 arguments,
-                stringify(el, context, displace_data, export_to_excel)
+                stringify(el, context, displace_data, use_original_name)
             );
         } else {
             first = false;
-            arguments = stringify(el, context, displace_data, export_to_excel);
+            arguments = stringify(el, context, displace_data, use_original_name);
         }
     }
     format!("{}({})", name, arguments)
 }
 
-// There is just one representation in the AST (Abstract Syntax Tree) of a formula.
-// But three different ways to convert it to a string.
-//
-// To stringify a formula we need a "context", that is in which cell are we doing the "stringifying"
-//
-// But there are three ways to stringify a formula:
-//
-// * To show it to the IronCalc user
-// * To store internally
-// * To export to Excel
-//
-// There are, of course correspondingly three "modes" when parsing a formula.
-//
-// The internal representation is the more different as references are stored in the RC representation.
-// The the AST of the formula is kept close to this representation we don't need a context
-//
-// In the export to Excel representation certain things are different:
-// * We add a _xlfn. in front of some (more modern) functions
-// * We remove the Implicit Intersection operator when it is automatic and add _xlfn.SINGLE when it is not
-//
-// Examples:
-// * =A1+B2
-// * =RC+R1C1
-// * =A1+B1
-
 fn stringify(
     node: &Node,
     context: Option<&CellReferenceRC>,
     displace_data: &DisplaceData,
-    export_to_excel: bool,
+    use_original_name: bool,
 ) -> String {
     use self::Node::*;
     match node {
@@ -437,52 +407,52 @@ fn stringify(
         }
         OpRangeKind { left, right } => format!(
             "{}:{}",
-            stringify(left, context, displace_data, export_to_excel),
+            stringify(left, context, displace_data, use_original_name),
-            stringify(right, context, displace_data, export_to_excel)
+            stringify(right, context, displace_data, use_original_name)
         ),
         OpConcatenateKind { left, right } => format!(
             "{}&{}",
-            stringify(left, context, displace_data, export_to_excel),
+            stringify(left, context, displace_data, use_original_name),
-            stringify(right, context, displace_data, export_to_excel)
+            stringify(right, context, displace_data, use_original_name)
         ),
         CompareKind { kind, left, right } => format!(
             "{}{}{}",
-            stringify(left, context, displace_data, export_to_excel),
+            stringify(left, context, displace_data, use_original_name),
             kind,
-            stringify(right, context, displace_data, export_to_excel)
+            stringify(right, context, displace_data, use_original_name)
         ),
         OpSumKind { kind, left, right } => format!(
             "{}{}{}",
-            stringify(left, context, displace_data, export_to_excel),
+            stringify(left, context, displace_data, use_original_name),
             kind,
-            stringify(right, context, displace_data, export_to_excel)
+            stringify(right, context, displace_data, use_original_name)
         ),
         OpProductKind { kind, left, right } => {
             let x = match **left {
                 OpSumKind { .. } => format!(
                     "({})",
-                    stringify(left, context, displace_data, export_to_excel)
+                    stringify(left, context, displace_data, use_original_name)
                 ),
                 CompareKind { .. } => format!(
                     "({})",
-                    stringify(left, context, displace_data, export_to_excel)
+                    stringify(left, context, displace_data, use_original_name)
                 ),
-                _ => stringify(left, context, displace_data, export_to_excel),
+                _ => stringify(left, context, displace_data, use_original_name),
             };
             let y = match **right {
                 OpSumKind { .. } => format!(
                     "({})",
-                    stringify(right, context, displace_data, export_to_excel)
+                    stringify(right, context, displace_data, use_original_name)
                 ),
                 CompareKind { .. } => format!(
                     "({})",
-                    stringify(right, context, displace_data, export_to_excel)
+                    stringify(right, context, displace_data, use_original_name)
                 ),
                 OpProductKind { .. } => format!(
                     "({})",
-                    stringify(right, context, displace_data, export_to_excel)
+                    stringify(right, context, displace_data, use_original_name)
                 ),
-                _ => stringify(right, context, displace_data, export_to_excel),
+                _ => stringify(right, context, displace_data, use_original_name),
             };
             format!("{}{}{}", x, kind, y)
         }
@@ -497,7 +467,9 @@ fn stringify(
                 | DefinedNameKind(_)
                 | TableNameKind(_)
                 | WrongVariableKind(_)
-                | WrongRangeKind { .. } => stringify(left, context, displace_data, export_to_excel),
+                | WrongRangeKind { .. } => {
+                    stringify(left, context, displace_data, use_original_name)
+                }
                 OpRangeKind { .. }
                 | OpConcatenateKind { .. }
                 | OpProductKind { .. }
@@ -510,10 +482,9 @@ fn stringify(
                 | ParseErrorKind { .. }
                 | OpSumKind { .. }
                 | CompareKind { .. }
-                | ImplicitIntersection { .. }
                 | EmptyArgKind => format!(
                     "({})",
-                    stringify(left, context, displace_data, export_to_excel)
+                    stringify(left, context, displace_data, use_original_name)
                 ),
             };
             let y = match **right {
@@ -527,7 +498,7 @@ fn stringify(
                 | TableNameKind(_)
                 | WrongVariableKind(_)
                 | WrongRangeKind { .. } => {
-                    stringify(right, context, displace_data, export_to_excel)
+                    stringify(right, context, displace_data, use_original_name)
                 }
                 OpRangeKind { .. }
                 | OpConcatenateKind { .. }
@@ -541,63 +512,55 @@ fn stringify(
                 | ParseErrorKind { .. }
                 | OpSumKind { .. }
                 | CompareKind { .. }
-                | ImplicitIntersection { .. }
                 | EmptyArgKind => format!(
                     "({})",
-                    stringify(right, context, displace_data, export_to_excel)
+                    stringify(right, context, displace_data, use_original_name)
                 ),
             };
             format!("{}^{}", x, y)
         }
         InvalidFunctionKind { name, args } => {
-            format_function(name, args, context, displace_data, export_to_excel)
+            format_function(name, args, context, displace_data, use_original_name)
         }
         FunctionKind { kind, args } => {
-            let name = if export_to_excel {
+            let name = if use_original_name {
                 kind.to_xlsx_string()
             } else {
                 kind.to_string()
             };
-            format_function(&name, args, context, displace_data, export_to_excel)
+            format_function(&name, args, context, displace_data, use_original_name)
         }
         ArrayKind(args) => {
-            let mut first_row = true;
+            let mut first = true;
-            let mut matrix_string = String::new();
+            let mut arguments = "".to_string();
-
+            for el in args {
-            for row in args {
+                if !first {
-                if !first_row {
+                    arguments = format!(
-                    matrix_string.push(';');
+                        "{},{}",
+                        arguments,
+                        stringify(el, context, displace_data, use_original_name)
+                    );
                 } else {
-                    first_row = false;
+                    first = false;
+                    arguments = stringify(el, context, displace_data, use_original_name);
                 }
-                let mut first_column = true;
-                let mut row_string = String::new();
-                for el in row {
-                    if !first_column {
-                        row_string.push(',');
-                    } else {
-                        first_column = false;
             }
-                    row_string.push_str(&to_string_array_node(el));
+            format!("{{{}}}", arguments)
-                }
-                matrix_string.push_str(&row_string);
-            }
-            format!("{{{}}}", matrix_string)
         }
         TableNameKind(value) => value.to_string(),
-        DefinedNameKind((name, ..)) => name.to_string(),
+        DefinedNameKind((name, _)) => name.to_string(),
         WrongVariableKind(name) => name.to_string(),
         UnaryKind { kind, right } => match kind {
             OpUnary::Minus => {
                 format!(
                     "-{}",
-                    stringify(right, context, displace_data, export_to_excel)
+                    stringify(right, context, displace_data, use_original_name)
                 )
             }
             OpUnary::Percentage => {
                 format!(
                     "{}%",
-                    stringify(right, context, displace_data, export_to_excel)
+                    stringify(right, context, displace_data, use_original_name)
                 )
             }
         },
@@ -608,29 +571,6 @@ fn stringify(
             message: _,
         } => formula.to_string(),
         EmptyArgKind => "".to_string(),
-        ImplicitIntersection {
-            automatic: _,
-            child,
-        } => {
-            if export_to_excel {
-                // We need to check wether the II can be automatic or not
-                let mut new_node = child.as_ref().clone();
-
-                add_implicit_intersection(&mut new_node, true);
-                if matches!(&new_node, Node::ImplicitIntersection { .. }) {
-                    return stringify(child, context, displace_data, export_to_excel);
-                }
-
-                return format!(
-                    "_xlfn.SINGLE({})",
-                    stringify(child, context, displace_data, export_to_excel)
-                );
-            }
-            format!(
-                "@{}",
-                stringify(child, context, displace_data, export_to_excel)
-            )
-        }
     }
 }
 
@@ -718,12 +658,6 @@ pub(crate) fn rename_sheet_in_node(node: &mut Node, sheet_index: u32, new_name:
         Node::UnaryKind { kind: _, right } => {
             rename_sheet_in_node(right, sheet_index, new_name);
         }
-        Node::ImplicitIntersection {
-            automatic: _,
-            child,
-        } => {
-            rename_sheet_in_node(child, sheet_index, new_name);
-        }
 
         // Do nothing
         Node::BooleanKind(_) => {}
@@ -747,7 +681,7 @@ pub(crate) fn rename_defined_name_in_node(
 ) {
     match node {
         // Rename
-        Node::DefinedNameKind((n, s, _)) => {
+        Node::DefinedNameKind((n, s)) => {
             if name.to_lowercase() == n.to_lowercase() && *s == scope {
                 *n = new_name.to_string();
             }
@@ -802,12 +736,6 @@ pub(crate) fn rename_defined_name_in_node(
         Node::UnaryKind { kind: _, right } => {
             rename_defined_name_in_node(right, name, scope, new_name);
         }
-        Node::ImplicitIntersection {
-            automatic: _,
-            child,
-        } => {
-            rename_defined_name_in_node(child, name, scope, new_name);
-        }
 
         // Do nothing
         Node::BooleanKind(_) => {}

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

@@ -1,7 +1,4 @@
-mod test_add_implicit_intersection;
-mod test_arrays;
 mod test_general;
-mod test_implicit_intersection;
 mod test_issue_155;
 mod test_move_formula;
 mod test_ranges;

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

@@ -1,80 +0,0 @@
-use std::collections::HashMap;
-
-use crate::expressions::{
-    parser::{
-        stringify::{to_excel_string, to_string},
-        Parser,
-    },
-    types::CellReferenceRC,
-};
-
-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());
-
-    // Reference cell is Sheet1!A1
-    let cell_reference = CellReferenceRC {
-        sheet: "Sheet1".to_string(),
-        row: 1,
-        column: 1,
-    };
-    let cases = vec![
-        ("A1:A10*SUM(A1:A10)", "@A1:A10*SUM(A1:A10)"),
-        ("A1:A10", "@A1:A10"),
-        // Math and trigonometry functions
-        ("SUM(A1:A10)", "SUM(A1:A10)"),
-        ("SIN(A1:A10)", "SIN(@A1:A10)"),
-        ("COS(A1:A10)", "COS(@A1:A10)"),
-        ("TAN(A1:A10)", "TAN(@A1:A10)"),
-        ("ASIN(A1:A10)", "ASIN(@A1:A10)"),
-        ("ACOS(A1:A10)", "ACOS(@A1:A10)"),
-        ("ATAN(A1:A10)", "ATAN(@A1:A10)"),
-        ("SINH(A1:A10)", "SINH(@A1:A10)"),
-        ("COSH(A1:A10)", "COSH(@A1:A10)"),
-        ("TANH(A1:A10)", "TANH(@A1:A10)"),
-        ("ASINH(A1:A10)", "ASINH(@A1:A10)"),
-        ("ACOSH(A1:A10)", "ACOSH(@A1:A10)"),
-        ("ATANH(A1:A10)", "ATANH(@A1:A10)"),
-        ("ATAN2(A1:A10,B1:B10)", "ATAN2(@A1:A10,@B1:B10)"),
-        ("ATAN2(A1:A10,A1)", "ATAN2(@A1:A10,A1)"),
-        ("SQRT(A1:A10)", "SQRT(@A1:A10)"),
-        ("SQRTPI(A1:A10)", "SQRTPI(@A1:A10)"),
-        ("POWER(A1:A10,A1)", "POWER(@A1:A10,A1)"),
-        ("POWER(A1:A10,B1:B10)", "POWER(@A1:A10,@B1:B10)"),
-        ("MAX(A1:A10)", "MAX(A1:A10)"),
-        ("MIN(A1:A10)", "MIN(A1:A10)"),
-        ("ABS(A1:A10)", "ABS(@A1:A10)"),
-        ("FALSE()", "FALSE()"),
-        ("TRUE()", "TRUE()"),
-        // Defined names
-        ("BADNMAE", "@BADNMAE"),
-        // Logical
-        ("AND(A1:A10)", "AND(A1:A10)"),
-        ("OR(A1:A10)", "OR(A1:A10)"),
-        ("NOT(A1:A10)", "NOT(@A1:A10)"),
-        ("IF(A1:A10,B1:B10,C1:C10)", "IF(@A1:A10,@B1:B10,@C1:C10)"),
-        // Information
-        // ("ISBLANK(A1:A10)", "ISBLANK(A1:A10)"),
-        // ("ISERR(A1:A10)", "ISERR(A1:A10)"),
-        // ("ISERROR(A1:A10)", "ISERROR(A1:A10)"),
-        // ("ISEVEN(A1:A10)", "ISEVEN(A1:A10)"),
-        // ("ISLOGICAL(A1:A10)", "ISLOGICAL(A1:A10)"),
-        // ("ISNA(A1:A10)", "ISNA(A1:A10)"),
-        // ("ISNONTEXT(A1:A10)", "ISNONTEXT(A1:A10)"),
-        // ("ISNUMBER(A1:A10)", "ISNUMBER(A1:A10)"),
-        // ("ISODD(A1:A10)", "ISODD(A1:A10)"),
-        // ("ISREF(A1:A10)", "ISREF(A1:A10)"),
-        // ("ISTEXT(A1:A10)", "ISTEXT(A1:A10)"),
-    ];
-    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);
-        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

@@ -1,92 +0,0 @@
-#![allow(clippy::panic)]
-
-use std::collections::HashMap;
-
-use crate::expressions::parser::stringify::{to_rc_format, to_string};
-use crate::expressions::parser::{ArrayNode, Node, Parser};
-use crate::expressions::types::CellReferenceRC;
-
-#[test]
-fn simple_horizontal() {
-    let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
-
-    // Reference cell is Sheet1!A1
-    let cell_reference = CellReferenceRC {
-        sheet: "Sheet1".to_string(),
-        row: 1,
-        column: 1,
-    };
-    let horizontal = parser.parse("{1, 2, 3}", &cell_reference);
-    assert_eq!(
-        horizontal,
-        Node::ArrayKind(vec![vec![
-            ArrayNode::Number(1.0),
-            ArrayNode::Number(2.0),
-            ArrayNode::Number(3.0)
-        ]])
-    );
-
-    assert_eq!(to_rc_format(&horizontal), "{1,2,3}");
-    assert_eq!(to_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());
-
-    // Reference cell is Sheet1!A1
-    let cell_reference = CellReferenceRC {
-        sheet: "Sheet1".to_string(),
-        row: 1,
-        column: 1,
-    };
-    let vertical = parser.parse("{1;2; 3}", &cell_reference);
-    assert_eq!(
-        vertical,
-        Node::ArrayKind(vec![
-            vec![ArrayNode::Number(1.0)],
-            vec![ArrayNode::Number(2.0)],
-            vec![ArrayNode::Number(3.0)]
-        ])
-    );
-    assert_eq!(to_rc_format(&vertical), "{1;2;3}");
-    assert_eq!(to_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());
-
-    // Reference cell is Sheet1!A1
-    let cell_reference = CellReferenceRC {
-        sheet: "Sheet1".to_string(),
-        row: 1,
-        column: 1,
-    };
-    let matrix = parser.parse("{1,2,3; 4, 5, 6; 7,8,9}", &cell_reference);
-    assert_eq!(
-        matrix,
-        Node::ArrayKind(vec![
-            vec![
-                ArrayNode::Number(1.0),
-                ArrayNode::Number(2.0),
-                ArrayNode::Number(3.0)
-            ],
-            vec![
-                ArrayNode::Number(4.0),
-                ArrayNode::Number(5.0),
-                ArrayNode::Number(6.0)
-            ],
-            vec![
-                ArrayNode::Number(7.0),
-                ArrayNode::Number(8.0),
-                ArrayNode::Number(9.0)
-            ]
-        ])
-    );
-    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}");
-}

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

@@ -1,75 +0,0 @@
-#![allow(clippy::panic)]
-
-use crate::expressions::parser::{Node, Parser};
-use crate::expressions::types::CellReferenceRC;
-use std::collections::HashMap;
-
-#[test]
-fn simple() {
-    let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
-
-    // Reference cell is Sheet1!B3
-    let cell_reference = CellReferenceRC {
-        sheet: "Sheet1".to_string(),
-        row: 3,
-        column: 2,
-    };
-    let t = parser.parse("@A1:A10", &cell_reference);
-    let child = Node::RangeKind {
-        sheet_name: None,
-        sheet_index: 0,
-        absolute_row1: false,
-        absolute_column1: false,
-        row1: -2,
-        column1: -1,
-        absolute_row2: false,
-        absolute_column2: false,
-        row2: 7,
-        column2: -1,
-    };
-    assert_eq!(
-        t,
-        Node::ImplicitIntersection {
-            automatic: false,
-            child: Box::new(child)
-        }
-    )
-}
-
-#[test]
-fn simple_add() {
-    let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
-
-    // Reference cell is Sheet1!B3
-    let cell_reference = CellReferenceRC {
-        sheet: "Sheet1".to_string(),
-        row: 3,
-        column: 2,
-    };
-    let t = parser.parse("@A1:A10+12", &cell_reference);
-    let child = Node::RangeKind {
-        sheet_name: None,
-        sheet_index: 0,
-        absolute_row1: false,
-        absolute_column1: false,
-        row1: -2,
-        column1: -1,
-        absolute_row2: false,
-        absolute_column2: false,
-        row2: 7,
-        column2: -1,
-    };
-    assert_eq!(
-        t,
-        Node::OpSumKind {
-            kind: crate::expressions::token::OpSum::Add,
-            left: Box::new(Node::ImplicitIntersection {
-                automatic: false,
-                child: Box::new(child)
-            }),
-            right: Box::new(Node::NumberKind(12.0))
-        }
-    )
-}

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

@@ -387,7 +387,7 @@ fn test_move_formula_misc() {
         width: 4,
         height: 5,
     };
-    let node = parser.parse("X9^C2-F4*H2+SUM(F2:H4)+SUM(C2:F6)", context);
+    let node = parser.parse("X9^C2-F4*H2", context);
     let t = move_formula(
         &node,
         &MoveContext {
@@ -400,7 +400,7 @@ fn test_move_formula_misc() {
             column_delta: 10,
         },
     );
-    assert_eq!(t, "X9^M12-P14*H2+SUM(F2:H4)+SUM(M12:P16)");
+    assert_eq!(t, "X9^M12-P14*H2");
 
     let node = parser.parse("F5*(-D5)*SUM(A1, X9, $D$5)", context);
     let t = move_formula(
@@ -475,77 +475,3 @@ fn test_move_formula_another_sheet() {
         "Sheet1!AB31*SUM(Sheet1!JJ3:JJ4)+SUM(Sheet2!C2:F6)*SUM(M12:P16)"
     );
 }
-
-#[test]
-fn move_formula_implicit_intersetion() {
-    // context is E4
-    let row = 4;
-    let column = 5;
-    let context = &CellReferenceRC {
-        sheet: "Sheet1".to_string(),
-        row,
-        column,
-    };
-    let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
-
-    // Area is C2:F6
-    let area = &Area {
-        sheet: 0,
-        row: 2,
-        column: 3,
-        width: 4,
-        height: 5,
-    };
-    let node = parser.parse("SUM(@F2:H4)+SUM(@C2:F6)", context);
-    let t = move_formula(
-        &node,
-        &MoveContext {
-            source_sheet_name: "Sheet1",
-            row,
-            column,
-            area,
-            target_sheet_name: "Sheet1",
-            row_delta: 10,
-            column_delta: 10,
-        },
-    );
-    assert_eq!(t, "SUM(@F2:H4)+SUM(@M12:P16)");
-}
-
-#[test]
-fn move_formula_implicit_intersetion_with_ranges() {
-    // context is E4
-    let row = 4;
-    let column = 5;
-    let context = &CellReferenceRC {
-        sheet: "Sheet1".to_string(),
-        row,
-        column,
-    };
-    let worksheets = vec!["Sheet1".to_string()];
-    let mut parser = Parser::new(worksheets, vec![], HashMap::new());
-
-    // Area is C2:F6
-    let area = &Area {
-        sheet: 0,
-        row: 2,
-        column: 3,
-        width: 4,
-        height: 5,
-    };
-    let node = parser.parse("SUM(@F2:H4)+SUM(@C2:F6)+SUM(@A1, @X9, @$D$5)", context);
-    let t = move_formula(
-        &node,
-        &MoveContext {
-            source_sheet_name: "Sheet1",
-            row,
-            column,
-            area,
-            target_sheet_name: "Sheet1",
-            row_delta: 10,
-            column_delta: 10,
-        },
-    );
-    assert_eq!(t, "SUM(@F2:H4)+SUM(@M12:P16)+SUM(@A1,@X9,@$N$15)");
-}

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

@@ -3,11 +3,12 @@
 use std::collections::HashMap;
 
 use crate::expressions::parser::stringify::to_string;
-use crate::expressions::parser::Parser;
-use crate::expressions::types::CellReferenceRC;
 use crate::expressions::utils::{number_to_column, parse_reference_a1};
 use crate::types::{Table, TableColumn, TableStyleInfo};
 
+use crate::expressions::parser::Parser;
+use crate::expressions::types::CellReferenceRC;
+
 fn create_test_table(
     table_name: &str,
     column_names: &[&str],

base/src/expressions/parser/walk.rs

@@ -0,0 +1,278 @@
+use super::{move_formula::ref_is_in_area, Node};
+
+use crate::expressions::types::{Area, CellReferenceIndex};
+
+pub(crate) fn forward_references(
+    node: &mut Node,
+    context: &CellReferenceIndex,
+    source_area: &Area,
+    target_sheet: u32,
+    target_sheet_name: &str,
+    target_row: i32,
+    target_column: i32,
+) {
+    match node {
+        Node::ReferenceKind {
+            sheet_name,
+            sheet_index: reference_sheet,
+            absolute_row,
+            absolute_column,
+            row: reference_row,
+            column: reference_column,
+        } => {
+            let reference_row_absolute = if *absolute_row {
+                *reference_row
+            } else {
+                *reference_row + context.row
+            };
+            let reference_column_absolute = if *absolute_column {
+                *reference_column
+            } else {
+                *reference_column + context.column
+            };
+            if ref_is_in_area(
+                *reference_sheet,
+                reference_row_absolute,
+                reference_column_absolute,
+                source_area,
+            ) {
+                if *reference_sheet != target_sheet {
+                    *sheet_name = Some(target_sheet_name.to_string());
+                    *reference_sheet = target_sheet;
+                }
+                *reference_row = target_row + *reference_row - source_area.row;
+                *reference_column = target_column + *reference_column - source_area.column;
+            }
+        }
+        Node::RangeKind {
+            sheet_name,
+            sheet_index,
+            absolute_row1,
+            absolute_column1,
+            row1,
+            column1,
+            absolute_row2,
+            absolute_column2,
+            row2,
+            column2,
+        } => {
+            let reference_row1 = if *absolute_row1 {
+                *row1
+            } else {
+                *row1 + context.row
+            };
+            let reference_column1 = if *absolute_column1 {
+                *column1
+            } else {
+                *column1 + context.column
+            };
+
+            let reference_row2 = if *absolute_row2 {
+                *row2
+            } else {
+                *row2 + context.row
+            };
+            let reference_column2 = if *absolute_column2 {
+                *column2
+            } else {
+                *column2 + context.column
+            };
+            if ref_is_in_area(*sheet_index, reference_row1, reference_column1, source_area)
+                && ref_is_in_area(*sheet_index, reference_row2, reference_column2, source_area)
+            {
+                if *sheet_index != target_sheet {
+                    *sheet_index = target_sheet;
+                    *sheet_name = Some(target_sheet_name.to_string());
+                }
+                *row1 = target_row + *row1 - source_area.row;
+                *column1 = target_column + *column1 - source_area.column;
+                *row2 = target_row + *row2 - source_area.row;
+                *column2 = target_column + *column2 - source_area.column;
+            }
+        }
+        // Recurse
+        Node::OpRangeKind { left, right } => {
+            forward_references(
+                left,
+                context,
+                source_area,
+                target_sheet,
+                target_sheet_name,
+                target_row,
+                target_column,
+            );
+            forward_references(
+                right,
+                context,
+                source_area,
+                target_sheet,
+                target_sheet_name,
+                target_row,
+                target_column,
+            );
+        }
+        Node::OpConcatenateKind { left, right } => {
+            forward_references(
+                left,
+                context,
+                source_area,
+                target_sheet,
+                target_sheet_name,
+                target_row,
+                target_column,
+            );
+            forward_references(
+                right,
+                context,
+                source_area,
+                target_sheet,
+                target_sheet_name,
+                target_row,
+                target_column,
+            );
+        }
+        Node::OpSumKind {
+            kind: _,
+            left,
+            right,
+        } => {
+            forward_references(
+                left,
+                context,
+                source_area,
+                target_sheet,
+                target_sheet_name,
+                target_row,
+                target_column,
+            );
+            forward_references(
+                right,
+                context,
+                source_area,
+                target_sheet,
+                target_sheet_name,
+                target_row,
+                target_column,
+            );
+        }
+        Node::OpProductKind {
+            kind: _,
+            left,
+            right,
+        } => {
+            forward_references(
+                left,
+                context,
+                source_area,
+                target_sheet,
+                target_sheet_name,
+                target_row,
+                target_column,
+            );
+            forward_references(
+                right,
+                context,
+                source_area,
+                target_sheet,
+                target_sheet_name,
+                target_row,
+                target_column,
+            );
+        }
+        Node::OpPowerKind { left, right } => {
+            forward_references(
+                left,
+                context,
+                source_area,
+                target_sheet,
+                target_sheet_name,
+                target_row,
+                target_column,
+            );
+            forward_references(
+                right,
+                context,
+                source_area,
+                target_sheet,
+                target_sheet_name,
+                target_row,
+                target_column,
+            );
+        }
+        Node::FunctionKind { kind: _, args } => {
+            for arg in args {
+                forward_references(
+                    arg,
+                    context,
+                    source_area,
+                    target_sheet,
+                    target_sheet_name,
+                    target_row,
+                    target_column,
+                );
+            }
+        }
+        Node::InvalidFunctionKind { name: _, args } => {
+            for arg in args {
+                forward_references(
+                    arg,
+                    context,
+                    source_area,
+                    target_sheet,
+                    target_sheet_name,
+                    target_row,
+                    target_column,
+                );
+            }
+        }
+        Node::CompareKind {
+            kind: _,
+            left,
+            right,
+        } => {
+            forward_references(
+                left,
+                context,
+                source_area,
+                target_sheet,
+                target_sheet_name,
+                target_row,
+                target_column,
+            );
+            forward_references(
+                right,
+                context,
+                source_area,
+                target_sheet,
+                target_sheet_name,
+                target_row,
+                target_column,
+            );
+        }
+        Node::UnaryKind { kind: _, right } => {
+            forward_references(
+                right,
+                context,
+                source_area,
+                target_sheet,
+                target_sheet_name,
+                target_row,
+                target_column,
+            );
+        }
+        // TODO: Not implemented
+        Node::ArrayKind(_) => {}
+        // Do nothing. Note: we could do a blanket _ => {}
+        Node::DefinedNameKind(_) => {}
+        Node::TableNameKind(_) => {}
+        Node::WrongVariableKind(_) => {}
+        Node::ErrorKind(_) => {}
+        Node::ParseErrorKind { .. } => {}
+        Node::EmptyArgKind => {}
+        Node::BooleanKind(_) => {}
+        Node::NumberKind(_) => {}
+        Node::StringKind(_) => {}
+        Node::WrongReferenceKind { .. } => {}
+        Node::WrongRangeKind { .. } => {}
+    }
+}

base/src/expressions/token.rs

@@ -197,7 +197,7 @@ pub fn is_english_error_string(name: &str) -> bool {
         "#REF!", "#NAME?", "#VALUE!", "#DIV/0!", "#N/A", "#NUM!", "#ERROR!", "#N/IMPL!", "#SPILL!",
         "#CALC!", "#CIRC!", "#NULL!",
     ];
-    names.contains(&name)
+    names.iter().any(|e| *e == name)
 }
 
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
@@ -240,7 +240,6 @@ pub enum TokenType {
     Bang,               // !
     Percent,            // %
     And,                // &
-    At,                 // @
     Reference {
         sheet: Option<String>,
         row: i32,

base/src/formatter/lexer.rs

@@ -178,7 +178,10 @@ impl Lexer {
             }
         }
         self.position = position;
-        chars.parse::<f64>().ok()
+        match chars.parse::<f64>() {
+            Err(_) => None,
+            Ok(v) => Some(v),
+        }
     }
 
     fn consume_condition(&mut self) -> Option<(Compare, f64)> {

base/src/functions/information.rs

@@ -235,11 +235,6 @@ impl Model {
                 // This cannot happen
                 CalcResult::Number(1.0)
             }
-            CalcResult::Array(_) => CalcResult::Error {
-                error: Error::NIMPL,
-                origin: cell,
-                message: "Arrays not supported yet".to_string(),
-            },
         }
     }
     pub(crate) fn fn_sheet(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
@@ -254,7 +249,7 @@ impl Model {
         // The arg could be a defined name or a table
         // let  = &args[0];
         match &args[0] {
-            Node::DefinedNameKind((name, scope, _)) => {
+            Node::DefinedNameKind((name, scope)) => {
                 // Let's see if it is a defined name
                 if let Some(defined_name) = self
                     .parsed_defined_names

base/src/functions/logical.rs

@@ -161,13 +161,6 @@ impl Model {
                                 CalcResult::Range { .. }
                                 | CalcResult::String { .. }
                                 | CalcResult::EmptyCell => {}
-                                CalcResult::Array(_) => {
-                                    return CalcResult::Error {
-                                        error: Error::NIMPL,
-                                        origin: cell,
-                                        message: "Arrays not supported yet".to_string(),
-                                    }
-                                }
                             }
                             if let (Some(current_result), Some(short_circuit_value)) =
                                 (result, short_circuit_value)
@@ -192,13 +185,6 @@ impl Model {
                 }
                 // References to empty cells are ignored. If all args are ignored the result is #VALUE!
                 CalcResult::EmptyCell => {}
-                CalcResult::Array(_) => {
-                    return CalcResult::Error {
-                        error: Error::NIMPL,
-                        origin: cell,
-                        message: "Arrays not supported yet".to_string(),
-                    }
-                }
             }
 
             if let (Some(current_result), Some(short_circuit_value)) = (result, short_circuit_value)

base/src/functions/lookup_and_reference.rs

@@ -855,7 +855,7 @@ impl Model {
             if left.row != right.row || left.column != right.column {
                 // FIXME: Implicit intersection or dynamic arrays
                 return CalcResult::Error {
-                    error: Error::NIMPL,
+                    error: Error::ERROR,
                     origin: cell,
                     message: "argument must be a reference to a single cell".to_string(),
                 };

base/src/functions/macros.rs

@@ -1,100 +0,0 @@
-#[macro_export]
-macro_rules! single_number_fn {
-    // The macro takes:
-    //   1) A function name to define (e.g. fn_sin)
-    //   2) The operation to apply (e.g. f64::sin)
-    ($fn_name:ident, $op:expr) => {
-        pub(crate) fn $fn_name(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-            // 1) Check exactly one argument
-            if args.len() != 1 {
-                return CalcResult::new_args_number_error(cell);
-            }
-            // 2) Try to get a "NumberOrArray"
-            match self.get_number_or_array(&args[0], cell) {
-                // -----------------------------------------
-                // Case A: It's a single number
-                // -----------------------------------------
-                Ok(NumberOrArray::Number(f)) => match $op(f) {
-                    Ok(x) => CalcResult::Number(x),
-                    Err(Error::DIV) => CalcResult::Error {
-                        error: Error::DIV,
-                        origin: cell,
-                        message: "Divide by 0".to_string(),
-                    },
-                    Err(Error::VALUE) => CalcResult::Error {
-                        error: Error::VALUE,
-                        origin: cell,
-                        message: "Invalid number".to_string(),
-                    },
-                    Err(e) => CalcResult::Error {
-                        error: e,
-                        origin: cell,
-                        message: "Unknown error".to_string(),
-                    },
-                },
-
-                // -----------------------------------------
-                // Case B: It's an array, so apply $op
-                // element-by-element.
-                // -----------------------------------------
-                Ok(NumberOrArray::Array(a)) => {
-                    let mut array = Vec::new();
-                    for row in a {
-                        let mut data_row = Vec::with_capacity(row.len());
-                        for value in row {
-                            match value {
-                                // If Boolean, treat as 0.0 or 1.0
-                                ArrayNode::Boolean(b) => {
-                                    let n = if b { 1.0 } else { 0.0 };
-                                    match $op(n) {
-                                        Ok(x) => data_row.push(ArrayNode::Number(x)),
-                                        Err(Error::DIV) => {
-                                            data_row.push(ArrayNode::Error(Error::DIV))
-                                        }
-                                        Err(Error::VALUE) => {
-                                            data_row.push(ArrayNode::Error(Error::VALUE))
-                                        }
-                                        Err(e) => data_row.push(ArrayNode::Error(e)),
-                                    }
-                                }
-                                // If Number, apply directly
-                                ArrayNode::Number(n) => match $op(n) {
-                                    Ok(x) => data_row.push(ArrayNode::Number(x)),
-                                    Err(Error::DIV) => data_row.push(ArrayNode::Error(Error::DIV)),
-                                    Err(Error::VALUE) => {
-                                        data_row.push(ArrayNode::Error(Error::VALUE))
-                                    }
-                                    Err(e) => data_row.push(ArrayNode::Error(e)),
-                                },
-                                // If String, parse to f64 then apply or #VALUE! error
-                                ArrayNode::String(s) => {
-                                    let node = match s.parse::<f64>() {
-                                        Ok(f) => match $op(f) {
-                                            Ok(x) => ArrayNode::Number(x),
-                                            Err(Error::DIV) => ArrayNode::Error(Error::DIV),
-                                            Err(Error::VALUE) => ArrayNode::Error(Error::VALUE),
-                                            Err(e) => ArrayNode::Error(e),
-                                        },
-                                        Err(_) => ArrayNode::Error(Error::VALUE),
-                                    };
-                                    data_row.push(node);
-                                }
-                                // If Error, propagate the error
-                                e @ ArrayNode::Error(_) => {
-                                    data_row.push(e);
-                                }
-                            }
-                        }
-                        array.push(data_row);
-                    }
-                    CalcResult::Array(array)
-                }
-
-                // -----------------------------------------
-                // Case C: It's an Error => just return it
-                // -----------------------------------------
-                Err(err_result) => err_result,
-            }
-        }
-    };
-}

base/src/functions/mathematical.rs

@@ -1,8 +1,5 @@
-use crate::cast::NumberOrArray;
 use crate::constants::{LAST_COLUMN, LAST_ROW};
-use crate::expressions::parser::ArrayNode;
 use crate::expressions::types::CellReferenceIndex;
-use crate::single_number_fn;
 use crate::{
     calc_result::CalcResult, expressions::parser::Node, expressions::token::Error, model::Model,
 };
@@ -172,27 +169,6 @@ impl Model {
                         }
                     }
                 }
-                CalcResult::Array(array) => {
-                    for row in array {
-                        for value in row {
-                            match value {
-                                ArrayNode::Number(value) => {
-                                    result += 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
@@ -378,29 +354,187 @@ impl Model {
         }
     }
 
-    single_number_fn!(fn_sin, |f| Ok(f64::sin(f)));
+    pub(crate) fn fn_sin(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-    single_number_fn!(fn_cos, |f| Ok(f64::cos(f)));
+        if args.len() != 1 {
-    single_number_fn!(fn_tan, |f| Ok(f64::tan(f)));
+            return CalcResult::new_args_number_error(cell);
-    single_number_fn!(fn_sinh, |f| Ok(f64::sinh(f)));
+        }
-    single_number_fn!(fn_cosh, |f| Ok(f64::cosh(f)));
+        let value = match self.get_number(&args[0], cell) {
-    single_number_fn!(fn_tanh, |f| Ok(f64::tanh(f)));
+            Ok(f) => f,
-    single_number_fn!(fn_asin, |f| Ok(f64::asin(f)));
+            Err(s) => return s,
-    single_number_fn!(fn_acos, |f| Ok(f64::acos(f)));
+        };
-    single_number_fn!(fn_atan, |f| Ok(f64::atan(f)));
+        let result = value.sin();
-    single_number_fn!(fn_asinh, |f| Ok(f64::asinh(f)));
+        CalcResult::Number(result)
-    single_number_fn!(fn_acosh, |f| Ok(f64::acosh(f)));
+    }
-    single_number_fn!(fn_atanh, |f| Ok(f64::atanh(f)));
+    pub(crate) fn fn_cos(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
-    single_number_fn!(fn_abs, |f| Ok(f64::abs(f)));
+        if args.len() != 1 {
-    single_number_fn!(fn_sqrt, |f| if f < 0.0 {
+            return CalcResult::new_args_number_error(cell);
-        Err(Error::NUM)
+        }
-    } else {
+        let value = match self.get_number(&args[0], cell) {
-        Ok(f64::sqrt(f))
+            Ok(f) => f,
-    });
+            Err(s) => return s,
-    single_number_fn!(fn_sqrtpi, |f: f64| if f < 0.0 {
+        };
-        Err(Error::NUM)
+        let result = value.cos();
-    } else {
+        CalcResult::Number(result)
-        Ok((f * PI).sqrt())
+    }
-    });
+
+    pub(crate) fn fn_tan(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        if args.len() != 1 {
+            return CalcResult::new_args_number_error(cell);
+        }
+        let value = match self.get_number(&args[0], cell) {
+            Ok(f) => f,
+            Err(s) => return s,
+        };
+        let result = value.tan();
+        CalcResult::Number(result)
+    }
+
+    pub(crate) fn fn_sinh(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        if args.len() != 1 {
+            return CalcResult::new_args_number_error(cell);
+        }
+        let value = match self.get_number(&args[0], cell) {
+            Ok(f) => f,
+            Err(s) => return s,
+        };
+        let result = value.sinh();
+        CalcResult::Number(result)
+    }
+    pub(crate) fn fn_cosh(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        if args.len() != 1 {
+            return CalcResult::new_args_number_error(cell);
+        }
+        let value = match self.get_number(&args[0], cell) {
+            Ok(f) => f,
+            Err(s) => return s,
+        };
+        let result = value.cosh();
+        CalcResult::Number(result)
+    }
+
+    pub(crate) fn fn_tanh(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        if args.len() != 1 {
+            return CalcResult::new_args_number_error(cell);
+        }
+        let value = match self.get_number(&args[0], cell) {
+            Ok(f) => f,
+            Err(s) => return s,
+        };
+        let result = value.tanh();
+        CalcResult::Number(result)
+    }
+
+    pub(crate) fn fn_asin(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        if args.len() != 1 {
+            return CalcResult::new_args_number_error(cell);
+        }
+        let value = match self.get_number(&args[0], cell) {
+            Ok(f) => f,
+            Err(s) => return s,
+        };
+        let result = value.asin();
+        if result.is_nan() || result.is_infinite() {
+            return CalcResult::Error {
+                error: Error::NUM,
+                origin: cell,
+                message: "Invalid argument for ASIN".to_string(),
+            };
+        }
+        CalcResult::Number(result)
+    }
+    pub(crate) fn fn_acos(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        if args.len() != 1 {
+            return CalcResult::new_args_number_error(cell);
+        }
+        let value = match self.get_number(&args[0], cell) {
+            Ok(f) => f,
+            Err(s) => return s,
+        };
+        let result = value.acos();
+        if result.is_nan() || result.is_infinite() {
+            return CalcResult::Error {
+                error: Error::NUM,
+                origin: cell,
+                message: "Invalid argument for COS".to_string(),
+            };
+        }
+        CalcResult::Number(result)
+    }
+
+    pub(crate) fn fn_atan(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        if args.len() != 1 {
+            return CalcResult::new_args_number_error(cell);
+        }
+        let value = match self.get_number(&args[0], cell) {
+            Ok(f) => f,
+            Err(s) => return s,
+        };
+        let result = value.atan();
+        if result.is_nan() || result.is_infinite() {
+            return CalcResult::Error {
+                error: Error::NUM,
+                origin: cell,
+                message: "Invalid argument for ATAN".to_string(),
+            };
+        }
+        CalcResult::Number(result)
+    }
+
+    pub(crate) fn fn_asinh(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        if args.len() != 1 {
+            return CalcResult::new_args_number_error(cell);
+        }
+        let value = match self.get_number(&args[0], cell) {
+            Ok(f) => f,
+            Err(s) => return s,
+        };
+        let result = value.asinh();
+        if result.is_nan() || result.is_infinite() {
+            return CalcResult::Error {
+                error: Error::NUM,
+                origin: cell,
+                message: "Invalid argument for ASINH".to_string(),
+            };
+        }
+        CalcResult::Number(result)
+    }
+    pub(crate) fn fn_acosh(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        if args.len() != 1 {
+            return CalcResult::new_args_number_error(cell);
+        }
+        let value = match self.get_number(&args[0], cell) {
+            Ok(f) => f,
+            Err(s) => return s,
+        };
+        let result = value.acosh();
+        if result.is_nan() || result.is_infinite() {
+            return CalcResult::Error {
+                error: Error::NUM,
+                origin: cell,
+                message: "Invalid argument for ACOSH".to_string(),
+            };
+        }
+        CalcResult::Number(result)
+    }
+
+    pub(crate) fn fn_atanh(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        if args.len() != 1 {
+            return CalcResult::new_args_number_error(cell);
+        }
+        let value = match self.get_number(&args[0], cell) {
+            Ok(f) => f,
+            Err(s) => return s,
+        };
+        let result = value.atanh();
+        if result.is_nan() || result.is_infinite() {
+            return CalcResult::Error {
+                error: Error::NUM,
+                origin: cell,
+                message: "Invalid argument for ATANH".to_string(),
+            };
+        }
+        CalcResult::Number(result)
+    }
 
     pub(crate) fn fn_pi(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
         if !args.is_empty() {
@@ -409,6 +543,53 @@ impl Model {
         CalcResult::Number(PI)
     }
 
+    pub(crate) fn fn_abs(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        if args.len() != 1 {
+            return CalcResult::new_args_number_error(cell);
+        }
+        let value = match self.get_number(&args[0], cell) {
+            Ok(f) => f,
+            Err(s) => return s,
+        };
+        CalcResult::Number(value.abs())
+    }
+
+    pub(crate) fn fn_sqrtpi(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        if args.len() != 1 {
+            return CalcResult::new_args_number_error(cell);
+        }
+        let value = match self.get_number(&args[0], cell) {
+            Ok(f) => f,
+            Err(s) => return s,
+        };
+        if value < 0.0 {
+            return CalcResult::Error {
+                error: Error::NUM,
+                origin: cell,
+                message: "Argument of SQRTPI should be >= 0".to_string(),
+            };
+        }
+        CalcResult::Number((value * PI).sqrt())
+    }
+
+    pub(crate) fn fn_sqrt(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
+        if args.len() != 1 {
+            return CalcResult::new_args_number_error(cell);
+        }
+        let value = match self.get_number(&args[0], cell) {
+            Ok(f) => f,
+            Err(s) => return s,
+        };
+        if value < 0.0 {
+            return CalcResult::Error {
+                error: Error::NUM,
+                origin: cell,
+                message: "Argument of SQRT should be >= 0".to_string(),
+            };
+        }
+        CalcResult::Number(value.sqrt())
+    }
+
     pub(crate) fn fn_atan2(&mut self, args: &[Node], cell: CellReferenceIndex) -> CalcResult {
         if args.len() != 2 {
             return CalcResult::new_args_number_error(cell);

base/src/functions/mod.rs

@@ -15,7 +15,6 @@ mod financial_util;
 mod information;
 mod logical;
 mod lookup_and_reference;
-mod macros;
 mod mathematical;
 mod statistical;
 mod subtotal;

base/src/functions/statistical.rs

@@ -134,13 +134,6 @@ impl Model {
                                     );
                                 }
                                 CalcResult::EmptyCell | CalcResult::EmptyArg => {}
-                                CalcResult::Array(_) => {
-                                    return CalcResult::Error {
-                                        error: Error::NIMPL,
-                                        origin: cell,
-                                        message: "Arrays not supported yet".to_string(),
-                                    }
-                                }
                             }
                         }
                     }
@@ -172,13 +165,6 @@ impl Model {
                 }
                 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 {

base/src/functions/subtotal.rs

@@ -182,13 +182,6 @@ impl Model {
                             }
                         }
                         CalcResult::EmptyCell | CalcResult::EmptyArg => result.push(0.0),
-                        CalcResult::Array(_) => {
-                            return Err(CalcResult::Error {
-                                error: Error::NIMPL,
-                                origin: cell,
-                                message: "Arrays not supported yet".to_string(),
-                            })
-                        }
                     }
                 }
             }
@@ -433,13 +426,6 @@ impl Model {
                         | CalcResult::Number(_)
                         | CalcResult::Boolean(_)
                         | CalcResult::Error { .. } => counta += 1,
-                        CalcResult::Array(_) => {
-                            return CalcResult::Error {
-                                error: Error::NIMPL,
-                                origin: cell,
-                                message: "Arrays not supported yet".to_string(),
-                            }
-                        }
                     }
                 }
             }

base/src/functions/text.rs

@@ -97,24 +97,10 @@ impl Model {
                                 error @ CalcResult::Error { .. } => return error,
                                 CalcResult::EmptyCell | CalcResult::EmptyArg => {}
                                 CalcResult::Range { .. } => {}
-                                CalcResult::Array(_) => {
-                                    return CalcResult::Error {
-                                        error: Error::NIMPL,
-                                        origin: cell,
-                                        message: "Arrays not supported yet".to_string(),
                             }
                         }
                     }
                 }
-                    }
-                }
-                CalcResult::Array(_) => {
-                    return CalcResult::Error {
-                        error: Error::NIMPL,
-                        origin: cell,
-                        message: "Arrays not supported yet".to_string(),
-                    }
-                }
             };
         }
         CalcResult::String(result)
@@ -139,13 +125,6 @@ impl Model {
                     };
                 }
                 CalcResult::EmptyCell | CalcResult::EmptyArg => 0.0,
-                CalcResult::Array(_) => {
-                    return CalcResult::Error {
-                        error: Error::NIMPL,
-                        origin: cell,
-                        message: "Arrays not supported yet".to_string(),
-                    }
-                }
             };
             let format_code = match self.get_string(&args[1], cell) {
                 Ok(s) => s,
@@ -301,13 +280,6 @@ impl Model {
                     };
                 }
                 CalcResult::EmptyCell | CalcResult::EmptyArg => "".to_string(),
-                CalcResult::Array(_) => {
-                    return CalcResult::Error {
-                        error: Error::NIMPL,
-                        origin: cell,
-                        message: "Arrays not supported yet".to_string(),
-                    }
-                }
             };
             return CalcResult::Number(s.chars().count() as f64);
         }
@@ -336,13 +308,6 @@ impl Model {
                     };
                 }
                 CalcResult::EmptyCell | CalcResult::EmptyArg => "".to_string(),
-                CalcResult::Array(_) => {
-                    return CalcResult::Error {
-                        error: Error::NIMPL,
-                        origin: cell,
-                        message: "Arrays not supported yet".to_string(),
-                    }
-                }
             };
             return CalcResult::String(s.trim().to_owned());
         }
@@ -371,13 +336,6 @@ impl Model {
                     };
                 }
                 CalcResult::EmptyCell | CalcResult::EmptyArg => "".to_string(),
-                CalcResult::Array(_) => {
-                    return CalcResult::Error {
-                        error: Error::NIMPL,
-                        origin: cell,
-                        message: "Arrays not supported yet".to_string(),
-                    }
-                }
             };
             return CalcResult::String(s.to_lowercase());
         }
@@ -412,13 +370,6 @@ impl Model {
                         message: "Empty cell".to_string(),
                     }
                 }
-                CalcResult::Array(_) => {
-                    return CalcResult::Error {
-                        error: Error::NIMPL,
-                        origin: cell,
-                        message: "Arrays not supported yet".to_string(),
-                    }
-                }
             };
 
             match s.chars().next() {
@@ -460,13 +411,6 @@ impl Model {
                     };
                 }
                 CalcResult::EmptyCell | CalcResult::EmptyArg => "".to_string(),
-                CalcResult::Array(_) => {
-                    return CalcResult::Error {
-                        error: Error::NIMPL,
-                        origin: cell,
-                        message: "Arrays not supported yet".to_string(),
-                    }
-                }
             };
             return CalcResult::String(s.to_uppercase());
         }
@@ -497,13 +441,6 @@ impl Model {
                 };
             }
             CalcResult::EmptyCell | CalcResult::EmptyArg => "".to_string(),
-            CalcResult::Array(_) => {
-                return CalcResult::Error {
-                    error: Error::NIMPL,
-                    origin: cell,
-                    message: "Arrays not supported yet".to_string(),
-                }
-            }
         };
         let num_chars = if args.len() == 2 {
             match self.evaluate_node_in_context(&args[1], cell) {
@@ -534,13 +471,6 @@ impl Model {
                     };
                 }
                 CalcResult::EmptyCell | CalcResult::EmptyArg => 0,
-                CalcResult::Array(_) => {
-                    return CalcResult::Error {
-                        error: Error::NIMPL,
-                        origin: cell,
-                        message: "Arrays not supported yet".to_string(),
-                    }
-                }
             }
         } else {
             1
@@ -579,13 +509,6 @@ impl Model {
                 };
             }
             CalcResult::EmptyCell | CalcResult::EmptyArg => "".to_string(),
-            CalcResult::Array(_) => {
-                return CalcResult::Error {
-                    error: Error::NIMPL,
-                    origin: cell,
-                    message: "Arrays not supported yet".to_string(),
-                }
-            }
         };
         let num_chars = if args.len() == 2 {
             match self.evaluate_node_in_context(&args[1], cell) {
@@ -616,13 +539,6 @@ impl Model {
                     };
                 }
                 CalcResult::EmptyCell | CalcResult::EmptyArg => 0,
-                CalcResult::Array(_) => {
-                    return CalcResult::Error {
-                        error: Error::NIMPL,
-                        origin: cell,
-                        message: "Arrays not supported yet".to_string(),
-                    }
-                }
             }
         } else {
             1
@@ -661,13 +577,6 @@ impl Model {
                 };
             }
             CalcResult::EmptyCell | CalcResult::EmptyArg => "".to_string(),
-            CalcResult::Array(_) => {
-                return CalcResult::Error {
-                    error: Error::NIMPL,
-                    origin: cell,
-                    message: "Arrays not supported yet".to_string(),
-                }
-            }
         };
         let start_num = match self.evaluate_node_in_context(&args[1], cell) {
             CalcResult::Number(v) => {
@@ -732,13 +641,6 @@ impl Model {
                 };
             }
             CalcResult::EmptyCell | CalcResult::EmptyArg => 0,
-            CalcResult::Array(_) => {
-                return CalcResult::Error {
-                    error: Error::NIMPL,
-                    origin: cell,
-                    message: "Arrays not supported yet".to_string(),
-                }
-            }
         };
         let mut result = "".to_string();
         let mut count: usize = 0;
@@ -1081,13 +983,6 @@ impl Model {
                                 }
                                 error @ CalcResult::Error { .. } => return error,
                                 CalcResult::EmptyArg | CalcResult::Range { .. } => {}
-                                CalcResult::Array(_) => {
-                                    return CalcResult::Error {
-                                        error: Error::NIMPL,
-                                        origin: cell,
-                                        message: "Arrays not supported yet".to_string(),
-                                    }
-                                }
                             }
                         }
                     }
@@ -1107,13 +1002,6 @@ impl Model {
                     }
                 }
                 CalcResult::EmptyArg => {}
-                CalcResult::Array(_) => {
-                    return CalcResult::Error {
-                        error: Error::NIMPL,
-                        origin: cell,
-                        message: "Arrays not supported yet".to_string(),
-                    }
-                }
             };
         }
         let result = values.join(&delimiter);
@@ -1237,11 +1125,6 @@ impl Model {
                 }
             }
             CalcResult::EmptyCell | CalcResult::EmptyArg => CalcResult::Number(0.0),
-            CalcResult::Array(_) => CalcResult::Error {
-                error: Error::NIMPL,
-                origin: cell,
-                message: "Arrays not supported yet".to_string(),
-            },
         }
     }
 

base/src/functions/util.rs

@@ -393,8 +393,10 @@ pub(crate) fn build_criteria<'a>(value: &'a CalcResult) -> Box<dyn Fn(&CalcResul
             // An error will match an error (never a string that is an error)
             Box::new(move |x| result_is_equal_to_error(x, &error.to_string()))
         }
-        CalcResult::Range { left: _, right: _ } => Box::new(move |_x| false),
+        CalcResult::Range { left: _, right: _ } => {
-        CalcResult::Array(_) => Box::new(move |_x| false),
+            // TODO: Implicit Intersection
+            Box::new(move |_x| false)
+        }
         CalcResult::EmptyCell | CalcResult::EmptyArg => Box::new(result_is_equal_to_empty),
     }
 }

base/src/lib.rs

@@ -39,9 +39,9 @@ pub mod types;
 pub mod worksheet;
 
 mod actions;
-mod arithmetic;
 mod cast;
 mod constants;
+mod diffs;
 mod functions;
 mod implicit_intersection;
 mod model;

base/src/model.rs

@@ -207,17 +207,6 @@ impl Model {
                     },
                 }
             }
-            Node::ImplicitIntersection {
-                automatic: _,
-                child,
-            } => match self.evaluate_node_with_reference(child, cell) {
-                CalcResult::Range { left, right } => CalcResult::Range { left, right },
-                _ => CalcResult::new_error(
-                    Error::ERROR,
-                    cell,
-                    format!("Error with Implicit Intersection in cell {:?}", cell),
-                ),
-            },
             _ => self.evaluate_node_in_context(node, cell),
         }
     }
@@ -267,10 +256,27 @@ impl Model {
     ) -> CalcResult {
         use Node::*;
         match node {
-            OpSumKind { kind, left, right } => match kind {
+            OpSumKind { kind, left, right } => {
-                OpSum::Add => self.handle_arithmetic(left, right, cell, &|f1, f2| Ok(f1 + f2)),
+                // In the future once the feature try trait stabilizes we could use the '?' operator for this :)
-                OpSum::Minus => self.handle_arithmetic(left, right, cell, &|f1, f2| Ok(f1 - f2)),
+                // See: https://play.rust-lang.org/?version=nightly&mode=debug&edition=2018&gist=236044e8321a1450988e6ffe5a27dab5
-            },
+                let l = match self.get_number(left, cell) {
+                    Ok(f) => f,
+                    Err(s) => {
+                        return s;
+                    }
+                };
+                let r = match self.get_number(right, cell) {
+                    Ok(f) => f,
+                    Err(s) => {
+                        return s;
+                    }
+                };
+                let result = match kind {
+                    OpSum::Add => l + r,
+                    OpSum::Minus => l - r,
+                };
+                CalcResult::Number(result)
+            }
             NumberKind(value) => CalcResult::Number(*value),
             StringKind(value) => CalcResult::String(value.replace(r#""""#, r#"""#)),
             BooleanKind(value) => CalcResult::Boolean(*value),
@@ -358,27 +364,59 @@ impl Model {
                 let result = format!("{}{}", l, r);
                 CalcResult::String(result)
             }
-            OpProductKind { kind, left, right } => match kind {
+            OpProductKind { kind, left, right } => {
-                OpProduct::Times => {
+                let l = match self.get_number(left, cell) {
-                    self.handle_arithmetic(left, right, cell, &|f1, f2| Ok(f1 * f2))
+                    Ok(f) => f,
+                    Err(s) => {
+                        return s;
                     }
-                OpProduct::Divide => self.handle_arithmetic(left, right, cell, &|f1, f2| {
+                };
-                    if f2 == 0.0 {
+                let r = match self.get_number(right, cell) {
-                        Err(Error::DIV)
+                    Ok(f) => f,
-                    } else {
+                    Err(s) => {
-                        Ok(f1 / f2)
+                        return s;
+                    }
+                };
+                let result = match kind {
+                    OpProduct::Times => l * r,
+                    OpProduct::Divide => {
+                        if r == 0.0 {
+                            return CalcResult::new_error(
+                                Error::DIV,
+                                cell,
+                                "Divide by Zero".to_string(),
+                            );
+                        }
+                        l / r
+                    }
+                };
+                CalcResult::Number(result)
             }
-                }),
-            },
             OpPowerKind { left, right } => {
-                self.handle_arithmetic(left, right, cell, &|f1, f2| Ok(f1.powf(f2)))
+                let l = match self.get_number(left, cell) {
+                    Ok(f) => f,
+                    Err(s) => {
+                        return s;
+                    }
+                };
+                let r = match self.get_number(right, cell) {
+                    Ok(f) => f,
+                    Err(s) => {
+                        return s;
+                    }
+                };
+                // Deal with errors properly
+                CalcResult::Number(l.powf(r))
             }
             FunctionKind { kind, args } => self.evaluate_function(kind, args, cell),
             InvalidFunctionKind { name, args: _ } => {
                 CalcResult::new_error(Error::ERROR, cell, format!("Invalid function: {}", name))
             }
-            ArrayKind(s) => CalcResult::Array(s.to_owned()),
+            ArrayKind(_) => {
-            DefinedNameKind((name, scope, _)) => {
+                // TODO: NOT IMPLEMENTED
+                CalcResult::new_error(Error::NIMPL, cell, "Arrays not implemented".to_string())
+            }
+            DefinedNameKind((name, scope)) => {
                 if let Ok(Some(parsed_defined_name)) = self.get_parsed_defined_name(name, *scope) {
                     match parsed_defined_name {
                         ParsedDefinedName::CellReference(reference) => {
@@ -490,22 +528,6 @@ impl Model {
                 format!("Error parsing {}: {}", formula, message),
             ),
             EmptyArgKind => CalcResult::EmptyArg,
-            ImplicitIntersection {
-                automatic: _,
-                child,
-            } => match self.evaluate_node_with_reference(child, cell) {
-                CalcResult::Range { left, right } => {
-                    match implicit_intersection(&cell, &Range { left, right }) {
-                        Some(cell_reference) => self.evaluate_cell(cell_reference),
-                        None => CalcResult::new_error(
-                            Error::VALUE,
-                            cell,
-                            format!("Error with Implicit Intersection in cell {:?}", cell),
-                        ),
-                    }
-                }
-                _ => self.evaluate_node_in_context(child, cell),
-            },
         }
     }
 
@@ -595,15 +617,12 @@ impl Model {
                     };
                 }
                 CalcResult::Range { left, right } => {
-                    if left.sheet == right.sheet
+                    let range = Range {
-                        && left.row == right.row
+                        left: *left,
-                        && left.column == right.column
+                        right: *right,
-                    {
-                        let intersection_cell = CellReferenceIndex {
-                            sheet: left.sheet,
-                            column: left.column,
-                            row: left.row,
                     };
+                    if let Some(intersection_cell) = implicit_intersection(&cell_reference, &range)
+                    {
                         let v = self.evaluate_cell(intersection_cell);
                         self.set_cell_value(cell_reference, &v);
                     } else {
@@ -620,32 +639,10 @@ impl Model {
                             f,
                             s,
                             o,
-                            m: "Implicit Intersection not implemented".to_string(),
+                            m: "Invalid reference".to_string(),
-                            ei: Error::NIMPL,
+                            ei: Error::VALUE,
                         };
                     }
-                    // if let Some(intersection_cell) = implicit_intersection(&cell_reference, &range)
-                    // {
-                    //     let v = self.evaluate_cell(intersection_cell);
-                    //     self.set_cell_value(cell_reference, &v);
-                    // } else {
-                    //     let o = match self.cell_reference_to_string(&cell_reference) {
-                    //         Ok(s) => s,
-                    //         Err(_) => "".to_string(),
-                    //     };
-                    //     *self.workbook.worksheets[sheet as usize]
-                    //         .sheet_data
-                    //         .get_mut(&row)
-                    //         .expect("expected a row")
-                    //         .get_mut(&column)
-                    //         .expect("expected a column") = Cell::CellFormulaError {
-                    //         f,
-                    //         s,
-                    //         o,
-                    //         m: "Invalid reference".to_string(),
-                    //         ei: Error::VALUE,
-                    //     };
-                    // }
                 }
                 CalcResult::EmptyCell | CalcResult::EmptyArg => {
                     *self.workbook.worksheets[sheet as usize]
@@ -655,20 +652,6 @@ impl Model {
                         .get_mut(&column)
                         .expect("expected a column") = Cell::CellFormulaNumber { f, s, v: 0.0 };
                 }
-                CalcResult::Array(_) => {
-                    *self.workbook.worksheets[sheet as usize]
-                        .sheet_data
-                        .get_mut(&row)
-                        .expect("expected a row")
-                        .get_mut(&column)
-                        .expect("expected a column") = Cell::CellFormulaError {
-                        f,
-                        s,
-                        o: "".to_string(),
-                        m: "Arrays not supported yet".to_string(),
-                        ei: Error::NIMPL,
-                    };
-                }
             }
         }
     }
@@ -882,7 +865,11 @@ impl Model {
 
         let worksheet_names = worksheets.iter().map(|s| s.get_name()).collect();
 
-        let defined_names = workbook.get_defined_names_with_scope();
+        let defined_names = workbook
+            .get_defined_names_with_scope()
+            .iter()
+            .map(|s| (s.0.to_owned(), s.1))
+            .collect();
         // add all tables
         // let mut tables = Vec::new();
         // for worksheet in worksheets {

base/src/new_empty.rs

@@ -8,7 +8,7 @@ use crate::{
     expressions::{
         lexer::LexerMode,
         parser::{
-            stringify::{rename_sheet_in_node, to_rc_format, to_string},
+            stringify::{rename_sheet_in_node, to_rc_format},
             Parser,
         },
         types::CellReferenceRC,
@@ -17,8 +17,7 @@ use crate::{
     locale::get_locale,
     model::{get_milliseconds_since_epoch, Model, ParsedDefinedName},
     types::{
-        DefinedName, Metadata, SheetState, Workbook, WorkbookSettings, WorkbookView, Worksheet,
+        Metadata, SheetState, Workbook, WorkbookSettings, WorkbookView, Worksheet, WorksheetView,
-        WorksheetView,
     },
     utils::ParsedReference,
 };
@@ -145,7 +144,12 @@ impl Model {
 
     /// Reparses all formulas and defined names
     pub(crate) fn reset_parsed_structures(&mut self) {
-        let defined_names = self.workbook.get_defined_names_with_scope();
+        let defined_names = self
+            .workbook
+            .get_defined_names_with_scope()
+            .iter()
+            .map(|s| (s.0.to_owned(), s.1))
+            .collect();
         self.parser
             .set_worksheets_and_names(self.workbook.get_worksheet_names(), defined_names);
         self.parsed_formulas = vec![];
@@ -239,7 +243,7 @@ impl Model {
 
     /// Renames a sheet and updates all existing references to that sheet.
     /// It can fail if:
-    ///   * The original index is out of bounds
+    ///   * The original index is too large
     ///   * The target sheet name already exists
     ///   * The target sheet name is invalid
     pub fn rename_sheet_by_index(
@@ -253,15 +257,17 @@ impl Model {
         if self.get_sheet_index_by_name(new_name).is_some() {
             return Err(format!("Sheet already exists: '{}'.", new_name));
         }
-        // Gets the new name and checks that a sheet with that index exists
+        let worksheets = &self.workbook.worksheets;
-        let old_name = self.workbook.worksheet(sheet_index)?.get_name();
+        let sheet_count = worksheets.len() as u32;
-
+        if sheet_index >= sheet_count {
+            return Err("Sheet index out of bounds".to_string());
+        }
         // Parse all formulas with the old name
         // All internal formulas are R1C1
         self.parser.set_lexer_mode(LexerMode::R1C1);
-
+        // We use iter because the default would be a mut_iter and we don't need a mutable reference
-        for worksheet in &mut self.workbook.worksheets {
+        let worksheets = &mut self.workbook.worksheets;
-            // R1C1 formulas are not tied to a cell (but are tied to a cell)
+        for worksheet in worksheets {
             let cell_reference = &CellReferenceRC {
                 sheet: worksheet.get_name(),
                 row: 1,
@@ -275,32 +281,11 @@ impl Model {
             }
             worksheet.shared_formulas = formulas;
         }
-
+        // Se the mode back to A1
-        // Set the mode back to A1
         self.parser.set_lexer_mode(LexerMode::A1);
-
-        // We reparse all the defined names formulas
-        let mut defined_names = Vec::new();
-        // Defined names do not have a context, we can use anything
-        let cell_reference = &CellReferenceRC {
-            sheet: old_name.clone(),
-            row: 1,
-            column: 1,
-        };
-        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);
-            defined_names.push(DefinedName {
-                name: defined_name.name.clone(),
-                formula,
-                sheet_id: defined_name.sheet_id,
-            });
-        }
-        self.workbook.defined_names = defined_names;
-
         // Update the name of the worksheet
-        self.workbook.worksheet_mut(sheet_index)?.set_name(new_name);
+        let worksheets = &mut self.workbook.worksheets;
+        worksheets[sheet_index as usize].set_name(new_name);
         self.reset_parsed_structures();
         Ok(())
     }
@@ -405,7 +390,6 @@ impl Model {
             },
             tables: HashMap::new(),
             views,
-            users: Vec::new(),
         };
         let parsed_formulas = Vec::new();
         let worksheets = &workbook.worksheets;

base/src/test/mod.rs

@@ -28,6 +28,7 @@ mod test_fn_sumifs;
 mod test_fn_textbefore;
 mod test_fn_textjoin;
 mod test_fn_unicode;
+mod test_forward_references;
 mod test_frozen_rows_columns;
 mod test_general;
 mod test_math;
@@ -51,7 +52,6 @@ mod engineering;
 mod test_fn_offset;
 mod test_number_format;
 
-mod test_arrays;
 mod test_escape_quotes;
 mod test_extend;
 mod test_fn_fv;
@@ -59,7 +59,6 @@ mod test_fn_type;
 mod test_frozen_rows_and_columns;
 mod test_geomean;
 mod test_get_cell_content;
-mod test_implicit_intersection;
 mod test_issue_155;
 mod test_percentage;
 mod test_set_functions_error_handling;

base/src/test/test_arrays.rs

@@ -1,13 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::test::util::new_empty_model;
-
-#[test]
-fn sum_arrays() {
-    let mut model = new_empty_model();
-    model._set("A1", "=SUM({1,2,3}+{3,4,5})");
-
-    model.evaluate();
-
-    assert_eq!(model._get_text("A1"), *"18");
-}

base/src/test/test_fn_concatenate.rs

@@ -22,14 +22,13 @@ fn fn_concatenate() {
     model._set("B1", r#"=CONCATENATE(A1, A2, A3, "!")"#);
     // This will break once we implement the implicit intersection operator
     // It should be:
-    model._set("C2", r#"=CONCATENATE(@A1:A3, "!")"#);
+    // model._set("B2", r#"=CONCATENATE(@A1:A3, "!")"#);
     model._set("B2", r#"=CONCATENATE(A1:A3, "!")"#);
     model._set("B3", r#"=CONCAT(A1:A3, "!")"#);
 
     model.evaluate();
 
     assert_eq!(model._get_text("B1"), *"Hello my World!");
-    assert_eq!(model._get_text("B2"), *"#N/IMPL!");
+    assert_eq!(model._get_text("B2"), *" my !");
     assert_eq!(model._get_text("B3"), *"Hello my World!");
-    assert_eq!(model._get_text("C2"), *" my !");
 }

base/src/test/test_fn_formulatext.rs

@@ -30,18 +30,8 @@ fn implicit_intersection() {
     model._set("A2", "=FORMULATEXT(D1:E1)");
     model.evaluate();
 
-    assert_eq!(model._get_text("A1"), *"#N/IMPL!");
+    assert_eq!(model._get_text("A1"), *"#ERROR!");
-    assert_eq!(model._get_text("A2"), *"#N/IMPL!");
+    assert_eq!(model._get_text("A2"), *"#ERROR!");
-}
-
-#[test]
-fn implicit_intersection_operator() {
-    let mut model = new_empty_model();
-    model._set("A1", "=1 +  2");
-    model._set("B1", "=FORMULATEXT(@A:A)");
-    model.evaluate();
-
-    assert_eq!(model._get_text("B1"), *"#N/IMPL!");
 }
 
 #[test]

base/src/test/test_fn_sum.rs

@@ -17,19 +17,3 @@ fn test_fn_sum_arguments() {
     assert_eq!(model._get_text("A3"), *"1");
     assert_eq!(model._get_text("A4"), *"4");
 }
-
-#[test]
-fn arrays() {
-    let mut model = new_empty_model();
-    model._set("A1", "=SUM({1, 2, 3})");
-    model._set("A2", "=SUM({1; 2; 3})");
-    model._set("A3", "=SUM({1, 2; 3, 4})");
-    model._set("A4", "=SUM({1, 2; 3, 4; 5, 6})");
-
-    model.evaluate();
-
-    assert_eq!(model._get_text("A1"), *"6");
-    assert_eq!(model._get_text("A2"), *"6");
-    assert_eq!(model._get_text("A3"), *"10");
-    assert_eq!(model._get_text("A4"), *"21");
-}

base/src/test/test_forward_references.rs

@@ -0,0 +1,121 @@
+#![allow(clippy::unwrap_used)]
+
+use crate::expressions::types::{Area, CellReferenceIndex};
+use crate::test::util::new_empty_model;
+
+#[test]
+fn test_forward_references() {
+    let mut model = new_empty_model();
+
+    // test single ref changed nd not changed
+    model._set("H8", "=F6*G9");
+    // tests areas
+    model._set("H9", "=SUM(D4:F6)");
+    // absolute coordinates
+    model._set("H10", "=$F$6");
+    // area larger than the source area
+    model._set("H11", "=SUM(D3:F6)");
+    // Test arguments and concat
+    model._set("H12", "=SUM(F6, D4:F6) & D4");
+    // Test range operator. This is syntax error for now.
+    // model._set("H13", "=SUM(D4:INDEX(D4:F5,4,2))");
+    // Test operations
+    model._set("H14", "=-D4+D5*F6/F5");
+
+    model.evaluate();
+
+    // Source Area is D4:F6
+    let source_area = &Area {
+        sheet: 0,
+        row: 4,
+        column: 4,
+        width: 3,
+        height: 3,
+    };
+
+    // We paste in B10
+    let target_row = 10;
+    let target_column = 2;
+    let result = model.forward_references(
+        source_area,
+        &CellReferenceIndex {
+            sheet: 0,
+            row: target_row,
+            column: target_column,
+        },
+    );
+    assert!(result.is_ok());
+    model.evaluate();
+
+    assert_eq!(model._get_formula("H8"), "=D12*G9");
+    assert_eq!(model._get_formula("H9"), "=SUM(B10:D12)");
+    assert_eq!(model._get_formula("H10"), "=$D$12");
+
+    assert_eq!(model._get_formula("H11"), "=SUM(D3:F6)");
+    assert_eq!(model._get_formula("H12"), "=SUM(D12,B10:D12)&B10");
+    // assert_eq!(model._get_formula("H13"), "=SUM(B10:INDEX(B10:D11,4,2))");
+    assert_eq!(model._get_formula("H14"), "=-B10+B11*D12/D11");
+}
+
+#[test]
+fn test_different_sheet() {
+    let mut model = new_empty_model();
+
+    // test single ref changed not changed
+    model._set("H8", "=F6*G9");
+    // tests areas
+    model._set("H9", "=SUM(D4:F6)");
+    // absolute coordinates
+    model._set("H10", "=$F$6");
+    // area larger than the source area
+    model._set("H11", "=SUM(D3:F6)");
+    // Test arguments and concat
+    model._set("H12", "=SUM(F6, D4:F6) & D4");
+    // Test range operator. This is syntax error for now.
+    // model._set("H13", "=SUM(D4:INDEX(D4:F5,4,2))");
+    // Test operations
+    model._set("H14", "=-D4+D5*F6/F5");
+
+    // Adds a new sheet
+    assert!(model.add_sheet("Sheet2").is_ok());
+
+    model.evaluate();
+
+    // Source Area is D4:F6
+    let source_area = &Area {
+        sheet: 0,
+        row: 4,
+        column: 4,
+        width: 3,
+        height: 3,
+    };
+
+    // We paste in Sheet2!B10
+    let target_row = 10;
+    let target_column = 2;
+    let result = model.forward_references(
+        source_area,
+        &CellReferenceIndex {
+            sheet: 1,
+            row: target_row,
+            column: target_column,
+        },
+    );
+    assert!(result.is_ok());
+    model.evaluate();
+
+    assert_eq!(model._get_formula("H8"), "=Sheet2!D12*G9");
+    assert_eq!(model._get_formula("H9"), "=SUM(Sheet2!B10:D12)");
+    assert_eq!(model._get_formula("H10"), "=Sheet2!$D$12");
+
+    assert_eq!(model._get_formula("H11"), "=SUM(D3:F6)");
+    assert_eq!(
+        model._get_formula("H12"),
+        "=SUM(Sheet2!D12,Sheet2!B10:D12)&Sheet2!B10"
+    );
+    // assert_eq!(model._get_formula("H13"), "=SUM(B10:INDEX(B10:D11,4,2))");
+    assert_eq!(
+        model._get_formula("H14"),
+        "=-Sheet2!B10+Sheet2!B11*Sheet2!D12/Sheet2!D11"
+    );
+}

base/src/test/test_implicit_intersection.rs

@@ -1,50 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::test::util::new_empty_model;
-
-#[test]
-fn simple_colum() {
-    let mut model = new_empty_model();
-    // We populate cells A1 to A3
-    model._set("A1", "1");
-    model._set("A2", "2");
-    model._set("A3", "3");
-
-    model._set("C2", "=@A1:A3");
-
-    model.evaluate();
-
-    assert_eq!(model._get_text("C2"), "2".to_string());
-}
-
-#[test]
-fn return_of_array_is_n_impl() {
-    let mut model = new_empty_model();
-    // We populate cells A1 to A3
-    model._set("A1", "1");
-    model._set("A2", "2");
-    model._set("A3", "3");
-
-    model._set("C2", "=A1:A3");
-    model._set("D2", "=SUM(SIN(A:A)");
-
-    model.evaluate();
-
-    assert_eq!(model._get_text("C2"), "#N/IMPL!".to_string());
-    assert_eq!(model._get_text("D2"), "1.89188842".to_string());
-}
-
-#[test]
-fn concat() {
-    let mut model = new_empty_model();
-    model._set("A1", "=CONCAT(@B1:B3)");
-    model._set("A2", "=CONCAT(B1:B3)");
-    model._set("B1", "Hello");
-    model._set("B2", " ");
-    model._set("B3", "world!");
-
-    model.evaluate();
-
-    assert_eq!(model._get_text("A1"), *"Hello");
-    assert_eq!(model._get_text("A2"), *"Hello world!");
-}

base/src/test/user_model/test_defined_names.rs

@@ -423,30 +423,3 @@ fn change_scope_to_first_sheet() {
         Ok("#NAME?".to_string())
     );
 }
-
-#[test]
-fn rename_sheet() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model.new_sheet().unwrap();
-    model.set_user_input(0, 1, 1, "Hello").unwrap();
-
-    model
-        .new_defined_name("myName", None, "Sheet1!$A$1")
-        .unwrap();
-
-    model
-        .set_user_input(0, 2, 1, r#"=CONCATENATE(MyName, " world!")"#)
-        .unwrap();
-
-    assert_eq!(
-        model.get_formatted_cell_value(0, 2, 1),
-        Ok("Hello world!".to_string())
-    );
-
-    model.rename_sheet(0, "AnotherName").unwrap();
-
-    assert_eq!(
-        model.get_formatted_cell_value(0, 2, 1),
-        Ok("Hello world!".to_string())
-    );
-}

base/src/test/user_model/test_row_column.rs

@@ -170,7 +170,7 @@ fn row_heigh_increases_automatically() {
     model
         .set_user_input(0, 1, 1, "My home in Canada had horses\nAnd monkeys!")
         .unwrap();
-    assert_eq!(model.get_row_height(0, 1), Ok(40.5));
+    assert_eq!(model.get_row_height(0, 1), Ok(2.0 * DEFAULT_ROW_HEIGHT));
 }
 
 #[test]

base/src/types.rs

@@ -39,14 +39,6 @@ pub struct WorkbookView {
     pub window_height: i64,
 }
 
-#[derive(Encode, Decode, Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
-pub struct WebUser {
-    pub id: String,
-    pub sheet: u32,
-    pub row: i32,
-    pub column: i32,
-}
-
 /// An internal representation of an IronCalc Workbook
 #[derive(Encode, Decode, Debug, PartialEq, Clone)]
 pub struct Workbook {
@@ -59,7 +51,6 @@ pub struct Workbook {
     pub metadata: Metadata,
     pub tables: HashMap<String, Table>,
     pub views: HashMap<u32, WorkbookView>,
-    pub users: Vec<WebUser>
 }
 
 /// A defined name. The `sheet_id` is the sheet index in case the name is local

base/src/units.rs

@@ -299,7 +299,6 @@ impl Model {
             Node::WrongVariableKind(_) => None,
             Node::CompareKind { .. } => None,
             Node::OpPowerKind { .. } => None,
-            Node::ImplicitIntersection { .. } => None,
         }
     }
 

base/src/user_model/common.rs

@@ -6,7 +6,7 @@ use csv::{ReaderBuilder, WriterBuilder};
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    constants::{self, LAST_COLUMN, LAST_ROW},
+    constants::{self, DEFAULT_ROW_HEIGHT, LAST_COLUMN, LAST_ROW},
     expressions::{
         types::{Area, CellReferenceIndex},
         utils::{is_valid_column_number, is_valid_row},
@@ -14,7 +14,7 @@ use crate::{
     model::Model,
     types::{
         Alignment, BorderItem, CellType, Col, HorizontalAlignment, SheetProperties, SheetState,
-        Style, VerticalAlignment, WebUser,
+        Style, VerticalAlignment,
     },
     utils::is_valid_hex_color,
 };
@@ -293,11 +293,6 @@ impl UserModel {
         self.model.workbook.name = name.to_string();
     }
 
-    /// Set users
-    pub fn set_users(&mut self, users: &[WebUser]) {
-        self.model.workbook.users = users.to_vec();
-    }
-
     /// Undoes last change if any, places the change in the redo list and evaluates the model if needed
     ///
     /// See also:
@@ -435,14 +430,10 @@ impl UserModel {
             new_value: value.to_string(),
             old_value: Box::new(old_value),
         }];
-        let style = self.model.get_style_for_cell(sheet, row, column)?;
 
-        let line_count = value.split('\n').count() as f64;
+        let line_count = value.split('\n').count();
         let row_height = self.model.get_row_height(sheet, row)?;
-        // This is in sync with the front-end auto fit row
+        let cell_height = (line_count as f64) * DEFAULT_ROW_HEIGHT;
-        let font_size = style.font.sz as f64;
-        let line_height = font_size * 1.5;
-        let cell_height = (line_count - 1.0) * line_height + 8.0 + font_size;
         if cell_height > row_height {
             diff_list.push(Diff::SetRowHeight {
                 sheet,

base/src/workbook.rs

@@ -1,6 +1,6 @@
 use std::vec::Vec;
 
-use crate::{expressions::parser::DefinedNameS, types::*};
+use crate::types::*;
 
 impl Workbook {
     pub fn get_worksheet_names(&self) -> Vec<String> {
@@ -29,7 +29,7 @@ impl Workbook {
     }
 
     /// Returns the a list of defined names in the workbook with their scope
-    pub fn get_defined_names_with_scope(&self) -> Vec<DefinedNameS> {
+    pub fn get_defined_names_with_scope(&self) -> Vec<(String, Option<u32>, String)> {
         let sheet_id_index: Vec<u32> = self.worksheets.iter().map(|s| s.sheet_id).collect();
 
         let defined_names = self

bindings/nodejs/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 edition = "2021"
 name = "ironcalc_nodejs"
-version = "0.5.0"
+version = "0.3.1"
 
 [lib]
 crate-type = ["cdylib"]
@@ -10,7 +10,7 @@ crate-type = ["cdylib"]
 # Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
 napi = { version = "2.12.2", default-features = false, features = ["napi4", "serde-json"] }
 napi-derive = "2.12.2"
-ironcalc = { path = "../../xlsx", version = "0.5.0" }
+ironcalc = { path = "../../xlsx", version = "0.3.0" }
 serde = { version = "1.0", features = ["derive"] }
 
 [build-dependencies]

bindings/nodejs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ironcalc/nodejs",
-  "version": "0.5.1",
+  "version": "0.3.1",
   "main": "index.js",
   "types": "index.d.ts",
   "napi": {

bindings/python/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pyroncalc"
-version = "0.5.6"
+version = "0.3.0"
 edition = "2021"
 
 
@@ -12,9 +12,8 @@ crate-type = ["cdylib"]
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-xlsx = { package= "ironcalc", path = "../../xlsx", version = "0.5.0" }
+xlsx = { package= "ironcalc", path = "../../xlsx", version = "0.3.0" }
-pyo3 = { version = "0.25", features = ["extension-module"] }
+pyo3 = { version = "0.23", features = ["extension-module"] }
-bitcode = "0.6.3"
 
 
 [features]

bindings/python/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ironcalc"
-version = "0.5.6"
+version = "0.3.0"
 description = "Create, edit and evaluate Excel spreadsheets"
 requires-python = ">=3.10"
 keywords = [

bindings/python/src/lib.rs

@@ -2,8 +2,8 @@ use pyo3::exceptions::PyException;
 use pyo3::{create_exception, prelude::*, wrap_pyfunction};
 
 use types::{PySheetProperty, PyStyle};
-use xlsx::base::types::{Style, Workbook};
+use xlsx::base::types::Style;
-use xlsx::base::{Model, UserModel};
+use xlsx::base::Model;
 
 use xlsx::export::{save_to_icalc, save_to_xlsx};
 use xlsx::import;
@@ -14,60 +14,6 @@ use crate::types::PyCellType;
 
 create_exception!(_ironcalc, WorkbookError, PyException);
 
-#[pyclass]
-pub struct PyUserModel {
-    /// The user model, which is a wrapper around the Model
-    pub model: UserModel,
-}
-
-#[pymethods]
-impl PyUserModel {
-    /// Saves the user model to an xlsx file
-    pub fn save_to_xlsx(&self, file: &str) -> PyResult<()> {
-        let model = self.model.get_model();
-        save_to_xlsx(model, file).map_err(|e| WorkbookError::new_err(e.to_string()))
-    }
-
-    /// Saves the user model to file in the internal binary ic format
-    pub fn save_to_icalc(&self, file: &str) -> PyResult<()> {
-        let model = self.model.get_model();
-        save_to_icalc(model, file).map_err(|e| WorkbookError::new_err(e.to_string()))
-    }
-
-    pub fn apply_external_diffs(&mut self, external_diffs: &[u8]) -> PyResult<()> {
-        self.model
-            .apply_external_diffs(external_diffs)
-            .map_err(|e| WorkbookError::new_err(e.to_string()))
-    }
-
-    pub fn flush_send_queue(&mut self) -> Vec<u8> {
-        self.model.flush_send_queue()
-    }
-
-    pub fn set_user_input(
-        &mut self,
-        sheet: u32,
-        row: i32,
-        column: i32,
-        value: &str,
-    ) -> PyResult<()> {
-        self.model
-            .set_user_input(sheet, row, column, value)
-            .map_err(|e| WorkbookError::new_err(e.to_string()))
-    }
-
-    pub fn get_formatted_cell_value(&self, sheet: u32, row: i32, column: i32) -> PyResult<String> {
-        self.model
-            .get_formatted_cell_value(sheet, row, column)
-            .map_err(|e| WorkbookError::new_err(e.to_string()))
-    }
-
-    pub fn to_bytes(&self) -> PyResult<Vec<u8>> {
-        let bytes = self.model.to_bytes();
-        Ok(bytes)
-    }
-}
-
 /// This is a model implementing the 'raw' API
 #[pyclass]
 pub struct PyModel {
@@ -86,12 +32,6 @@ impl PyModel {
         save_to_icalc(&self.model, file).map_err(|e| WorkbookError::new_err(e.to_string()))
     }
 
-    /// To bytes
-    pub fn to_bytes(&self) -> PyResult<Vec<u8>> {
-        let bytes = self.model.to_bytes();
-        Ok(bytes)
-    }
-
     /// Evaluates the workbook
     pub fn evaluate(&mut self) {
         self.model.evaluate()
@@ -309,15 +249,6 @@ pub fn load_from_icalc(file_name: &str) -> PyResult<PyModel> {
     Ok(PyModel { model })
 }
 
-#[pyfunction]
-pub fn load_from_bytes(bytes: &[u8]) -> PyResult<PyModel> {
-    let workbook: Workbook =
-        bitcode::decode(bytes).map_err(|e| WorkbookError::new_err(e.to_string()))?;
-    let model =
-        Model::from_workbook(workbook).map_err(|e| WorkbookError::new_err(e.to_string()))?;
-    Ok(PyModel { model })
-}
-
 /// Creates an empty model
 #[pyfunction]
 pub fn create(name: &str, locale: &str, tz: &str) -> PyResult<PyModel> {
@@ -326,43 +257,6 @@ pub fn create(name: &str, locale: &str, tz: &str) -> PyResult<PyModel> {
     Ok(PyModel { model })
 }
 
-#[pyfunction]
-pub fn create_user_model(name: &str, locale: &str, tz: &str) -> PyResult<PyUserModel> {
-    let model = UserModel::new_empty(name, locale, tz)
-        .map_err(|e| WorkbookError::new_err(e.to_string()))?;
-    Ok(PyUserModel { model })
-}
-
-#[pyfunction]
-pub fn create_user_model_from_xlsx(
-    file_path: &str,
-    locale: &str,
-    tz: &str,
-) -> PyResult<PyUserModel> {
-    let model = import::load_from_xlsx(file_path, locale, tz)
-        .map_err(|e| WorkbookError::new_err(e.to_string()))?;
-    let model = UserModel::from_model(model);
-    Ok(PyUserModel { model })
-}
-
-#[pyfunction]
-pub fn create_user_model_from_icalc(file_name: &str) -> PyResult<PyUserModel> {
-    let model =
-        import::load_from_icalc(file_name).map_err(|e| WorkbookError::new_err(e.to_string()))?;
-    let model = UserModel::from_model(model);
-    Ok(PyUserModel { model })
-}
-
-#[pyfunction]
-pub fn create_user_model_from_bytes(bytes: &[u8]) -> PyResult<PyUserModel> {
-    let workbook: Workbook =
-        bitcode::decode(bytes).map_err(|e| WorkbookError::new_err(e.to_string()))?;
-    let model =
-        Model::from_workbook(workbook).map_err(|e| WorkbookError::new_err(e.to_string()))?;
-    let user_model = UserModel::from_model(model);
-    Ok(PyUserModel { model: user_model })
-}
-
 #[pyfunction]
 #[allow(clippy::panic)]
 pub fn test_panic() {
@@ -378,14 +272,7 @@ fn ironcalc(m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_function(wrap_pyfunction!(create, m)?)?;
     m.add_function(wrap_pyfunction!(load_from_xlsx, m)?)?;
     m.add_function(wrap_pyfunction!(load_from_icalc, m)?)?;
-    m.add_function(wrap_pyfunction!(load_from_bytes, m)?)?;
     m.add_function(wrap_pyfunction!(test_panic, m)?)?;
 
-    // User model functions
-    m.add_function(wrap_pyfunction!(create_user_model, m)?)?;
-    m.add_function(wrap_pyfunction!(create_user_model_from_bytes, m)?)?;
-    m.add_function(wrap_pyfunction!(create_user_model_from_xlsx, m)?)?;
-    m.add_function(wrap_pyfunction!(create_user_model_from_icalc, m)?)?;
-
     Ok(())
 }

bindings/python/tests/test_create.py

@@ -6,24 +6,3 @@ def test_simple():
     model.evaluate()
 
     assert model.get_formatted_cell_value(0, 1, 1) == "3"
-
-    bytes = model.to_bytes()
-
-    model2 = ic.load_from_bytes(bytes)
-    assert model2.get_formatted_cell_value(0, 1, 1) == "3"
-
-
-def test_simple_user():
-    model = ic.create_user_model("model", "en", "UTC")
-    model.set_user_input(0, 1, 1, "=1+2")
-    model.set_user_input(0, 1, 2, "=A1+3")
-
-    assert model.get_formatted_cell_value(0, 1, 1) == "3"
-    assert model.get_formatted_cell_value(0, 1, 2) == "6"
-
-    diffs = model.flush_send_queue()
-
-    model2 = ic.create_user_model("model", "en", "UTC")
-    model2.apply_external_diffs(diffs)
-    assert model2.get_formatted_cell_value(0, 1, 1) == "3"
-    assert model2.get_formatted_cell_value(0, 1, 2) == "6"

bindings/wasm/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wasm"
-version = "0.5.3"
+version = "0.3.2"
 authors = ["Nicolas Hatcher <nicolas@theuniverse.today>"]
 description = "IronCalc Web bindings"
 license = "MIT/Apache-2.0"
@@ -14,7 +14,7 @@ crate-type = ["cdylib"]
 # Uses `../ironcalc/base` when used locally, and uses
 # the inicated version from crates.io when published.
 # https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html#multiple-locations
-ironcalc_base = { path = "../../base", version = "0.5", features = ["use_regex_lite"] }
+ironcalc_base = { path = "../../base", version = "0.3", features = ["use_regex_lite"] }
 serde = { version = "1.0", features = ["derive"] }
 wasm-bindgen = "0.2.92"
 serde-wasm-bindgen = "0.4"

bindings/wasm/Makefile

@@ -9,7 +9,7 @@ endif
 all:
 	wasm-pack build --target web --scope ironcalc --release
 	cp README.pkg.md pkg/README.md
-	npx tsc types.ts --target esnext --module esnext
+	tsc types.ts --target esnext --module esnext
 	$(PYTHON) fix_types.py
 	rm -f types.js
 

bindings/wasm/fix_types.py

@@ -201,36 +201,6 @@ defined_name_list_types = r"""
   getDefinedNameList(): DefinedName[];
 """
 
-set_users = r"""
-/**
-* @param {any} users
-*/
-  setUsers(users: any): void;
-"""
-
-set_users_types = r"""
-/**
-* @param {WebUser[]} users
-*/
-  setUsers(users: WebUser[]): void;
-"""
-
-get_users = r"""
-/**
-* @returns {any}
-*/
-  getUsers(): any;
-}
-"""
-
-get_users_types = r"""
-/**
-* @returns {WebUser[]}
-*/
-  getUsers(): WebUser[];
-}
-"""
-
 def fix_types(text):
     text = text.replace(get_tokens_str, get_tokens_str_types)
     text = text.replace(update_style_str, update_style_str_types)
@@ -245,8 +215,6 @@ def fix_types(text):
     text = text.replace(clipboard, clipboard_types)
     text = text.replace(paste_from_clipboard, paste_from_clipboard_types)
     text = text.replace(defined_name_list, defined_name_list_types)
-    text = text.replace(set_users, set_users_types)
-    text = text.replace(get_users, get_users_types)
     with open("types.ts") as f:
         types_str = f.read()
         header_types = "{}\n\n{}".format(header, types_str)

bindings/wasm/src/lib.rs

@@ -6,7 +6,7 @@ use wasm_bindgen::{
 
 use ironcalc_base::{
     expressions::{lexer::util::get_tokens as tokenizer, types::Area, utils::number_to_column},
-    types::{CellType, Style, WebUser},
+    types::{CellType, Style},
     BorderArea, ClipboardData, UserModel as BaseModel,
 };
 
@@ -672,18 +672,4 @@ impl Model {
             .delete_defined_name(name, scope)
             .map_err(|e| to_js_error(e.to_string()))
     }
-
-    #[wasm_bindgen(js_name = "setUsers")]
-    pub fn set_users(&mut self, users: JsValue) -> Result<(), JsError> {
-        let users: Vec<WebUser> =
-            serde_wasm_bindgen::from_value(users).map_err(|e| to_js_error(e.to_string()))?;
-        self.model.set_users(&users);
-        Ok(())
-    }
-
-    #[wasm_bindgen(js_name = "getUsers")]
-    pub fn get_users(&self) -> Result<JsValue, JsError> {
-        let users = self.model.get_model().workbook.users.clone();
-        serde_wasm_bindgen::to_value(&users).map_err(|e| to_js_error(e.to_string()))
-    }
 }

bindings/wasm/types.ts

@@ -234,10 +234,3 @@ export interface DefinedName {
   scope?: number;
   formula: string;
 }
-
-export interface WebUser {
-  id: string;
-  sheet: number;
-  row: number;
-  column: number;
-}

webapp/IronCalc/package-lock.json

@@ -1,16 +1,16 @@
 {
   "name": "@ironcalc/workbook",
-  "version": "0.5.5",
+  "version": "0.3.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@ironcalc/workbook",
-      "version": "0.5.5",
+      "version": "0.3.2",
       "dependencies": {
         "@emotion/react": "^11.14.0",
         "@emotion/styled": "^11.14.0",
-        "@ironcalc/wasm": "0.5.3",
+        "@ironcalc/wasm": "file:../../bindings/wasm/pkg",
         "@mui/material": "^6.4",
         "@mui/system": "^6.4",
         "i18next": "^23.11.1",
@@ -43,6 +43,11 @@
         "react-dom": "^18.0.0 || ^19.0.0"
       }
     },
+    "../../bindings/wasm/pkg": {
+      "name": "@ironcalc/wasm",
+      "version": "0.3.2",
+      "license": "MIT/Apache-2.0"
+    },
     "node_modules/@adobe/css-tools": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.4.2.tgz",
@@ -1055,10 +1060,8 @@
       }
     },
     "node_modules/@ironcalc/wasm": {
-      "version": "0.5.3",
+      "resolved": "../../bindings/wasm/pkg",
-      "resolved": "https://registry.npmjs.org/@ironcalc/wasm/-/wasm-0.5.3.tgz",
+      "link": true
-      "integrity": "sha512-ryQKR5ISkSQnnsxBYDnrAUN+GDiAQUx0MzkVpJr7VQXiymOSMZbHfpv5geum1eSJV4gw1ft69syuNolIhVZ4Hg==",
-      "license": "MIT/Apache-2.0"
     },
     "node_modules/@isaacs/cliui": {
       "version": "8.0.2",

webapp/IronCalc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ironcalc/workbook",
-  "version": "0.5.5",
+  "version": "0.3.2",
   "type": "module",
   "main": "./dist/ironcalc.js",
   "module": "./dist/ironcalc.js",
@@ -17,7 +17,7 @@
   "dependencies": {
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.0",
-    "@ironcalc/wasm": "0.5.3",
+    "@ironcalc/wasm": "file:../../bindings/wasm/pkg",
     "@mui/material": "^6.4",
     "@mui/system": "^6.4",
     "i18next": "^23.11.1",

webapp/IronCalc/src/components/BorderPicker/BorderPicker.tsx

@@ -262,8 +262,6 @@ const BorderPicker = (properties: BorderPickerProps) => {
         </BorderPickerDialog>
         <ColorPicker
           color={borderColor}
-          defaultColor="#000000"
-          title={t("color_picker.default")}
           onChange={(color): void => {
             setBorderColor(color);
             setColorPickerOpen(false);
@@ -361,7 +359,7 @@ const MediumLine = styled("div")`
 `;
 const ThickLine = styled("div")`
   width: 68px;
-  border-top: 3px solid ${theme.palette.grey["900"]};
+  border-top: 1px solid ${theme.palette.grey["900"]};
 `;
 
 const Divider = styled("div")`

webapp/IronCalc/src/components/ColorPicker/AdvancedColorPicker.tsx

@@ -1,292 +0,0 @@
-import styled from "@emotion/styled";
-import { Popover, type PopoverOrigin } from "@mui/material";
-import { Check } from "lucide-react";
-import { useEffect, useRef, useState } from "react";
-import { HexColorInput, HexColorPicker } from "react-colorful";
-import { useTranslation } from "react-i18next";
-import { theme } from "../../theme";
-
-type AdvancedColorPickerProps = {
-  color: string;
-  onAccept: (color: string) => void;
-  onCancel: () => void;
-  anchorEl: React.RefObject<HTMLElement | null>;
-  anchorOrigin: PopoverOrigin;
-  transformOrigin: PopoverOrigin;
-  open: boolean;
-};
-
-const AdvancedColorPicker = ({
-  color,
-  onAccept,
-  onCancel,
-  anchorEl,
-  anchorOrigin,
-  transformOrigin,
-  open,
-}: AdvancedColorPickerProps) => {
-  const [selectedColor, setSelectedColor] = useState<string>(color);
-  const recentColors = useRef<string[]>([]);
-  const { t } = useTranslation();
-
-  useEffect(() => {
-    setSelectedColor(color);
-  }, [color]);
-
-  const handleColorSelect = (color: string) => {
-    if (!recentColors.current.includes(color)) {
-      const maxRecentColors = 14;
-      recentColors.current = [color, ...recentColors.current].slice(
-        0,
-        maxRecentColors,
-      );
-    }
-    setSelectedColor(color);
-    onAccept(color);
-  };
-
-  return (
-    <StylePopover
-      open={open}
-      onClose={onCancel}
-      anchorEl={anchorEl.current}
-      anchorOrigin={anchorOrigin}
-      transformOrigin={transformOrigin}
-    >
-      <ColorPickerDialog>
-        <HexColorPicker
-          color={selectedColor}
-          onChange={(newColor): void => {
-            setSelectedColor(newColor);
-          }}
-        />
-        <HorizontalDivider />
-        <ColorPickerInput>
-          <HexWrapper>
-            <HexLabel>{"Hex"}</HexLabel>
-            <HexColorInputBox>
-              <HashLabel>{"#"}</HashLabel>
-              <StyledHexColorInput
-                color={selectedColor}
-                onChange={(newColor): void => {
-                  setSelectedColor(newColor);
-                }}
-                tabIndex={0}
-              />
-            </HexColorInputBox>
-          </HexWrapper>
-          <Swatch $color={selectedColor} />
-        </ColorPickerInput>
-        <HorizontalDivider />
-        <Buttons>
-          <CancelButton onClick={onCancel}>
-            {t("color_picker.cancel")}
-          </CancelButton>
-          <StyledButton
-            onClick={(): void => {
-              handleColorSelect(selectedColor);
-              onCancel();
-            }}
-          >
-            <Check />
-            {t("color_picker.apply")}
-          </StyledButton>
-        </Buttons>
-      </ColorPickerDialog>
-    </StylePopover>
-  );
-};
-
-const StylePopover = styled(Popover)`
-  & .MuiPaper-root {
-    border-radius: 8px;
-    padding: 0px;
-    margin-left: -4px;
-    max-width: 220px;
-  }
-`;
-
-const HorizontalDivider = styled.div`
-  height: 0px;
-  width: 100%;
-  border-top: 1px solid ${theme.palette.grey["200"]};
-`;
-
-// Color Picker Dialog Styles
-const ColorPickerDialog = styled.div`
-  background: ${theme.palette.background.default};
-  width: 240px;
-  padding: 0px;
-  display: flex;
-  flex-direction: column;
-  max-width: 100%;
-  & .react-colorful {
-    height: 160px;
-    width: 100%;
-  }
-  & .react-colorful__saturation {
-    border-bottom: none;
-    border-radius: 8px 8px 0px 0px;
-  }
-  & .react-colorful__hue {
-    height: 8px;
-    margin: 8px;
-    border-radius: 5px;
-  }
-  & .react-colorful__saturation-pointer {
-    width: 14px;
-    height: 14px;
-  }
-  & .react-colorful__hue-pointer {
-    width: 7px;
-    border-radius: 8px;
-    height: 16px;
-    width: 16px;
-  }
-`;
-
-const Buttons = styled.div`
-  display: flex;
-  justify-content: flex-end;
-  margin: 8px;
-  gap: 8px;
-`;
-
-const StyledButton = styled("div")`
-  cursor: pointer;
-  width: 100%;
-  color: ${theme.palette.primary.contrastText};
-  background: ${theme.palette.primary.main};
-  padding: 0px 10px;
-  height: 28px;
-  border-radius: 4px;
-  display: flex;
-  gap: 4px;
-  align-items: center;
-  justify-content: center;
-  font-family: "Inter";
-  font-size: 12px;
-  &:hover {
-    background: #d68742;
-  }
-  svg {
-    max-width: 12px;
-    max-height: 12px;
-  }
-`;
-
-const CancelButton = styled("div")`
-  cursor: pointer;
-  width: 100%;
-  color: ${theme.palette.grey[700]};
-  background: ${theme.palette.grey[200]};
-  padding: 0px 10px;
-  height: 28px;
-  border-radius: 4px;
-  display: flex;
-  gap: 4px;
-  align-items: center;
-  justify-content: center;
-  font-family: "Inter";
-  font-size: 12px;
-  &:hover {
-    background: ${theme.palette.grey[300]};
-  }
-  svg {
-    max-width: 12px;
-    max-height: 12px;
-  }
-`;
-
-const HashLabel = styled.div`
-  margin: auto 0px auto 10px;
-  font-size: 13px;
-  color: #333;
-  font-family: ${theme.typography.button.fontFamily};
-`;
-
-const HexLabel = styled.div`
-  margin: auto 0px;
-  font-size: 12px;
-  display: inline-flex;
-  font-family: ${theme.typography.button.fontFamily};
-`;
-
-const HexColorInputBox = styled.div`
-  display: inline-flex;
-  flex-grow: 1;
-  width: 100%;
-  height: 28px;
-  border: 1px solid ${theme.palette.grey["300"]};
-  border-radius: 5px;
-  &:hover {
-    border: 1px solid ${theme.palette.grey["600"]};
-  }
-  &:focus-within {
-    outline: 2px solid ${theme.palette.secondary.main};
-    outline-offset: 1px;
-  }
-`;
-
-const StyledHexColorInput = styled(HexColorInput)`
-  width: 100%;
-  border: none;
-  background: transparent;
-  outline: none;
-  font-family: ${theme.typography.button.fontFamily};
-  font-size: 12px;
-  text-transform: uppercase;
-  text-align: right;
-  padding-right: 10px;
-  border-radius: 5px;
-
-  &:focus {
-    border-color: #4298ef;
-  }
-`;
-
-const HexWrapper = styled.div`
-  display: flex;
-  gap: 8px;
-  flex-grow: 1;
-  & input {
-    min-width: 0px;
-    border: 0px;
-    background: ${theme.palette.background.default};
-    outline: none;
-    font-family: ${theme.typography.button.fontFamily};
-    font-size: 12px;
-    text-transform: uppercase;
-    text-align: right;
-    padding-right: 10px;
-    border-radius: 5px;
-  }
-
-  & input:focus {
-    border-color: #4298ef;
-  }
-`;
-
-const Swatch = styled.div<{ $color: string }>`
-  display: inline-flex;
-  ${({ $color }): string => {
-    if ($color.toUpperCase() === "#FFFFFF") {
-      return `border: 1px solid ${theme.palette.grey["300"]};`;
-    }
-    return `border: 1px solid ${$color};`;
-  }}
-  background-color: ${({ $color }): string => $color};
-  min-width: 28px;
-  height: 28px;
-  border-radius: 5px;
-`;
-
-const ColorPickerInput = styled.div`
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  margin: 8px;
-  gap: 8px;
-`;
-
-export default AdvancedColorPicker;

webapp/IronCalc/src/components/ColorPicker/ColorPicker.tsx

@@ -1,275 +1,185 @@
 import styled from "@emotion/styled";
-import { Menu, MenuItem, type PopoverOrigin } from "@mui/material";
+import Popover, { type PopoverOrigin } from "@mui/material/Popover";
-import { Plus } from "lucide-react";
+import { Check } from "lucide-react";
+import type React from "react";
 import { useEffect, useRef, useState } from "react";
+import { HexColorInput, HexColorPicker } from "react-colorful";
 import { useTranslation } from "react-i18next";
 import { theme } from "../../theme";
-import AdvancedColorPicker from "./AdvancedColorPicker";
 
 type ColorPickerProps = {
   color: string;
-  defaultColor: string;
-  title: string;
   onChange: (color: string) => void;
   onClose: () => void;
   anchorEl: React.RefObject<HTMLElement | null>;
-  anchorOrigin: PopoverOrigin;
+  anchorOrigin?: PopoverOrigin;
-  transformOrigin: PopoverOrigin;
+  transformOrigin?: PopoverOrigin;
   open: boolean;
 };
 
-const ColorPicker = ({
+const colorPickerWidth = 240;
-  color,
+const colorfulHeight = 240;
-  defaultColor,
+
-  title,
+const ColorPicker = (properties: ColorPickerProps) => {
-  onChange,
+  const [color, setColor] = useState<string>(properties.color);
-  onClose,
-  anchorEl,
-  anchorOrigin,
-  transformOrigin,
-  open,
-}: ColorPickerProps) => {
-  const [selectedColor, setSelectedColor] = useState<string>(color);
-  const [isPickerOpen, setPickerOpen] = useState(false);
   const recentColors = useRef<string[]>([]);
+
   const { t } = useTranslation();
 
-  useEffect(() => {
+  const closePicker = (newColor: string): void => {
-    setSelectedColor(color);
-  }, [color]);
-
-  const handleColorSelect = (color: string) => {
-    if (!recentColors.current.includes(color)) {
     const maxRecentColors = 14;
-      recentColors.current = [color, ...recentColors.current].slice(
+    const colors = recentColors.current.filter((c) => c !== newColor);
-        0,
+    recentColors.current = [newColor, ...colors].slice(0, maxRecentColors);
-        maxRecentColors,
+    properties.onChange(newColor);
-      );
-    }
-    setSelectedColor(color || theme.palette.common.black);
-    onChange(color);
-    setPickerOpen(false);
   };
 
-  const handleClose = () => {
+  const handleClose = (): void => {
-    setPickerOpen(false);
+    properties.onClose();
-    onClose();
   };
 
-  // Colors definitions
+  useEffect(() => {
-  const mainColors = [
+    setColor(properties.color);
+  }, [properties.color]);
+
+  const presetColors = [
     "#FFFFFF",
-    "#272525",
     "#1B717E",
+    "#59B9BC",
     "#3BB68A",
     "#8CB354",
     "#F8CD3C",
     "#F2994A",
     "#EC5753",
+    "#D03627",
     "#523E93",
     "#3358B7",
   ];
 
-  const lightTones = [
-    theme.palette.grey[50],
-    theme.palette.grey[100],
-    theme.palette.grey[200],
-    theme.palette.grey[300],
-    theme.palette.grey[400],
-  ];
-
-  const darkTones = [
-    theme.palette.grey[500],
-    theme.palette.grey[600],
-    theme.palette.grey[700],
-    theme.palette.grey[800],
-    theme.palette.grey[900],
-  ];
-
-  const tealTones = ["#BBD4D8", "#82B1B8", "#498D98", "#1E5A63", "#224348"];
-  const greenTones = ["#C4E9DC", "#93D7BF", "#62C5A1", "#358A6C", "#2F5F4D"];
-  const limeTones = ["#DDE8CC", "#C0D5A1", "#A3C276", "#6E8846", "#4F5E38"];
-  const yellowTones = ["#FDF0C5", "#FBE394", "#F9D764", "#B99A36", "#7A682E"];
-  const orangeTones = ["#FBE0C9", "#F8C79B", "#F5AD6E", "#B5763F", "#785334"];
-  const redTones = ["#F9CDCB", "#F5A3A0", "#F07975", "#B14845", "#763937"];
-  const purpleTones = ["#CBC5DF", "#A095C4", "#7565A9", "#453672", "#382F51"];
-  const blueTones = ["#C2CDE9", "#8FA3D7", "#5D79C5", "#30498B", "#2C395F"];
-
-  const toneArrays = [
-    lightTones,
-    darkTones,
-    tealTones,
-    greenTones,
-    limeTones,
-    yellowTones,
-    orangeTones,
-    redTones,
-    purpleTones,
-    blueTones,
-  ];
-
-  if (!open) {
-    return null;
-  }
-
-  if (isPickerOpen) {
   return (
-      <AdvancedColorPicker
+    <Popover
-        color={selectedColor}
+      open={properties.open}
-        onAccept={handleColorSelect}
-        onCancel={() => setPickerOpen(false)}
-        anchorEl={anchorEl}
-        anchorOrigin={anchorOrigin}
-        transformOrigin={transformOrigin}
-        open={true}
-      />
-    );
-  }
-
-  return (
-    <StyledMenu
-      anchorEl={anchorEl.current}
-      open={true}
       onClose={handleClose}
-      anchorOrigin={anchorOrigin}
+      anchorEl={properties.anchorEl.current}
-      transformOrigin={transformOrigin}
+      anchorOrigin={
+        properties.anchorOrigin || { vertical: "bottom", horizontal: "left" }
+      }
+      transformOrigin={
+        properties.transformOrigin || { vertical: "top", horizontal: "left" }
+      }
     >
-      <MenuItemWrapper onClick={() => handleColorSelect(defaultColor)}>
+      <ColorPickerDialog>
-        <MenuItemSquare style={{ backgroundColor: defaultColor }} />
+        <HexColorPicker
-        <MenuItemText>{title}</MenuItemText>
+          color={color}
-      </MenuItemWrapper>
+          onChange={(newColor): void => {
+            setColor(newColor);
+          }}
+        />
+        <HorizontalDivider />
+        <ColorPickerInput>
+          <HexWrapper>
+            <HexLabel>{"Hex"}</HexLabel>
+            <HexColorInputBox>
+              <HashLabel>{"#"}</HashLabel>
+              <HexColorInput
+                color={color}
+                onChange={(newColor): void => {
+                  setColor(newColor);
+                }}
+              />
+            </HexColorInputBox>
+          </HexWrapper>
+          <Swatch $color={color} />
+        </ColorPickerInput>
         <HorizontalDivider />
-      <ColorsWrapper>
         <ColorList>
-          {mainColors.map((presetColor) => (
+          {presetColors.map((presetColor) => (
-            <ColorSwatch
+            <RecentColorButton
               key={presetColor}
               $color={presetColor}
               onClick={(): void => {
-                setSelectedColor(presetColor);
+                setColor(presetColor);
-                handleColorSelect(presetColor);
               }}
             />
           ))}
         </ColorList>
-        <ColorGrid>
+
-          {toneArrays.map((tones) => (
-            <ColorGridCol key={tones.join("-")}>
-              {tones.map((presetColor) => (
-                <ColorSwatch
-                  key={presetColor}
-                  $color={presetColor}
-                  onClick={(): void => {
-                    setSelectedColor(presetColor);
-                    handleColorSelect(presetColor);
-                  }}
-                />
-              ))}
-            </ColorGridCol>
-          ))}
-        </ColorGrid>
-      </ColorsWrapper>
-      <HorizontalDivider />
-      <RecentLabel>{t("color_picker.custom")}</RecentLabel>
-      <RecentColorsList>
         {recentColors.current.length > 0 ? (
           <>
+            <HorizontalDivider />
+            <RecentLabel>{"Recent"}</RecentLabel>
+            <ColorList>
               {recentColors.current.map((recentColor) => (
-              <ColorSwatch
+                <RecentColorButton
                   key={recentColor}
                   $color={recentColor}
                   onClick={(): void => {
-                  setSelectedColor(recentColor);
+                    setColor(recentColor);
-                  handleColorSelect(recentColor);
                   }}
                 />
               ))}
+            </ColorList>
           </>
         ) : (
-          <EmptyContainer />
+          <div />
         )}
-        <StyledPlusButton
+        <Buttons>
-          onClick={() => setPickerOpen(true)}
+          <StyledButton
-          title={t("color_picker.add")}
+            onClick={(): void => {
+              closePicker(color);
+            }}
           >
-          <Plus />
+            <Check
-        </StyledPlusButton>
+              style={{ width: "16px", height: "16px", marginRight: "8px" }}
-      </RecentColorsList>
+            />
-    </StyledMenu>
+            {t("color_picker.apply")}
+          </StyledButton>
+        </Buttons>
+      </ColorPickerDialog>
+    </Popover>
   );
 };
 
-// Styled Components
+const Buttons = styled.div`
-const StyledMenu = styled(Menu)`
+  display: flex;
-  & .MuiPaper-root {
+  justify-content: flex-end;
-    border-radius: 8px;
+  margin: 8px;
-    padding: 4px 0px;
+`;
-    margin-left: -4px;
+
-    max-width: 220px;
+const StyledButton = styled("div")`
-  }
+  cursor: pointer;
-  & .MuiList-root {
+  color: #ffffff;
-    padding: 0;
+  background: #f2994a;
+  padding: 0px 10px;
+  height: 36px;
+  line-height: 36px;
+  border-radius: 4px;
+  display: flex;
+  align-items: center;
+  font-family: "Inter";
+  font-size: 14px;
+  &:hover {
+    background: #d68742;
   }
 `;
 
-const MenuItemWrapper = styled(MenuItem)`
+const RecentLabel = styled.div`
-  display: flex;
+  font-family: "Inter";
-  flex-direction: row;
-  justify-content: flex-start;
   font-size: 12px;
-  gap: 8px;
+  font-family: Inter;
-  width: calc(100% - 8px);
+  margin: 8px 8px 0px 8px;
-  min-width: 172px;
+  color: ${theme.palette.text.secondary};
-  margin: 0px 4px 4px 4px;
-  border-radius: 4px;
-  padding: 8px;
-  height: 32px;
-`;
-
-const MenuItemText = styled("div")`
-  color: #000;
-`;
-
-const MenuItemSquare = styled.div`
-  width: 16px;
-  height: 16px;
-  box-sizing: border-box;
-  margin-top: 0px;
-  border: 1px solid ${theme.palette.grey["300"]};
-  border-radius: 4px;
-`;
-
-const ColorsWrapper = styled.div`
-  display: flex;
-  flex-direction: column;
-  margin: 4px;
 `;
 
 const ColorList = styled.div`
   display: flex;
   flex-wrap: wrap;
   flex-direction: row;
-  margin: 8px 8px 0px 8px;
-  justify-content: flex-start;
-  gap: 4px;
-`;
-
-const ColorGrid = styled.div`
-  display: flex;
-  flex-direction: row;
-  justify-content: flex-start;
   margin: 8px;
-  gap: 4px;
-`;
-
-const ColorGridCol = styled.div`
-  display: flex;
-  flex-direction: column;
   justify-content: flex-start;
-  gap: 4px;
+  gap: 4.7px;
 `;
 
-const ColorSwatch = styled.button<{ $color: string }>`
+const RecentColorButton = styled.button<{ $color: string }>`
   width: 16px;
   height: 16px;
   ${({ $color }): string => {
@@ -279,7 +189,7 @@ const ColorSwatch = styled.button<{ $color: string }>`
     return `border: 1px solid ${$color};`;
   }}
   background-color: ${({ $color }): string => {
-    return $color === "transparent" ? "none" : $color;
+    return $color;
   }};
   box-sizing: border-box;
   margin-top: 0px;
@@ -297,50 +207,111 @@ const HorizontalDivider = styled.div`
   border-top: 1px solid ${theme.palette.grey["200"]};
 `;
 
-const RecentLabel = styled.div`
+const ColorPickerDialog = styled.div`
-  font-family: "Inter";
+  background: ${theme.palette.background.default};
-  font-size: 12px;
+  width: ${colorPickerWidth}px;
-  font-family: Inter;
+  padding: 0px;
-  margin: 8px 12px 0px 12px;
-  color: ${theme.palette.text.secondary};
-`;
-
-const RecentColorsList = styled.div`
   display: flex;
-  flex-wrap: wrap;
+  flex-direction: column;
-  flex-direction: row;
-  padding: 8px;
-  margin: 0px 4px;
-  justify-content: flex-start;
-  gap: 4px;
-`;
 
-const StyledPlusButton = styled("button")`
+  & .react-colorful {
-  display: flex;
+    height: ${colorfulHeight}px;
-  justify-content: center;
+    width: ${colorPickerWidth}px;
-  flex-wrap: wrap;
-  align-items: center;
-  border: none;
-  background: none;
-  font-size: 12px;
-  height: 16px;
-  width: 16px;
-  margin: 0;
-  padding: 0;
-  border-radius: 4px;
-  svg {
-    width: 16px;
-    height: 16px;
   }
+  & .react-colorful__saturation {
+    border-bottom: none;
+    border-radius: 0px;
+  }
+  & .react-colorful__hue {
+    height: 8px;
+    margin: 8px;
+    border-radius: 5px;
+  }
+  & .react-colorful__saturation-pointer {
+    width: 14px;
+    height: 14px;
+  }
+  & .react-colorful__hue-pointer {
+    width: 7px;
+    border-radius: 8px;
+    height: 16px;
+    width: 16px;
+    border-bottom: 1px solid #eee;
+  }
+`;
+
+const HashLabel = styled.div`
+  margin: auto 0px auto 10px;
+  font-size: 13px;
+  color: #333;
+  font-family: ${theme.typography.button.fontFamily};
+`;
+
+const HexLabel = styled.div`
+  margin: auto 0px;
+  font-size: 12px;
+  display: inline-flex;
+  font-family: ${theme.typography.button.fontFamily};
+`;
+
+const HexColorInputBox = styled.div`
+  display: inline-flex;
+  flex-grow: 1;
+  width: 140px;
+  height: 28px;
+  border: 1px solid ${theme.palette.grey["300"]};
+  border-radius: 5px;
   &:hover {
-    cursor: pointer;
+    border: 1px solid ${theme.palette.grey["600"]};
-    outline: 1px solid ${theme.palette.grey["300"]};
+  }
+  &:focus-within {
+    outline: 2px solid ${theme.palette.secondary.main};
     outline-offset: 1px;
   }
 `;
 
-const EmptyContainer = styled.div`
+const HexWrapper = styled.div`
-  display: none;
+  display: flex;
+  gap: 8px;
+  flex-grow: 1;
+  & input {
+    min-width: 0px;
+    border: 0px;
+    background: ${theme.palette.background.default};
+    outline: none;
+    font-family: ${theme.typography.button.fontFamily};
+    font-size: 12px;
+    text-transform: uppercase;
+    text-align: right;
+    padding-right: 10px;
+    border-radius: 5px;
+  }
+
+  & input:focus {
+    border-color: #4298ef;
+  }
+`;
+
+const Swatch = styled.div<{ $color: string }>`
+  display: inline-flex;
+  ${({ $color }): string => {
+    if ($color.toUpperCase() === "#FFFFFF") {
+      return `border: 1px solid ${theme.palette.grey["300"]};`;
+    }
+    return `border: 1px solid ${$color};`;
+  }}
+  background-color: ${({ $color }): string => $color};
+  width: 28px;
+  height: 28px;
+  border-radius: 5px;
+`;
+
+const ColorPickerInput = styled.div`
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  margin: 8px;
+  gap: 8px;
 `;
 
 export default ColorPicker;

webapp/IronCalc/src/components/SheetTabBar/SheetTab.tsx

@@ -2,7 +2,6 @@ import { Button, Menu, MenuItem, styled } from "@mui/material";
 import type { MenuItemProps } from "@mui/material";
 import { ChevronDown } from "lucide-react";
 import { useRef, useState } from "react";
-import { useTranslation } from "react-i18next";
 import { theme } from "../../theme";
 import ColorPicker from "../ColorPicker/ColorPicker";
 import { isInReferenceMode } from "../Editor/util";
@@ -29,7 +28,6 @@ function SheetTab(props: SheetTabProps) {
   const [colorPickerOpen, setColorPickerOpen] = useState(false);
   const colorButton = useRef<HTMLDivElement>(null);
   const open = Boolean(anchorEl);
-  const { t } = useTranslation();
   const handleOpen = (event: React.MouseEvent<HTMLButtonElement>) => {
     setAnchorEl(event.currentTarget);
   };
@@ -138,8 +136,6 @@ function SheetTab(props: SheetTabProps) {
       />
       <ColorPicker
         color={color}
-        defaultColor="#FFFFFF"
-        title={t("color_picker.no_fill")}
         onChange={(color): void => {
           props.onColorChanged(color);
           setColorPickerOpen(false);
@@ -149,8 +145,6 @@ function SheetTab(props: SheetTabProps) {
         }}
         anchorEl={colorButton}
         open={colorPickerOpen}
-        anchorOrigin={{ vertical: "bottom", horizontal: "right" }}
-        transformOrigin={{ vertical: "bottom", horizontal: "left" }}
       />
       <SheetDeleteDialog
         open={deleteDialogOpen}

webapp/IronCalc/src/components/Toolbar/Toolbar.tsx

@@ -7,6 +7,8 @@ import type {
 import { styled } from "@mui/material/styles";
 import type {} from "@mui/system";
 import {
+  AArrowDown,
+  AArrowUp,
   AlignCenter,
   AlignLeft,
   AlignRight,
@@ -20,11 +22,9 @@ import {
   Grid2x2X,
   ImageDown,
   Italic,
-  Minus,
   PaintBucket,
   PaintRoller,
   Percent,
-  Plus,
   Redo2,
   RemoveFormatting,
   Strikethrough,
@@ -32,7 +32,6 @@ import {
   Type,
   Underline,
   Undo2,
-  WrapText,
 } from "lucide-react";
 import { useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -65,7 +64,6 @@ type ToolbarProperties = {
   onToggleStrike: (v: boolean) => void;
   onToggleHorizontalAlign: (v: string) => void;
   onToggleVerticalAlign: (v: string) => void;
-  onToggleWrapText: (v: boolean) => void;
   onCopyStyles: () => void;
   onTextColorPicked: (hex: string) => void;
   onFillColorPicked: (hex: string) => void;
@@ -76,14 +74,12 @@ type ToolbarProperties = {
   onDownloadPNG: () => void;
   fillColor: string;
   fontColor: string;
-  fontSize: number;
   bold: boolean;
   underline: boolean;
   italic: boolean;
   strike: boolean;
   horizontalAlign: HorizontalAlignment;
   verticalAlign: VerticalAlignment;
-  wrapText: boolean;
   canEdit: boolean;
   numFmt: string;
   showGridLines: boolean;
@@ -209,30 +205,6 @@ function Toolbar(properties: ToolbarProperties) {
         </StyledButton>
       </FormatMenu>
       <Divider />
-      <StyledButton
-        type="button"
-        $pressed={false}
-        disabled={!canEdit}
-        onClick={() => {
-          properties.onIncreaseFontSize(-1);
-        }}
-        title={t("toolbar.decrease_font_size")}
-      >
-        <Minus />
-      </StyledButton>
-      <FontSizeBox>{properties.fontSize}</FontSizeBox>
-      <StyledButton
-        type="button"
-        $pressed={false}
-        disabled={!canEdit}
-        onClick={() => {
-          properties.onIncreaseFontSize(1);
-        }}
-        title={t("toolbar.increase_font_size")}
-      >
-        <Plus />
-      </StyledButton>
-      <Divider />
       <StyledButton
         type="button"
         $pressed={properties.bold}
@@ -281,6 +253,28 @@ function Toolbar(properties: ToolbarProperties) {
       >
         <Type />
       </StyledButton>
+      <StyledButton
+        type="button"
+        $pressed={false}
+        disabled={!canEdit}
+        onClick={() => {
+          properties.onIncreaseFontSize(1);
+        }}
+        title={t("toolbar.increase_font_size")}
+      >
+        <AArrowUp />
+      </StyledButton>
+      <StyledButton
+        type="button"
+        $pressed={false}
+        disabled={!canEdit}
+        onClick={() => {
+          properties.onIncreaseFontSize(-1);
+        }}
+        title={t("toolbar.decrease_font_size")}
+      >
+        <AArrowDown />
+      </StyledButton>
       <StyledButton
         type="button"
         $pressed={false}
@@ -369,17 +363,6 @@ function Toolbar(properties: ToolbarProperties) {
       >
         <ArrowDownToLine />
       </StyledButton>
-      <StyledButton
-        type="button"
-        $pressed={properties.wrapText === true}
-        onClick={() => {
-          properties.onToggleWrapText(!properties.wrapText);
-        }}
-        disabled={!canEdit}
-        title={t("toolbar.wrap_text")}
-      >
-        <WrapText />
-      </StyledButton>
 
       <Divider />
       <StyledButton
@@ -410,10 +393,10 @@ function Toolbar(properties: ToolbarProperties) {
       <StyledButton
         type="button"
         $pressed={false}
+        disabled={!canEdit}
         onClick={() => {
           properties.onClearFormatting();
         }}
-        disabled={!canEdit}
         title={t("toolbar.clear_formatting")}
       >
         <RemoveFormatting />
@@ -421,10 +404,10 @@ function Toolbar(properties: ToolbarProperties) {
       <StyledButton
         type="button"
         $pressed={false}
+        disabled={!canEdit}
         onClick={() => {
           properties.onDownloadPNG();
         }}
-        disabled={!canEdit}
         title={t("toolbar.selected_png")}
       >
         <ImageDown />
@@ -432,8 +415,6 @@ function Toolbar(properties: ToolbarProperties) {
 
       <ColorPicker
         color={properties.fontColor}
-        defaultColor="#000000"
-        title={t("color_picker.default")}
         onChange={(color): void => {
           properties.onTextColorPicked(color);
           setFontColorPickerOpen(false);
@@ -443,17 +424,11 @@ function Toolbar(properties: ToolbarProperties) {
         }}
         anchorEl={fontColorButton}
         open={fontColorPickerOpen}
-        anchorOrigin={{ vertical: "bottom", horizontal: "left" }}
-        transformOrigin={{ vertical: "top", horizontal: "left" }}
       />
       <ColorPicker
         color={properties.fillColor}
-        defaultColor="#FFFFFF"
-        title={t("color_picker.default")}
         onChange={(color): void => {
-          if (color !== null) {
           properties.onFillColorPicked(color);
-          }
           setFillColorPickerOpen(false);
         }}
         onClose={() => {
@@ -461,8 +436,6 @@ function Toolbar(properties: ToolbarProperties) {
         }}
         anchorEl={fillColorButton}
         open={fillColorPickerOpen}
-        anchorOrigin={{ vertical: "bottom", horizontal: "left" }}
-        transformOrigin={{ vertical: "top", horizontal: "left" }}
       />
       <BorderPicker
         onChange={(border): void => {
@@ -561,16 +534,4 @@ const Divider = styled("div")({
   margin: "0px 12px",
 });
 
-const FontSizeBox = styled("div")({
-  width: "24px",
-  height: "24px",
-  lineHeight: "24px",
-  textAlign: "center",
-  fontFamily: "Inter",
-  fontSize: "11px",
-  border: `1px solid ${theme.palette.grey["300"]}`,
-  borderRadius: "4px",
-  minWidth: "24px",
-});
-
 export default Toolbar;

webapp/IronCalc/src/components/Workbook/Workbook.tsx

@@ -112,10 +112,6 @@ const Workbook = (props: { model: Model; workbookState: WorkbookState }) => {
     updateRangeStyle("alignment.vertical", value);
   };
 
-  const onToggleWrapText = (value: boolean) => {
-    updateRangeStyle("alignment.wrap_text", `${value}`);
-  };
-
   const onTextColorPicked = (hex: string) => {
     updateRangeStyle("font.color", hex);
   };
@@ -536,7 +532,6 @@ const Workbook = (props: { model: Model; workbookState: WorkbookState }) => {
         onToggleStrike={onToggleStrike}
         onToggleHorizontalAlign={onToggleHorizontalAlign}
         onToggleVerticalAlign={onToggleVerticalAlign}
-        onToggleWrapText={onToggleWrapText}
         onCopyStyles={onCopyStyles}
         onTextColorPicked={onTextColorPicked}
         onFillColorPicked={onFillColorPicked}
@@ -567,15 +562,19 @@ const Workbook = (props: { model: Model; workbookState: WorkbookState }) => {
           const {
             range: [rowStart, columnStart, rowEnd, columnEnd],
           } = model.getSelectedView();
-          // NB: cells outside of the displayed area are not rendered
+          const { topLeftCell, bottomRightCell } =
-          // I think the only reasonable way to do this would be server side.
+            worksheetCanvas.getVisibleCells();
+          const firstRow = Math.max(rowStart, topLeftCell.row);
+          const firstColumn = Math.max(columnStart, topLeftCell.column);
+          const lastRow = Math.min(rowEnd, bottomRightCell.row);
+          const lastColumn = Math.min(columnEnd, bottomRightCell.column);
           let [x, y] = worksheetCanvas.getCoordinatesByCell(
-            rowStart,
+            firstRow,
-            columnStart,
+            firstColumn,
           );
           const [x1, y1] = worksheetCanvas.getCoordinatesByCell(
-            rowEnd + 1,
+            lastRow + 1,
-            columnEnd + 1,
+            lastColumn + 1,
           );
           const width = (x1 - x) * devicePixelRatio;
           const height = (y1 - y) * devicePixelRatio;
@@ -629,7 +628,6 @@ const Workbook = (props: { model: Model; workbookState: WorkbookState }) => {
         }}
         fillColor={style.fill.fg_color || "#FFFFFF"}
         fontColor={style.font.color}
-        fontSize={style.font.sz}
         bold={style.font.b}
         underline={style.font.u}
         italic={style.font.i}
@@ -640,7 +638,6 @@ const Workbook = (props: { model: Model; workbookState: WorkbookState }) => {
         verticalAlign={
           style.alignment?.vertical ? style.alignment.vertical : "bottom"
         }
-        wrapText={style.alignment?.wrap_text || false}
         canEdit={true}
         numFmt={style.num_fmt}
         showGridLines={model.getShowGridLines(model.getSelectedSheet())}

webapp/IronCalc/src/components/Worksheet/usePointer.ts

@@ -236,17 +236,10 @@ const usePointer = (options: PointerSettings): PointerEvents => {
           );
           // we continue to select the new cell
         }
-        if (event.shiftKey) {
-          // We are extending the selection
-          options.onAreaSelecting(cell);
-          options.onAreaSelected();
-        } else {
-          // We are selecting a single cell
         options.onCellSelected(cell, event);
         isSelecting.current = true;
         worksheetWrapper.setPointerCapture(event.pointerId);
       }
-      }
     },
     [options],
   );

webapp/IronCalc/src/components/WorksheetCanvas/worksheetCanvas.ts

@@ -19,13 +19,6 @@ import {
   outlineColor,
 } from "./constants";
 
-export interface UserSelection {
-  userId: string;
-  color: string;
-  selection: [number, number, number, number, number]; // [sheet, rowStart, columnStart, rowEnd, columnEnd]
-  div: HTMLDivElement;
-}
-
 export interface CanvasSettings {
   model: Model;
   width: number;
@@ -77,53 +70,6 @@ function hexToRGBA10Percent(colorHex: string): string {
   return `rgba(${red}, ${green}, ${blue}, ${alpha})`;
 }
 
-/**
- * Splits the given text into multiple lines. If `wrapText` is true, it applies word-wrapping
- * based on the specified canvas context, maximum width, and horizontal padding.
- *
- * - First, the text is split by newline characters so that explicit newlines are respected.
- * - If wrapping is enabled, each line is further split into words and measured against the
- *   available width. Whenever adding an extra word would exceed
- *   this limit, a new line is started.
- *
- * @param text     The text to split into lines.
- * @param wrapText Whether to apply word-wrapping or just return text split by newlines.
- * @param context  The `CanvasRenderingContext2D` used for measuring text width.
- * @param width    The maximum width for each line.
- * @returns        An array of lines (strings), each fitting within the specified width if wrapping is enabled.
- */
-function computeWrappedLines(
-  text: string,
-  wrapText: boolean,
-  context: CanvasRenderingContext2D,
-  width: number,
-): string[] {
-  // Split the text into lines
-  const rawLines = text.split("\n");
-  if (!wrapText) {
-    // If there is no wrapping, return the raw lines
-    return rawLines;
-  }
-  const wrappedLines = [];
-  for (const line of rawLines) {
-    const words = line.split(" ");
-    let currentLine = words[0];
-    for (let i = 1; i < words.length; i += 1) {
-      const word = words[i];
-      const testLine = `${currentLine} ${word}`;
-      const textWidth = context.measureText(testLine).width;
-      if (textWidth < width) {
-        currentLine = testLine;
-      } else {
-        wrappedLines.push(currentLine);
-        currentLine = word;
-      }
-    }
-    wrappedLines.push(currentLine);
-  }
-  return wrappedLines;
-}
-
 export default class WorksheetCanvas {
   sheetWidth: number;
 
@@ -425,7 +371,6 @@ export default class WorksheetCanvas {
     if (style.alignment?.vertical) {
       verticalAlign = style.alignment.vertical;
     }
-    const wrapText = style.alignment?.wrap_text || false;
 
     const context = this.ctx;
     context.font = font;
@@ -551,14 +496,9 @@ export default class WorksheetCanvas {
     context.rect(x, y, width, height);
     context.clip();
 
-    // Is there any better to determine the line height?
+    // Is there any better parameter?
-    const lineHeight = fontSize * 1.5;
+    const lineHeight = 22;
-    const lines = computeWrappedLines(
+    const lines = fullText.split("\n");
-      fullText,
-      wrapText,
-      context,
-      width - padding,
-    );
     const lineCount = lines.length;
 
     lines.forEach((text, line) => {
@@ -668,16 +608,14 @@ export default class WorksheetCanvas {
       const sheet = this.model.getSelectedSheet();
       const rows = this.model.getRowsWithData(sheet, column);
       let width = 0;
+      // This is a bit of a HACK. We should use the actual font size and weather is bold or not
+      const fontSize = 13;
+      this.ctx.font = `${fontSize}px ${defaultCellFontFamily}`;
       for (const row of rows) {
         const fullText = this.model.getFormattedCellValue(sheet, row, column);
         if (fullText === "") {
           continue;
         }
-        const style = this.model.getCellStyle(sheet, row, column);
-        const fontSize = style.font.sz;
-        let font = `${fontSize}px ${defaultCellFontFamily}`;
-        font = style.font.b ? `bold ${font}` : `400 ${font}`;
-        this.ctx.font = font;
         const lines = fullText.split("\n");
         for (const line of lines) {
           const textWidth = this.ctx.measureText(line).width;
@@ -737,26 +675,18 @@ export default class WorksheetCanvas {
       const sheet = this.model.getSelectedSheet();
       const columns = this.model.getColumnsWithData(sheet, row);
       let height = 0;
+      const lineHeight = 22;
+      // This is a bit of a HACK. We should use the actual font size and weather is bold or not
+      const fontSize = 13;
+      this.ctx.font = `${fontSize}px ${defaultCellFontFamily}`;
       for (const column of columns) {
         const fullText = this.model.getFormattedCellValue(sheet, row, column);
         if (fullText === "") {
           continue;
         }
-        const width = this.getColumnWidth(sheet, column);
+        const lines = fullText.split("\n");
-        const style = this.model.getCellStyle(sheet, row, column);
-        const fontSize = style.font.sz;
-        const lineHeight = fontSize * 1.5;
-        let font = `${fontSize}px ${defaultCellFontFamily}`;
-        font = style.font.b ? `bold ${font}` : `400 ${font}`;
-        this.ctx.font = font;
-        const lines = computeWrappedLines(
-          fullText,
-          style.alignment?.wrap_text || false,
-          this.ctx,
-          width,
-        );
         const lineCount = lines.length;
-        // This is computed so that the y position of the text is independent of the vertical alignment
+        // This si computed so that the y position of the text is independent of the vertical alignment
         const textHeight = (lineCount - 1) * lineHeight + 8 + fontSize;
         height = Math.max(height, textHeight);
       }
@@ -1251,33 +1181,6 @@ export default class WorksheetCanvas {
     editor.style.height = `${height - 1}px`;
   }
 
-  private drawUsersSelection(): void {
-    const users = this.model.getUsers();
-    for (const handle of document.querySelectorAll(
-      ".user-selection-ironcalc",
-    ))
-      handle.remove();
-    users.forEach((user, index) => {
-      const { sheet, row, column } = user;
-      if (sheet !== this.model.getSelectedSheet()) {
-        return;
-      }
-      const [x, y] = this.getCoordinatesByCell(row, column);
-      const width = this.getColumnWidth(sheet, column);
-      const height = this.getRowHeight(sheet, row);
-      const div = document.createElement("div");
-      const color = getColor(index + 1);
-      div.className = "user-selection-ironcalc";
-      div.style.left = `${x}px`;
-      div.style.top = `${y}px`;
-      div.style.width = `${width}px`;
-      div.style.height = `${height}px`;
-      div.style.border = `1px solid ${color}`;
-      div.style.position = "absolute";
-      this.canvas.parentElement?.appendChild(div);
-    });
-  }
-
   private drawCellOutline(): void {
     const { cellOutline, areaOutline, cellOutlineHandle } = this;
     if (this.workbookState.getEditingCell()) {
@@ -1629,7 +1532,6 @@ export default class WorksheetCanvas {
     context.stroke();
 
     this.drawCellOutline();
-    this.drawUsersSelection();
     this.drawCellEditor();
     this.drawExtendToArea();
     this.drawActiveRanges(topLeftCell, bottomRightCell);

webapp/IronCalc/src/locale/en_us.json

@@ -26,7 +26,6 @@
     "vertical_align_middle": " Align middle",
     "vertical_align_top": "Align top",
     "selected_png": "Export Selected area as PNG",
-    "wrap_text": "Wrap text",
     "format_menu": {
       "auto": "Auto",
       "number": "Number",
@@ -121,11 +120,6 @@
     "insert_column": "Insert column"
   },
   "color_picker": {
-    "apply": "Add color",
+    "apply": "Apply"
-    "cancel": "Cancel",
-    "add": "Add new color",
-    "default": "Default color",
-    "no_fill": "No fill",
-    "custom": "Custom"
   }
 }

webapp/app.ironcalc.com/frontend/src/components/FileBar.tsx

@@ -1,7 +1,7 @@
 import styled from "@emotion/styled";
 import type { Model } from "@ironcalc/workbook";
 import { IronCalcIcon, IronCalcLogo } from "@ironcalc/workbook";
-import { useLayoutEffect, useRef, useState } from "react";
+import { useRef, useState } from "react";
 import { FileMenu } from "./FileMenu";
 import { ShareButton } from "./ShareButton";
 import ShareWorkbookDialog from "./ShareWorkbookDialog";
@@ -9,20 +9,6 @@ import { WorkbookTitle } from "./WorkbookTitle";
 import { downloadModel } from "./rpc";
 import { updateNameSelectedWorkbook } from "./storage";
 
-// This hook is used to get the width of the window
-function useWindowWidth() {
-  const [width, setWidth] = useState(0);
-  useLayoutEffect(() => {
-    function updateWidth() {
-      setWidth(window.innerWidth);
-    }
-    window.addEventListener("resize", updateWidth);
-    updateWidth();
-    return () => window.removeEventListener("resize", updateWidth);
-  }, []);
-  return width;
-}
-
 export function FileBar(properties: {
   model: Model;
   newModel: () => void;
@@ -30,19 +16,8 @@ export function FileBar(properties: {
   onModelUpload: (blob: ArrayBuffer, fileName: string) => Promise<void>;
   onDelete: () => void;
 }) {
+  const hiddenInputRef = useRef<HTMLInputElement>(null);
   const [isDialogOpen, setIsDialogOpen] = useState(false);
-  const spacerRef = useRef<HTMLDivElement>(null);
-  const [maxTitleWidth, setMaxTitleWidth] = useState(0);
-  const width = useWindowWidth();
-
-  // biome-ignore lint/correctness/useExhaustiveDependencies: We need to update the maxTitleWidth when the width changes
-  useLayoutEffect(() => {
-    const el = spacerRef.current;
-    if (el) {
-      const bb = el.getBoundingClientRect();
-      setMaxTitleWidth(bb.right - bb.left - 50);
-    }
-  }, [width]);
 
   return (
     <FileBarWrapper>
@@ -66,17 +41,19 @@ export function FileBar(properties: {
       >
         Help
       </HelpButton>
-      <WorkbookTitleWrapper>
       <WorkbookTitle
         name={properties.model.getName()}
         onNameChange={(name) => {
           properties.model.setName(name);
           updateNameSelectedWorkbook(properties.model, name);
         }}
-          maxWidth={maxTitleWidth}
       />
-      </WorkbookTitleWrapper>
+      <input
-      <Spacer ref={spacerRef} />
+        ref={hiddenInputRef}
+        type="text"
+        style={{ position: "absolute", left: -9999, top: -9999 }}
+      />
+      <div style={{ marginLeft: "auto" }} />
       <DialogContainer>
         <ShareButton onClick={() => setIsDialogOpen(true)} />
         {isDialogOpen && (
@@ -91,19 +68,6 @@ export function FileBar(properties: {
   );
 }
 
-// We want the workbook title to be exactly an the center of the page,
-// so we need an absolute position
-const WorkbookTitleWrapper = styled("div")`
-  position: absolute;
-  left: 50%;
-  transform: translateX(-50%);
-`;
-
-// The "Spacer" component occupies as much space as possible between the menu and the share button
-const Spacer = styled("div")`
-  flex-grow: 1;
-`;
-
 const StyledDesktopLogo = styled(IronCalcLogo)`
   width: 120px;
   margin-left: 12px;
@@ -139,15 +103,14 @@ const Divider = styled("div")`
   border-left: 1px solid #e0e0e0;
 `;
 
-// The container must be relative positioned so we can position the title absolutely
 const FileBarWrapper = styled("div")`
-  position: relative;
   height: 60px;
   width: 100%;
   background: #fff;
   display: flex;
   align-items: center;
   border-bottom: 1px solid #e0e0e0;
+  position: relative;
   justify-content: space-between;
 `;
 

webapp/app.ironcalc.com/frontend/src/components/WorkbookTitle.tsx

@@ -1,105 +1,89 @@
 import styled from "@emotion/styled";
-import {
+import { type ChangeEvent, useEffect, useRef, useState } from "react";
-  type ChangeEvent,
-  useEffect,
-  useLayoutEffect,
-  useRef,
-  useState,
-} from "react";
 
-// This element has a in situ editable text
+export function WorkbookTitle(props: {
-// We use a virtual element to compute the size of the input
-
-export function WorkbookTitle(properties: {
   name: string;
   onNameChange: (name: string) => void;
-  maxWidth: number;
 }) {
   const [width, setWidth] = useState(0);
-  const [name, setName] = useState(properties.name);
+  const [value, setValue] = useState(props.name);
   const mirrorDivRef = useRef<HTMLDivElement>(null);
 
-  const handleChange = (event: ChangeEvent<HTMLInputElement>) => {
+  const handleChange = (event: ChangeEvent<HTMLTextAreaElement>) => {
-    setName(event.target.value);
+    setValue(event.target.value);
     if (mirrorDivRef.current) {
       setWidth(mirrorDivRef.current.scrollWidth);
     }
   };
 
   useEffect(() => {
-    setName(properties.name);
-  }, [properties.name]);
-
-  // biome-ignore lint/correctness/useExhaustiveDependencies: We need to change the width with every value change
-  useLayoutEffect(() => {
     if (mirrorDivRef.current) {
       setWidth(mirrorDivRef.current.scrollWidth);
     }
-  }, [name]);
+  }, []);
+
+  useEffect(() => {
+    setValue(props.name);
+  }, [props.name]);
 
   return (
-    <Container
+    <div
       style={{
-        width: Math.min(width, properties.maxWidth),
+        position: "absolute",
+        left: "50%",
+        textAlign: "center",
+        transform: "translateX(-50%)",
+        // height: "60px",
+        // lineHeight: "60px",
+        padding: "8px",
+        fontSize: "14px",
+        fontWeight: "700",
+        fontFamily: "Inter",
+        width,
       }}
     >
-      <TitleInput
+      <TitleWrapper
-        value={name}
+        value={value}
-        onInput={handleChange}
+        rows={1}
+        onChange={handleChange}
         onBlur={(event) => {
-          properties.onNameChange(event.target.value);
+          props.onNameChange(event.target.value);
         }}
-        onKeyDown={(event) => {
+        style={{ width: width }}
-          switch (event.key) {
-            case "Enter": {
-              // If we hit "Enter" finish editing
-              event.currentTarget.blur();
-              break;
-            }
-            case "Escape": {
-              // revert changes
-              setName(properties.name);
-              break;
-            }
-          }
-        }}
-        style={{ width: Math.min(width, properties.maxWidth) }}
         spellCheck="false"
-      />
+      >
-      <MirrorDiv ref={mirrorDivRef}>{name}</MirrorDiv>
+        {value}
-    </Container>
+      </TitleWrapper>
+      <div
+        ref={mirrorDivRef}
+        style={{
+          position: "absolute",
+          top: "-9999px",
+          left: "-9999px",
+          whiteSpace: "pre-wrap",
+          textWrap: "nowrap",
+          visibility: "hidden",
+          fontFamily: "inherit",
+          fontSize: "inherit",
+          lineHeight: "inherit",
+          padding: "inherit",
+          border: "inherit",
+        }}
+      >
+        {value}
+      </div>
+    </div>
   );
 }
 
-const Container = styled("div")`
+const TitleWrapper = styled("textarea")`
-  text-align: center;
-  padding: 8px;
-  font-size: 14px;
-  font-weight: 700;
-  font-family: Inter;
-`;
-
-const MirrorDiv = styled("div")`
-  position: absolute;
-  top: -9999px;
-  left: -9999px;
-  white-space: pre-wrap;
-  text-wrap: nowrap;
-  visibility: hidden;
-  font-family: inherit;
-  font-size: inherit;
-  line-height: inherit;
-  padding: inherit;
-  border: inherit;
-`;
-
-const TitleInput = styled("input")`
   vertical-align: middle;
   text-align: center;
   height: 20px;
   line-height: 20px;
   border-radius: 4px;
   padding: inherit;
+  overflow: hidden;
   outline: none;
   resize: none;
   text-wrap: nowrap;
@@ -113,6 +97,8 @@ const TitleInput = styled("input")`
   font-weight: inherit;
   font-family: inherit;
   font-size: inherit;
-  overflow: ellipsis;
+  max-width: 520px;
+  overflow: hidden;
   white-space: nowrap;
+  text-overflow: ellipsis;
 `;

webapp/app.ironcalc.com/server/Cargo.lock

@@ -925,7 +925,7 @@ dependencies = [
 
 [[package]]
 name = "ironcalc"
-version = "0.5.0"
+version = "0.2.0"
 dependencies = [
  "bitcode",
  "chrono",
@@ -940,7 +940,7 @@ dependencies = [
 
 [[package]]
 name = "ironcalc_base"
-version = "0.5.0"
+version = "0.2.0"
 dependencies = [
  "bitcode",
  "chrono",
@@ -956,7 +956,7 @@ dependencies = [
 
 [[package]]
 name = "ironcalc_server"
-version = "0.5.0"
+version = "0.1.0"
 dependencies = [
  "ironcalc",
  "rand",

webapp/app.ironcalc.com/server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ironcalc_server"
-version = "0.5.0"
+version = "0.3.0"
 edition = "2021"
 
 [dependencies]

xlsx/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ironcalc"
-version = "0.5.0"
+version = "0.3.0"
 authors = ["Nicolás Hatcher <nicolas@theuniverse.today>"]
 edition = "2021"
 homepage = "https://www.ironcalc.com"
@@ -20,7 +20,7 @@ thiserror = "1.0"
 # Uses `../base` when used locally, and uses
 # the inicated version from crates.io when published.
 # https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html#multiple-locations
-ironcalc_base = { path = "../base", version = "0.5" }
+ironcalc_base = { path = "../base", version = "0.3" }
 itertools = "0.12"
 chrono = "0.4"
 bitcode = "0.6.0"

xlsx/src/import/mod.rs

@@ -110,7 +110,6 @@ fn load_xlsx_from_reader<R: Read + std::io::Seek>(
         metadata,
         tables,
         views,
-        users: Vec::new(),
     })
 }
 

xlsx/src/import/tables.rs

@@ -75,21 +75,30 @@ pub(crate) fn load_table<R: Read + std::io::Seek>(
 
     // style index of the header row of the table
     let header_row_dxf_id = if let Some(index_str) = table.attribute("headerRowDxfId") {
-        index_str.parse::<u32>().ok()
+        match index_str.parse::<u32>() {
+            Ok(i) => Some(i),
+            Err(_) => None,
+        }
     } else {
         None
     };
 
     // style index of the header row of the table
     let data_dxf_id = if let Some(index_str) = table.attribute("headerRowDxfId") {
-        index_str.parse::<u32>().ok()
+        match index_str.parse::<u32>() {
+            Ok(i) => Some(i),
+            Err(_) => None,
+        }
     } else {
         None
     };
 
     // style index of the totals row of the table
     let totals_row_dxf_id = if let Some(index_str) = table.attribute("totalsRowDxfId") {
-        index_str.parse::<u32>().ok()
+        match index_str.parse::<u32>() {
+            Ok(i) => Some(i),
+            Err(_) => None,
+        }
     } else {
         None
     };
@@ -134,21 +143,30 @@ pub(crate) fn load_table<R: Read + std::io::Seek>(
 
         // style index of the header row of the table
         let header_row_dxf_id = if let Some(index_str) = table_column.attribute("headerRowDxfId") {
-            index_str.parse::<u32>().ok()
+            match index_str.parse::<u32>() {
+                Ok(i) => Some(i),
+                Err(_) => None,
+            }
         } else {
             None
         };
 
         // style index of the header row of the table column
         let data_dxf_id = if let Some(index_str) = table_column.attribute("headerRowDxfId") {
-            index_str.parse::<u32>().ok()
+            match index_str.parse::<u32>() {
+                Ok(i) => Some(i),
+                Err(_) => None,
+            }
         } else {
             None
         };
 
         // style index of the totals row of the table column
         let totals_row_dxf_id = if let Some(index_str) = table_column.attribute("totalsRowDxfId") {
-            index_str.parse::<u32>().ok()
+            match index_str.parse::<u32>() {
+                Ok(i) => Some(i),
+                Err(_) => None,
+            }
         } else {
             None
         };

xlsx/src/import/worksheets.rs

@@ -1,11 +1,10 @@
 #![allow(clippy::unwrap_used)]
 
-use ironcalc_base::expressions::parser::static_analysis::add_implicit_intersection;
 use std::{collections::HashMap, io::Read, num::ParseIntError};
 
 use ironcalc_base::{
     expressions::{
-        parser::{stringify::to_rc_format, DefinedNameS, Parser},
+        parser::{stringify::to_rc_format, Parser},
         token::{get_error_by_english_name, Error},
         types::CellReferenceRC,
         utils::{column_to_number, parse_reference_a1},
@@ -43,7 +42,7 @@ pub(crate) struct Relationship {
 }
 
 impl WorkbookXML {
-    fn get_defined_names_with_scope(&self) -> Vec<DefinedNameS> {
+    fn get_defined_names_with_scope(&self) -> Vec<(String, Option<u32>)> {
         let sheet_id_index: Vec<u32> = self.worksheets.iter().map(|s| s.sheet_id).collect();
 
         let defined_names = self
@@ -59,7 +58,7 @@ impl WorkbookXML {
                     // convert Option<usize> to Option<u32>
                     .map(|pos| pos as u32);
 
-                (dn.name.clone(), index, dn.formula.clone())
+                (dn.name.clone(), index)
             })
             .collect::<Vec<_>>();
         defined_names
@@ -305,14 +304,12 @@ fn from_a1_to_rc(
     worksheets: &[String],
     context: String,
     tables: HashMap<String, Table>,
-    defined_names: Vec<DefinedNameS>,
+    defined_names: Vec<(String, Option<u32>)>,
 ) -> Result<String, XlsxError> {
     let mut parser = Parser::new(worksheets.to_owned(), defined_names, tables);
     let cell_reference =
         parse_reference(&context).map_err(|error| XlsxError::Xml(error.to_string()))?;
-    let mut t = parser.parse(&formula, &cell_reference);
+    let t = parser.parse(&formula, &cell_reference);
-    add_implicit_intersection(&mut t, true);
-
     Ok(to_rc_format(&t))
 }
 
@@ -709,7 +706,7 @@ pub(super) fn load_sheet<R: Read + std::io::Seek>(
     worksheets: &[String],
     tables: &HashMap<String, Table>,
     shared_strings: &mut Vec<String>,
-    defined_names: Vec<DefinedNameS>,
+    defined_names: Vec<(String, Option<u32>)>,
 ) -> Result<(Worksheet, bool), XlsxError> {
     let sheet_name = &settings.name;
     let sheet_id = settings.id;
@@ -808,9 +805,8 @@ pub(super) fn load_sheet<R: Read + std::io::Seek>(
         // r: reference. A1 style
         // s: style index
         // t: cell type
-        // cm: cell metadata (used for dynamic arrays)
+        // Unused attributes
-        // vm: value metadata (used for #SPILL! and #CALC! errors)
+        // cm (cell metadata), ph (Show Phonetic), vm (value metadata)
-        // ph: Show Phonetic, unused
         for cell in row.children() {
             let cell_ref = get_attribute(&cell, "r")?;
             let column_letter = get_column_from_ref(cell_ref);
@@ -826,8 +822,6 @@ pub(super) fn load_sheet<R: Read + std::io::Seek>(
                 None
             };
 
-            let cell_metadata = cell.attribute("cm");
-
             // type, the default type being "n" for number
             // If the cell does not have a value is an empty cell
             let cell_type = match cell.attribute("t") {
@@ -937,16 +931,13 @@ pub(super) fn load_sheet<R: Read + std::io::Seek>(
                             }
                         }
                     }
+                    "array" => {
+                        return Err(XlsxError::NotImplemented("array formulas".to_string()));
+                    }
                     "dataTable" => {
                         return Err(XlsxError::NotImplemented("data table formulas".to_string()));
                     }
-                    "array" | "normal" => {
+                    "normal" => {
-                        let is_dynamic_array = cell_metadata == Some("1");
-                        if formula_type == "array" && !is_dynamic_array {
-                            // Dynamic formulas in Excel are formulas of type array with the cm=1, those we support.
-                            // On the other hand the old CSE formulas or array formulas are not supported in IronCalc for the time being
-                            return Err(XlsxError::NotImplemented("array formulas".to_string()));
-                        }
                         // Its a cell with a simple formula
                         let formula = fs[0].text().unwrap_or("").to_string();
                         let context = format!("{}!{}", sheet_name, cell_ref);

xlsx/src/lib.rs

@@ -9,9 +9,11 @@
 //!
 //! ```toml
 //! [dependencies]
-//! ironcalc = { git = "https://github.com/ironcalc/IronCalc", tag = "v0.5.0" }
+//! ironcalc = { git = "https://github.com/ironcalc/IronCalc" }
 //! ```
 //!
+//! <small> until version 0.5.0 you should use the git dependencies as stated </small>
+//!
 //! A simple example with some numbers, a new sheet and a formula:
 //!
 //!

xlsx/tests/test.rs

@@ -48,8 +48,8 @@ fn test_example() {
     assert_eq!(ws[0].views[&0].range, [13, 5, 20, 14]);
 
     let model2 = load_from_icalc("tests/example.ic").unwrap();
-    let _ = bitcode::encode(&model2.workbook);
+    let s = bitcode::encode(&model2.workbook);
-    assert_eq!(workbook, model2.workbook);
+    assert_eq!(workbook, model2.workbook, "{:?}", s);
 }
 
 #[test]
@@ -346,31 +346,21 @@ fn test_xlsx() {
     let path = format!("{}", Uuid::new_v4());
     let dir = temp_folder.join(path);
     fs::create_dir(&dir).unwrap();
-    let mut is_error = false;
     for file_path in entries {
         let file_name_str = file_path.file_name().unwrap().to_str().unwrap();
         let file_path_str = file_path.to_str().unwrap();
         println!("Testing file: {}", file_path_str);
         if file_name_str.ends_with(".xlsx") && !file_name_str.starts_with('~') {
             if let Err(message) = test_file(file_path_str) {
-                println!("Error with file: '{file_path_str}'");
                 println!("{}", message);
-                is_error = true;
+                panic!("Model was evaluated inconsistently with XLSX data.")
-            }
-            let t = test_load_and_saving(file_path_str, &dir);
-            if t.is_err() {
-                println!("Error while load and saving file: {file_path_str}");
-                is_error = true;
             }
+            assert!(test_load_and_saving(file_path_str, &dir).is_ok());
         } else {
             println!("skipping");
         }
     }
     fs::remove_dir_all(&dir).unwrap();
-    assert!(
-        !is_error,
-        "Models were evaluated inconsistently with XLSX data."
-    );
 }
 
 #[test]
@@ -385,26 +375,20 @@ fn no_export() {
     let path = format!("{}", Uuid::new_v4());
     let dir = temp_folder.join(path);
     fs::create_dir(&dir).unwrap();
-    let mut is_error = false;
     for file_path in entries {
         let file_name_str = file_path.file_name().unwrap().to_str().unwrap();
         let file_path_str = file_path.to_str().unwrap();
         println!("Testing file: {}", file_path_str);
         if file_name_str.ends_with(".xlsx") && !file_name_str.starts_with('~') {
             if let Err(message) = test_file(file_path_str) {
-                println!("Error with file: '{file_path_str}'");
                 println!("{}", message);
-                is_error = true;
+                panic!("Model was evaluated inconsistently with XLSX data.")
             }
         } else {
             println!("skipping");
         }
     }
     fs::remove_dir_all(&dir).unwrap();
-    assert!(
-        !is_error,
-        "Models were evaluated inconsistently with XLSX data."
-    );
 }
 
 // This test verifies whether exporting the merged cells functionality is happening properly or not.
@@ -492,7 +476,6 @@ fn test_documentation_xlsx() {
     let path = format!("{}", Uuid::new_v4());
     let dir = temp_folder.join(path);
     fs::create_dir(&dir).unwrap();
-    let mut is_error = false;
     for file_path in entries {
         let file_name_str = file_path.file_name().unwrap().to_str().unwrap();
         let file_path_str = file_path.to_str().unwrap();
@@ -504,7 +487,7 @@ fn test_documentation_xlsx() {
         if file_name_str.ends_with(".xlsx") && !file_name_str.starts_with('~') {
             if let Err(message) = test_file(file_path_str) {
                 println!("{}", message);
-                is_error = true;
+                panic!("Model was evaluated inconsistently with XLSX data.")
             }
             assert!(test_load_and_saving(file_path_str, &dir).is_ok());
         } else {
@@ -512,10 +495,6 @@ fn test_documentation_xlsx() {
         }
     }
     fs::remove_dir_all(&dir).unwrap();
-    assert!(
-        !is_error,
-        "Models were evaluated inconsistently with XLSX data."
-    )
 }
 
 #[test]