Suport for chained range operators in the Calculation Engine (e.g. A3:B1:C2 which gives an effective combined range of A1:C3 or A5:C10:C20:F1 which gives an effective combined range of A1:F20).

MarkBaker · MarkBaker · commit e4b886323456 · 2022-04-13T12:13:44.000+02:00
Next step will be allowing Named Cells/Ranges to be chained in the same way.
diff --git a/src/PhpSpreadsheet/Calculation/Calculation.php b/src/PhpSpreadsheet/Calculation/Calculation.php
@@ -33,11 +33,11 @@ class Calculation
     //    Function (allow for the old @ symbol that could be used to prefix a function, but we'll ignore it)
     const CALCULATION_REGEXP_FUNCTION = '@?(?:_xlfn\.)?([\p{L}][\p{L}\p{N}\.]*)[\s]*\(';
     //    Cell reference (cell or range of cells, with or without a sheet reference)
-    const CALCULATION_REGEXP_CELLREF = '((([^\s,!&%^\/\*\+<>=-]*)|(\'.*?\')|(\".*?\"))!)?\$?\b([a-z]{1,3})\$?(\d{1,7})(?![\w.])';
+    const CALCULATION_REGEXP_CELLREF = '((([^\s,!&%^\/\*\+<>=:`-]*)|(\'.*?\')|(\".*?\"))!)?\$?\b([a-z]{1,3})\$?(\d{1,7})(?![\w.])';
     //    Cell reference (with or without a sheet reference) ensuring absolute/relative
-    const CALCULATION_REGEXP_CELLREF_RELATIVE = '((([^\s\(,!&%^\/\*\+<>=-]*)|(\'.*?\')|(\".*?\"))!)?(\$?\b[a-z]{1,3})(\$?\d{1,7})(?![\w.])';
-    const CALCULATION_REGEXP_COLUMN_RANGE = '(((([^\s\(,!&%^\/\*\+<>=-]*)|(\'.*?\')|(\".*?\"))!)?(\$?[a-z]{1,3})):(?![.*])';
-    const CALCULATION_REGEXP_ROW_RANGE = '(((([^\s\(,!&%^\/\*\+<>=-]*)|(\'.*?\')|(\".*?\"))!)?(\$?[1-9][0-9]{0,6})):(?![.*])';
+    const CALCULATION_REGEXP_CELLREF_RELATIVE = '((([^\s\(,!&%^\/\*\+<>=:`-]*)|(\'.*?\')|(\".*?\"))!)?(\$?\b[a-z]{1,3})(\$?\d{1,7})(?![\w.])';
+    const CALCULATION_REGEXP_COLUMN_RANGE = '(((([^\s\(,!&%^\/\*\+<>=:`-]*)|(\'.*?\')|(\".*?\"))!)?(\$?[a-z]{1,3})):(?![.*])';
+    const CALCULATION_REGEXP_ROW_RANGE = '(((([^\s\(,!&%^\/\*\+<>=:`-]*)|(\'.*?\')|(\".*?\"))!)?(\$?[1-9][0-9]{0,6})):(?![.*])';
     //    Cell reference (with or without a sheet reference) ensuring absolute/relative
     //    Cell ranges ensuring absolute/relative
     const CALCULATION_REGEXP_COLUMNRANGE_RELATIVE = '(\$?[a-z]{1,3}):(\$?[a-z]{1,3})';
