Skip to content

Feature/exception handling improved #3

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
rokde merged 14 commits into from
Nov 5, 2025
Merged

Feature/exception handling improved #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c6a14f8
refactor Parser and AST: add token tracking to nodes and improve erro…
rokde Nov 3, 2025
9625fc0
refactor LexerTest: include `T_WHITESPACE` token cases for improved t…
rokde Nov 5, 2025
0e003d0
update EngineTest: improve exception message validation for runtime e…
rokde Nov 5, 2025
f625361
refactor AstTraverser: adjust condition to update sourceMap only when…
rokde Nov 5, 2025
8a01c00
update EngineTest: enhance runtime error validation and add test for …
rokde Nov 5, 2025
07fdd2c
update Parser and ParserTest: improve error handling and add tests fo…
rokde Nov 5, 2025
eb9deec
update Engine: add exception annotations for execute method
rokde Nov 5, 2025
a9d5c21
refactor LexerTest: replace array token assertions with Token objects…
rokde Nov 5, 2025
7f8c06d
add LexerExceptionTest: verify exception creation with correct message
rokde Nov 5, 2025
619e660
add TokenTest: verify token toArray conversion for T_IDENTIFIER type
rokde Nov 5, 2025
e632b03
update Engine: improve error handling with null-safe token access and…
rokde Nov 5, 2025
a3aa314
update AstTraverser: add sourceMap property and accessor method
rokde Nov 5, 2025
1ca0f0c
update AstTraverser: replace RuntimeException with AstTraverserExcept…
rokde Nov 5, 2025
92868d7
update Parser: add exception annotations for improved error handling …
rokde Nov 5, 2025
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
8 changes: 6 additions & 2 deletions src/Ast/Assignment.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@
namespace PhpScript\Ast;

use PhpScript\Contracts\Node;
use PhpScript\Core\Token;

final readonly class Assignment implements Node
final readonly class Assignment extends BaseNode
{
public function __construct(
public Variable $variable,
public Node $expression,
) {}
?Token $token = null,
) {
parent::__construct($token);
}

public function toArray(): array
{
Expand Down
18 changes: 18 additions & 0 deletions src/Ast/BaseNode.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?php

declare(strict_types=1);

namespace PhpScript\Ast;

use PhpScript\Contracts\Node;
use PhpScript\Core\Token;

abstract readonly class BaseNode implements Node
{
public function __construct(private ?Token $token = null) {}

public function getToken(): ?Token
{
return $this->token;
}
}
8 changes: 6 additions & 2 deletions src/Ast/BinaryOperation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,19 @@
namespace PhpScript\Ast;

use PhpScript\Contracts\Node;
use PhpScript\Core\Token;
use PhpScript\Core\TokenType;

final readonly class BinaryOperation implements Node
final readonly class BinaryOperation extends BaseNode
{
public function __construct(
public Node $left,
public TokenType $operator,
public Node $right,
) {}
?Token $token = null,
) {
parent::__construct($token);
}

public function toArray(): array
{
Expand Down
8 changes: 6 additions & 2 deletions src/Ast/EchoStatement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,16 @@
namespace PhpScript\Ast;

use PhpScript\Contracts\Node;
use PhpScript\Core\Token;

final readonly class EchoStatement implements Node
final readonly class EchoStatement extends BaseNode
{
public function __construct(
public Node $expression,
) {}
?Token $token = null,
) {
parent::__construct($token);
}

public function toArray(): array
{
Expand Down
9 changes: 6 additions & 3 deletions src/Ast/Identifier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,16 @@

namespace PhpScript\Ast;

use PhpScript\Contracts\Node;
use PhpScript\Core\Token;

final readonly class Identifier implements Node
final readonly class Identifier extends BaseNode
{
public function __construct(
public string $name,
) {}
?Token $token = null,
) {
parent::__construct($token);
}

public function toArray(): array
{
Expand Down
9 changes: 6 additions & 3 deletions src/Ast/Literal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,16 @@

namespace PhpScript\Ast;

use PhpScript\Contracts\Node;
use PhpScript\Core\Token;

final readonly class Literal implements Node
final readonly class Literal extends BaseNode
{
public function __construct(
public mixed $value,
) {}
?Token $token = null,
) {
parent::__construct($token);
}

public function toArray(): array
{
Expand Down
8 changes: 6 additions & 2 deletions src/Ast/MemberAccess.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@
namespace PhpScript\Ast;

use PhpScript\Contracts\Node;
use PhpScript\Core\Token;

final readonly class MemberAccess implements Node
final readonly class MemberAccess extends BaseNode
{
public function __construct(
public Node $object,
public Identifier $property,
) {}
?Token $token = null,
) {
parent::__construct($token);
}

public function toArray(): array
{
Expand Down
9 changes: 7 additions & 2 deletions src/Ast/NoOp.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,18 @@

namespace PhpScript\Ast;

use PhpScript\Contracts\Node;
use PhpScript\Core\Token;

/**
* Represents a no-operation statement (e.g., an empty statement ';').
*/
final readonly class NoOp implements Node
final readonly class NoOp extends BaseNode
{
public function __construct(?Token $token = null)
{
parent::__construct($token);
}

public function toArray(): array
{
return [
Expand Down
6 changes: 4 additions & 2 deletions src/Ast/Program.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@

use PhpScript\Contracts\Node;

final readonly class Program implements Node
final readonly class Program extends BaseNode
{
/**
* @param Node[] $statements
*/
public function __construct(
public array $statements,
) {}
) {
parent::__construct();
}

public function toArray(): array
{
Expand Down
9 changes: 6 additions & 3 deletions src/Ast/Variable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,16 @@

namespace PhpScript\Ast;

use PhpScript\Contracts\Node;
use PhpScript\Core\Token;

final readonly class Variable implements Node
final readonly class Variable extends BaseNode
{
public function __construct(
public string $name,
) {}
?Token $token = null,
) {
parent::__construct($token);
}

public function toArray(): array
{
Expand Down
4 changes: 4 additions & 0 deletions src/Contracts/Node.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@

namespace PhpScript\Contracts;

use PhpScript\Core\Token;

interface Node
{
public function getToken(): ?Token;

/**
* @return array<string, mixed>
*/
Expand Down
Loading