@@ 497-503 (lines=7) @@ | ||
494 | continue; |
|
495 | } |
|
496 | ||
497 | if (!( |
|
498 | (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) && ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) || |
|
499 | (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) || |
|
500 | ($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND) |
|
501 | )) { |
|
502 | continue; |
|
503 | } |
|
504 | ||
505 | if ($nextToken === null) { |
|
506 | continue; |
|
@@ 509-515 (lines=7) @@ | ||
506 | continue; |
|
507 | } |
|
508 | ||
509 | if (!( |
|
510 | (($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) && ($nextToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_START)) || |
|
511 | (($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($nextToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_START)) || |
|
512 | ($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND) |
|
513 | )) { |
|
514 | continue; |
|
515 | } |
|
516 | ||
517 | $tokens2[] = new FormulaToken($value, FormulaToken::TOKEN_TYPE_OPERATORINFIX, FormulaToken::TOKEN_SUBTYPE_INTERSECTION); |
|
518 | } |