@@ -4135,17 +4135,25 @@ private function internalParseFormula($formula, ?Cell $cell = null)
                     $testPrevOp = $stack->last(1);
                     if ($testPrevOp !== null && $testPrevOp['value'] === ':') {
                         //    If we have a worksheet reference, then we're playing with a 3D reference
-                        if ($matches[2] == '') {
+                        if ($matches[2] === '') {
                             //    Otherwise, we 'inherit' the worksheet reference from the start cell reference
                             //    The start of the cell range reference should be the last entry in $output
                             $rangeStartCellRef = $output[count($output) - 1]['value'];
-                            preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/i', $rangeStartCellRef, $rangeStartMatches);
+                            if ($rangeStartCellRef === ':') {
+                                // Do we have chained range operators?
+                                $rangeStartCellRef = $output[count($output) - 2]['value'];
+                            }
+                            preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/miu', $rangeStartCellRef, $rangeStartMatches);
                             if ($rangeStartMatches[2] > '') {
                                 $val = $rangeStartMatches[2] . '!' . $val;
                             }
                         } else {
                             $rangeStartCellRef = $output[count($output) - 1]['value'];
-                            preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/i', $rangeStartCellRef, $rangeStartMatches);
+                            if ($rangeStartCellRef === ':') {
+                                // Do we have chained range operators?
+                                $rangeStartCellRef = $output[count($output) - 2]['value'];
+                            }
+                            preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/miu', $rangeStartCellRef, $rangeStartMatches);
                             if ($rangeStartMatches[2] !== $matches[2]) {
                                 return $this->raiseFormulaError('3D Range references are not yet supported');
                             }
@@ -4461,21 +4469,21 @@ private function processTokenStack($tokens, $cellID = null, ?Cell $cell = null)
 
                 //    Process the operation in the appropriate manner
                 switch ($token) {
-                    //    Comparison (Boolean) Operators
-                    case '>':            //    Greater than
-                    case '<':            //    Less than
-                    case '>=':            //    Greater than or Equal to
-                    case '<=':            //    Less than or Equal to
-                    case '=':            //    Equality
-                    case '<>':            //    Inequality
+                    // Comparison (Boolean) Operators
+                    case '>': // Greater than
+                    case '<': // Less than
+                    case '>=': // Greater than or Equal to
+                    case '<=': // Less than or Equal to
+                    case '=': // Equality
+                    case '<>': // Inequality
                         $result = $this->executeBinaryComparisonOperation($operand1, $operand2, (string) $token, $stack);
                         if (isset($storeKey)) {
                             $branchStore[$storeKey] = $result;
                         }
 
                         break;
-                    //    Binary Operators
-                    case ':':            //    Range
+                    // Binary Operators
+                    case ':': // Range
                         if (strpos($operand1Data['reference'], '!') !== false) {
                             [$sheet1, $operand1Data['reference']] = Worksheet::extractSheetTitle($operand1Data['reference'], true);
                         } else {
diff --git a/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php b/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php
@@ -21,15 +21,8 @@ protected function setUp(): void
     {
         $this->spreadSheet = new Spreadsheet();
         $this->spreadSheet->getActiveSheet()
-            ->setCellValue('A1', 1)
-            ->setCellValue('B1', 2)
-            ->setCellValue('C1', 3)
-            ->setCellValue('A2', 4)
-            ->setCellValue('B2', 5)
-            ->setCellValue('C2', 6)
-            ->setCellValue('A3', 7)
-            ->setCellValue('B3', 8)
-            ->setCellValue('C3', 9);
+            ->fromArray(array_chunk(range(1, 240), 6), null, 'A1', true);
+
     }
 
     /**
@@ -40,33 +33,39 @@ protected function setUp(): void
     public function testRangeEvaluation(string $formula, $expectedResult): void
     {
         $workSheet = $this->spreadSheet->getActiveSheet();
-        $workSheet->setCellValue('E1', $formula);
+        $workSheet->setCellValue('H1', $formula);
 
-        $actualRresult = $workSheet->getCell('E1')->getCalculatedValue();
+        $actualRresult = $workSheet->getCell('H1')->getCalculatedValue();
         self::assertSame($expectedResult, $actualRresult);
     }
 
     public function providerRangeEvaluation(): array
     {
         return[
-            ['=SUM(A1:B3,A1:C2)', 48],
-            ['=COUNT(A1:B3,A1:C2)', 12],
-            ['=SUM(A1:B3 A1:C2)', 12],
-            ['=COUNT(A1:B3 A1:C2)', 4],
-            ['=SUM(A1:A3,C1:C3)', 30],
-            ['=COUNT(A1:A3,C1:C3)', 6],
-            ['=SUM(A1:A3 C1:C3)', Functions::null()],
-            ['=COUNT(A1:A3 C1:C3)', 0],
-            ['=SUM(A1:B2,B2:C3)', 40],
-            ['=COUNT(A1:B2,B2:C3)', 8],
-            ['=SUM(A1:B2 B2:C3)', 5],
-            ['=COUNT(A1:B2 B2:C3)', 1],
-            ['=SUM(A1:C1,A3:C3,B1:C3)', 63],
-            ['=COUNT(A1:C1,A3:C3,B1:C3)', 12],
-            ['=SUM(A1:C1,A3:C3 B1:C3)', 23],
-            ['=COUNT(A1:C1,A3:C3 B1:C3)', 5],
-            ['=SUM(Worksheet!A1:B3,Worksheet!A1:C2)', 48],
-            ['=SUM(Worksheet!A1:Worksheet!B3,Worksheet!A1:Worksheet!C2)', 48],
+            'Sum with Simple Range' => ['=SUM(A1:C3)', 72],
+            'Count with Simple Range' => ['=COUNT(A1:C3)', 9],
+            'Sum with UNION #1' => ['=SUM(A1:B3,A1:C2)', 75],
+            'Count with UNION #1' => ['=COUNT(A1:B3,A1:C2)', 12],
+            'Sum with INTERSECTION #1' => ['=SUM(A1:B3 A1:C2)', 18],
+            'Count with INTERSECTION #1' => ['=COUNT(A1:B3 A1:C2)', 4],
+            'Sum with UNION #2' => ['=SUM(A1:A3,C1:C3)', 48],
+            'Count with UNION #2' => ['=COUNT(A1:A3,C1:C3)', 6],
+            'Sum with INTERSECTION #2 - No Intersect' => ['=SUM(A1:A3 C1:C3)', Functions::null()],
+            'Count with INTERSECTION #2 - No Intersect' => ['=COUNT(A1:A3 C1:C3)', 0],
+            'Sum with UNION #3' => ['=SUM(A1:B2,B2:C3)', 64],
+            'Count with UNION #3' => ['=COUNT(A1:B2,B2:C3)', 8],
+            'Sum with INTERSECTION #3 - Single Cell' => ['=SUM(A1:B2 B2:C3)', 8],
+            'Count with INTERSECTION #3 - Single Cell' => ['=COUNT(A1:B2 B2:C3)', 1],
+            'Sum with Triple UNION' => ['=SUM(A1:C1,A3:C3,B1:C3)', 99],
+            'Count with Triple UNION' => ['=COUNT(A1:C1,A3:C3,B1:C3)', 12],
+            'Sum with UNION and INTERSECTION' => ['=SUM(A1:C1,A3:C3 B1:C3)', 35],
+            'Count with UNION and INTERSECTION' => ['=COUNT(A1:C1,A3:C3 B1:C3)', 5],
+            'Sum with UNION with Worksheet Reference' => ['=SUM(Worksheet!A1:B3,Worksheet!A1:C2)', 75],
+            'Sum with UNION with full Worksheet Reference' => ['=SUM(Worksheet!A1:Worksheet!B3,Worksheet!A1:Worksheet!C2)', 75],
+            'Sum with Chained UNION #1' => ['=SUM(A3:B1:C2)', 72],
+            'Count with Chained UNION #1' => ['=COUNT(A3:B1:C2)', 9],
+            'Sum with Chained UNION #2' => ['=SUM(A5:C10:C20:F1)', 7260],
+            'Count with Chained UNION#2' => ['=COUNT(A5:C10:C20:F1)', 120],
         ];
     }
 
@@ -97,16 +96,16 @@ public function testNamedRangeEvaluation(string $group1, string $group2, string
     public function providerNamedRangeEvaluation(): array
     {
         return[
-            ['$A$1:$B$3', '$A$1:$C$2', '=SUM(GROUP1,GROUP2)', 48],
+            ['$A$1:$B$3', '$A$1:$C$2', '=SUM(GROUP1,GROUP2)', 75],
             ['$A$1:$B$3', '$A$1:$C$2', '=COUNT(GROUP1,GROUP2)', 12],
-            ['$A$1:$B$3', '$A$1:$C$2', '=SUM(GROUP1 GROUP2)', 12],
+            ['$A$1:$B$3', '$A$1:$C$2', '=SUM(GROUP1 GROUP2)', 18],
             ['$A$1:$B$3', '$A$1:$C$2', '=COUNT(GROUP1 GROUP2)', 4],
-            ['$A$1:$B$2', '$B$2:$C$3', '=SUM(GROUP1,GROUP2)', 40],
+            ['$A$1:$B$2', '$B$2:$C$3', '=SUM(GROUP1,GROUP2)', 64],
             ['$A$1:$B$2', '$B$2:$C$3', '=COUNT(GROUP1,GROUP2)', 8],
-            ['$A$1:$B$2', '$B$2:$C$3', '=SUM(GROUP1 GROUP2)', 5],
+            ['$A$1:$B$2', '$B$2:$C$3', '=SUM(GROUP1 GROUP2)', 8],
             ['$A$1:$B$2', '$B$2:$C$3', '=COUNT(GROUP1 GROUP2)', 1],
-            ['Worksheet!$A$1:$B$2', 'Worksheet!$B$2:$C$3', '=SUM(GROUP1,GROUP2)', 40],
-            ['Worksheet!$A$1:Worksheet!$B$2', 'Worksheet!$B$2:Worksheet!$C$3', '=SUM(GROUP1,GROUP2)', 40],
+            ['Worksheet!$A$1:$B$2', 'Worksheet!$B$2:$C$3', '=SUM(GROUP1,GROUP2)', 64],
+            ['Worksheet!$A$1:Worksheet!$B$2', 'Worksheet!$B$2:Worksheet!$C$3', '=SUM(GROUP1,GROUP2)', 64],
         ];
     }
 
@@ -132,9 +131,9 @@ public function testUTF8NamedRangeEvaluation(array $names, array $ranges, string
     public function providerUTF8NamedRangeEvaluation(): array
     {
         return[
-            [['Γειά', 'σου', 'Κόσμε'], ['$A$1', '$B$1:$B$2', '$C$1:$C$3'], '=SUM(Γειά,σου,Κόσμε)', 26],
+            [['Γειά', 'σου', 'Κόσμε'], ['$A$1', '$B$1:$B$2', '$C$1:$C$3'], '=SUM(Γειά,σου,Κόσμε)', 38],
             [['Γειά', 'σου', 'Κόσμε'], ['$A$1', '$B$1:$B$2', '$C$1:$C$3'], '=COUNT(Γειά,σου,Κόσμε)', 6],
-            [['Здравствуй', 'мир'], ['$A$1:$A$3', '$C$1:$C$3'], '=SUM(Здравствуй,мир)', 30],
+            [['Здравствуй', 'мир'], ['$A$1:$A$3', '$C$1:$C$3'], '=SUM(Здравствуй,мир)', 48],
         ];
     }
 
