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