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