ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Pass array arguments to a callable whole, not per element

Browse Source 
The call operator was missing from the parameter classification
table, so its arguments defaulted to the value class, which in
array context iterates a range argument element by element. A
callable such as LAMBDA whose body reduces its argument then
spilled to a #SPILL! error in a dynamic-array formula instead of
returning a single value. Classify the call arguments so each
reaches the callable as a whole array.

Add a regression test covering this case.

Signed-off-by: Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>
Change-Id: Ia13c7b1d1942bd92b0ec4f7f79106237eaac1d01
Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/5586
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Tomaž Vajngerl <tomaz.vajngerl@collabora.com>
(cherry picked from commit 6aa937093e66d1a5a9b212a7cc8e53c24edde4d1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/207821
Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
Tomaž Vajngerl
2026-07-09 08:45:34 +02:00
committed by Xisco Fauli
parent dee27ddfb6
commit 9c34dddef2
2 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc/qa/unit/ucalc_formula2.cxx
+39
View File
@@ -261,6 +261,45 @@ CPPUNIT_TEST_FIXTURE(TestFormula2, testFuncLAMBDA)
m_pDoc->DeleteTab(0);
}
CPPUNIT_TEST_FIXTURE(TestFormula2, testLambdaReducingArgumentDoesNotSpill)
{
// A lambda whose body aggregates a range argument reduces to a single value
// even when entered as a spill-capable dynamic-array formula, the way an
// imported one is.
sc::AutoCalcSwitch aACSwitch(*m_pDoc, true);
m_pDoc->InsertTab(0, u"Sheet1"_ustr);
m_pDoc->SetValue(ScAddress(0, 0, 0), 1.0);
m_pDoc->SetValue(ScAddress(0, 1, 0), 2.0);
m_pDoc->SetValue(ScAddress(0, 2, 0), 3.0);
// A value just below the formula blocks a three-row spill, so a result that
// is wrongly sized to the three-row argument surfaces as a spill error.
m_pDoc->SetValue(ScAddress(2, 1, 0), 99.0);
ScMarkData aMark(m_pDoc->GetSheetLimits());
aMark.SelectOneTable(0);
// The trailing flag makes this a spill-capable dynamic-array master, the
// same kind an imported dynamic-array formula becomes.
m_pDoc->InsertMatrixFormula(2, 0, 2, 0, aMark, u"=LAMBDA(r; SUM(r))(A1:A3)"_ustr, nullptr,
formula::FormulaGrammar::GRAM_DEFAULT, true);
ScFormulaCell* pRangeCell = m_pDoc->GetFormulaCell(ScAddress(2, 0, 0));
CPPUNIT_ASSERT(pRangeCell);
// The whole range reaches the body, which sums it to one value.
CPPUNIT_ASSERT_EQUAL_MESSAGE("the reduced lambda must not report a spill error",
sal_Int32(FormulaError::NONE),
sal_Int32(pRangeCell->GetErrCode()));
CPPUNIT_ASSERT_EQUAL(6.0, m_pDoc->GetValue(ScAddress(2, 0, 0)));
// The value below the formula is untouched, confirming nothing spilled over it.
CPPUNIT_ASSERT_EQUAL(99.0, m_pDoc->GetValue(ScAddress(2, 1, 0)));
m_pDoc->DeleteTab(0);
}
CPPUNIT_TEST_FIXTURE(TestFormula2, testFuncCHOOSE)
{
sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on.
sc/source/core/tool/parclass.cxx
+1
View File
@@ -114,6 +114,7 @@ const ScParameterClassification::RawData ScParameterClassification::pRawData[] =
{ ocAverageIfs, {{ ReferenceOrRefArray, ReferenceOrRefArray, Value }, 2, Value }},
{ ocByCol, {{ ForceArray, Value }, 0, ForceArrayReturn }},
{ ocByRow, {{ ForceArray, Value }, 0, ForceArrayReturn }},
{ ocCall, {{ Value, ForceArray }, 1, Value }},
{ ocCell, {{ Value, Reference }, 0, Value }},
{ ocColumn, {{ Reference }, 0, Value }},
{ ocColumns, {{ Reference }, 1, Value }},