Skip to content

TASK Binary expression ast with only two operands: left and right #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mhsdesign merged 3 commits into from
Apr 28, 2023
Merged

TASK Binary expression ast with only two operands: left and right #16

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e4175e
TASK: Add tests for the current implementation for multiple chained o…
mhsdesign Apr 23, 2023
174bb3f
WIP: Preparation for BinaryOperandNode with $left and $right instead …
mhsdesign Apr 23, 2023
7d37923
TASK: Inline `BinaryOperandNodes`
mhsdesign Apr 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 6 additions & 38 deletions src/Parser/Ast/BinaryOperandNodes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,16 @@
use PackageFactory\ComponentEngine\Definition\BinaryOperator;
use PackageFactory\ComponentEngine\Parser\Tokenizer\Scanner;
use PackageFactory\ComponentEngine\Parser\Tokenizer\Token;
use PackageFactory\ComponentEngine\Parser\Tokenizer\TokenType;

/**
* @implements \IteratorAggregate<ExpressionNode>
*/
final class BinaryOperandNodes implements \IteratorAggregate, \JsonSerializable
{
/**
* @var ExpressionNode[]
*/
public readonly array $rest;

private function __construct(
public readonly ExpressionNode $first,
ExpressionNode ...$rest
public readonly ExpressionNode $second
) {
$this->rest = $rest;
}

/**
Expand All @@ -55,48 +48,23 @@ public static function fromTokens(ExpressionNode $first, \Iterator $tokens, Bina
$precedence = $operator->toPrecedence();
$operands = [$first];

while (true) {
Scanner::skipSpaceAndComments($tokens);

$operands[] = ExpressionNode::fromTokens($tokens, $precedence);

Scanner::skipSpaceAndComments($tokens);
Scanner::skipSpaceAndComments($tokens);

if (Scanner::isEnd($tokens)) {
break;
}
$operands[] = ExpressionNode::fromTokens($tokens, $precedence);

switch (Scanner::type($tokens)) {
case TokenType::BRACKET_ROUND_CLOSE:
case TokenType::BRACKET_CURLY_CLOSE:
case TokenType::BRACKET_SQUARE_CLOSE:
case TokenType::ARROW_SINGLE:
case TokenType::QUESTIONMARK:
break 2;
case $operator->toTokenType():
Scanner::skipOne($tokens);
break;
default:
if ($precedence->mustStopAt(Scanner::type($tokens))) {
break 2;
} else {
Scanner::assertType($tokens, $operator->toTokenType());
}
break;
}
}
Scanner::skipSpaceAndComments($tokens);

return new self(...$operands);
}

public function getIterator(): \Traversable
{
yield $this->first;
yield from $this->rest;
yield $this->second;
}

public function jsonSerialize(): mixed
{
return [$this->first, ...$this->rest];
return [$this->first, $this->second];
}
}
12 changes: 4 additions & 8 deletions src/Target/Php/Transpiler/BinaryOperation/BinaryOperationTranspiler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,10 @@ public function transpile(BinaryOperationNode $binaryOperationNode): string
shouldAddQuotesIfNecessary: true
);

$result = $expressionTranspiler->transpile($binaryOperationNode->operands->first);
$operator = sprintf(' %s ', $this->transpileBinaryOperator($binaryOperationNode->operator));
$first = $expressionTranspiler->transpile($binaryOperationNode->operands->first);
$operator = $this->transpileBinaryOperator($binaryOperationNode->operator);
$second = $expressionTranspiler->transpile($binaryOperationNode->operands->second);

foreach ($binaryOperationNode->operands->rest as $operandNode) {
$result .= $operator;
$result .= $expressionTranspiler->transpile($operandNode);
}

return sprintf('(%s)', $result);
return sprintf('(%s %s %s)', $first, $operator, $second);
}
}
Loading