|
@@ 562-573 (lines=12) @@
|
| 559 |
|
} |
| 560 |
|
|
| 561 |
|
if ($token->getTokenType() == FormulaToken::TOKEN_TYPE_OPERATORINFIX && $token->getValue() == '+') { |
| 562 |
|
if ($i == 0) { |
| 563 |
|
continue; |
| 564 |
|
} elseif ((($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) && |
| 565 |
|
($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) || |
| 566 |
|
(($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && |
| 567 |
|
($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) || |
| 568 |
|
($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX) || |
| 569 |
|
($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND)) { |
| 570 |
|
$token->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_MATH); |
| 571 |
|
} else { |
| 572 |
|
continue; |
| 573 |
|
} |
| 574 |
|
|
| 575 |
|
$this->tokens[] = $token; |
| 576 |
|
|
|
@@ 545-552 (lines=8) @@
|
| 542 |
|
if ($token->getTokenType() == FormulaToken::TOKEN_TYPE_OPERATORINFIX && $token->getValue() == '-') { |
| 543 |
|
if ($i == 0) { |
| 544 |
|
$token->setTokenType(FormulaToken::TOKEN_TYPE_OPERATORPREFIX); |
| 545 |
|
} elseif ((($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) && |
| 546 |
|
($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) || |
| 547 |
|
(($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && |
| 548 |
|
($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) || |
| 549 |
|
($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX) || |
| 550 |
|
($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND)) { |
| 551 |
|
$token->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_MATH); |
| 552 |
|
} else { |
| 553 |
|
$token->setTokenType(FormulaToken::TOKEN_TYPE_OPERATORPREFIX); |
| 554 |
|
} |
| 555 |
|
|
PHPOffice /
PhpSpreadsheet
