sirtimbly/IronCalc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX: Consolidate two structs

Browse Source
This commit is contained in:
Nicolas Hatcher
2024-02-20 15:19:05 +01:00
parent 55a963e360
commit ab2f1f10fc
26 changed files with 379 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
base/src/implicit_intersection.rs
View File

@@ -1,4 +1,4 @@
use crate::calc_result::{CellReference, Range};
use crate::{calc_result::Range, expressions::types::CellReferenceIndex};
/// It returns the closest cell from cell_reference to range in the same column/row
/// Examples
@@ -6,9 +6,9 @@ use crate::calc_result::{CellReference, Range};
/// * i_i(B5, A7:A9) -> None
/// * i_i(B5, A2:D2) -> B2
pub(crate) fn implicit_intersection(
cell_reference: &CellReference,
cell_reference: &CellReferenceIndex,
range: &Range,
) -> Option<CellReference> {
) -> Option<CellReferenceIndex> {
let left = &range.left;
let right = &range.right;
let sheet = cell_reference.sheet;
@@ -22,7 +22,7 @@ pub(crate) fn implicit_intersection(
if left.column != right.column {
return None;
}
return Some(CellReference {
return Some(CellReferenceIndex {
sheet,
row,
column: left.column,
@@ -31,14 +31,14 @@ pub(crate) fn implicit_intersection(
if left.row != right.row {
return None;
}
return Some(CellReference {
return Some(CellReferenceIndex {
sheet,
row: left.row,
column,
});
} else if left.row == right.row && left.column == right.column {
// If the range is a single cell, then return it.
return Some(CellReference {
return Some(CellReferenceIndex {
sheet,
row: left.row,
column: right.column,