Skip to content

Improvements #6

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
merged 9 commits into from
Apr 25, 2025
Merged

Improvements #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d270bd4
Pass every CannotConsumeTokenException to Error
vojtech-dobes Apr 23, 2025
8190664
Install tracy/tracy for tests
vojtech-dobes Apr 25, 2025
78fccc2
Add visitor system to Vocabulary\Symbol
vojtech-dobes Apr 25, 2025
962e515
Fix typo in "Unexpected token" error
vojtech-dobes Apr 25, 2025
7830d87
Don't hide unexpected token error in case of no matches
vojtech-dobes Apr 25, 2025
20d3efe
Remove location from Token
vojtech-dobes Apr 25, 2025
18b8f5f
Output SelectedNode from OneOf
vojtech-dobes Apr 25, 2025
bf8970a
Add EBNF grammar parser
vojtech-dobes Apr 25, 2025
008f611
Keep tab indentation in phpstan-baseline.neon
vojtech-dobes Apr 25, 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
3 changes: 3 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ trim_trailing_whitespace = true
[*.{md,neon,yml}]
indent_size = 2
indent_style = space

[phpstan-baseline.neon]
indent_style = tab
3 changes: 2 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
"require-dev": {
"nette/tester": "^2.5.4",
"phpstan/phpstan": "^2.1.12",
"spaze/phpstan-disallowed-calls": "^4.5.0"
"spaze/phpstan-disallowed-calls": "^4.5.0",
"tracy/tracy": "^2.10.9"
},
"scripts": {
"phpstan": "phpstan analyse",
Expand Down
77 changes: 76 additions & 1 deletion composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 13 additions & 1 deletion phpstan-baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,16 @@ parameters:
message: '#^Parameter \$column of class Vojtechdobes\\GrammarProcessing\\Location constructor expects int\<0, max\>, int given\.$#'
identifier: argument.type
count: 1
path: src/GrammarProcessing/LexicalGrammar.php
path: src/GrammarProcessing/LocationGetter.php

-
message: '#^Parameter \#1 \$source of method Vojtechdobes\\GrammarProcessing\\Ebnf\\Parser\:\:parseGrammarFromSource\(\) expects string, string\|false given\.$#'
identifier: argument.type
count: 1
path: tests/cases/Grammars/ebnfGrammar.Test.php

-
message: '#^Parameter \#1 \$source of method Vojtechdobes\\GrammarProcessing\\Grammar\:\:parseSource\(\) expects string, string\|false given\.$#'
identifier: argument.type
count: 2
path: tests/cases/Grammars/ebnfGrammar.Test.php
225 changes: 225 additions & 0 deletions src/GrammarProcessing/Ebnf/GrammarFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,225 @@
<?php declare(strict_types=1);

namespace Vojtechdobes\GrammarProcessing\Ebnf;

use Vojtechdobes\GrammarProcessing;


final class GrammarFactory
{

public function createGrammar(): GrammarProcessing\Grammar
{
$lexicalSymbols = [
'letter' => new GrammarProcessing\Vocabulary\Regexp('[a-zA-Z]'),
'digit' => new GrammarProcessing\Vocabulary\Regexp('[0-9]'),
'symbol' => new GrammarProcessing\Vocabulary\OneOf([
new GrammarProcessing\Vocabulary\Literal('['),
new GrammarProcessing\Vocabulary\Literal(']'),
new GrammarProcessing\Vocabulary\Literal('{'),
new GrammarProcessing\Vocabulary\Literal('}'),
new GrammarProcessing\Vocabulary\Literal('('),
new GrammarProcessing\Vocabulary\Literal(')'),
new GrammarProcessing\Vocabulary\Literal('<'),
new GrammarProcessing\Vocabulary\Literal('>'),
new GrammarProcessing\Vocabulary\Literal("'"),
new GrammarProcessing\Vocabulary\Literal('"'),
new GrammarProcessing\Vocabulary\Literal('='),
new GrammarProcessing\Vocabulary\Literal('|'),
new GrammarProcessing\Vocabulary\Literal('.'),
new GrammarProcessing\Vocabulary\Literal(','),
new GrammarProcessing\Vocabulary\Literal(';'),
new GrammarProcessing\Vocabulary\Literal('-'),
new GrammarProcessing\Vocabulary\Literal('+'),
new GrammarProcessing\Vocabulary\Literal('*'),
new GrammarProcessing\Vocabulary\Literal('?'),
new GrammarProcessing\Vocabulary\Literal('\\'),
]),
'character' => new GrammarProcessing\Vocabulary\OneOf([
new GrammarProcessing\Vocabulary\Nonterminal('letter'),
new GrammarProcessing\Vocabulary\Nonterminal('digit'),
new GrammarProcessing\Vocabulary\Nonterminal('symbol'),
new GrammarProcessing\Vocabulary\Literal('_'),
new GrammarProcessing\Vocabulary\Literal(' '),
]),
'identifier' => new GrammarProcessing\Vocabulary\Sequence([
new GrammarProcessing\Vocabulary\Nonterminal('letter'),
new GrammarProcessing\Vocabulary\Repeat(
new GrammarProcessing\Vocabulary\OneOf([
new GrammarProcessing\Vocabulary\Nonterminal('letter'),
new GrammarProcessing\Vocabulary\Nonterminal('digit'),
new GrammarProcessing\Vocabulary\Literal('_'),
]),
0,
null,
),
]),
'terminal' => new GrammarProcessing\Vocabulary\OneOf([
new GrammarProcessing\Vocabulary\Sequence([
new GrammarProcessing\Vocabulary\Literal("'"),
new GrammarProcessing\Vocabulary\Repeat(
new GrammarProcessing\Vocabulary\Subtract(
new GrammarProcessing\Vocabulary\Nonterminal('character'),
new GrammarProcessing\Vocabulary\Literal("'"),
),
1,
null,
),
new GrammarProcessing\Vocabulary\Literal("'"),
]),
new GrammarProcessing\Vocabulary\Sequence([
new GrammarProcessing\Vocabulary\Literal('"'),
new GrammarProcessing\Vocabulary\Repeat(
new GrammarProcessing\Vocabulary\Subtract(
new GrammarProcessing\Vocabulary\Nonterminal('character'),
new GrammarProcessing\Vocabulary\Literal('"'),
),
1,
null,
),
new GrammarProcessing\Vocabulary\Literal('"'),
]),
]),
'S' => new GrammarProcessing\Vocabulary\Repeat(
new GrammarProcessing\Vocabulary\OneOf([
new GrammarProcessing\Vocabulary\Literal(' '),
new GrammarProcessing\Vocabulary\Regexp('\n'),
new GrammarProcessing\Vocabulary\Regexp('\t'),
new GrammarProcessing\Vocabulary\Regexp('\r'),
new GrammarProcessing\Vocabulary\Regexp('\f'),
new GrammarProcessing\Vocabulary\Regexp('\b'),
]),
1,
null,
),
];

$syntacticSymbols = [
'opt_S' => new GrammarProcessing\Vocabulary\Repeat(
new GrammarProcessing\Vocabulary\Nonterminal('S'),
0,
null,
),
'terminator' => new GrammarProcessing\Vocabulary\OneOf([
new GrammarProcessing\Vocabulary\Literal(';'),
new GrammarProcessing\Vocabulary\Literal('.'),
]),
'term' => new GrammarProcessing\Vocabulary\OneOf([
new GrammarProcessing\Vocabulary\Sequence([
new GrammarProcessing\Vocabulary\Literal('('),
new GrammarProcessing\Vocabulary\Nonterminal('opt_S'),
new GrammarProcessing\Vocabulary\Nonterminal('rhs'),
new GrammarProcessing\Vocabulary\Nonterminal('opt_S'),
new GrammarProcessing\Vocabulary\Literal(')'),
]),
new GrammarProcessing\Vocabulary\Sequence([
new GrammarProcessing\Vocabulary\Literal('['),
new GrammarProcessing\Vocabulary\Nonterminal('opt_S'),
new GrammarProcessing\Vocabulary\Nonterminal('rhs'),
new GrammarProcessing\Vocabulary\Nonterminal('opt_S'),
new GrammarProcessing\Vocabulary\Literal(']'),
]),
new GrammarProcessing\Vocabulary\Sequence([
new GrammarProcessing\Vocabulary\Literal('{'),
new GrammarProcessing\Vocabulary\Nonterminal('opt_S'),
new GrammarProcessing\Vocabulary\Nonterminal('rhs'),
new GrammarProcessing\Vocabulary\Nonterminal('opt_S'),
new GrammarProcessing\Vocabulary\Literal('}'),
]),
new GrammarProcessing\Vocabulary\Nonterminal('terminal'),
new GrammarProcessing\Vocabulary\Nonterminal('identifier'),
]),
'factor' => new GrammarProcessing\Vocabulary\OneOf([
new GrammarProcessing\Vocabulary\Sequence([
new GrammarProcessing\Vocabulary\Nonterminal('term'),
new GrammarProcessing\Vocabulary\Nonterminal('opt_S'),
new GrammarProcessing\Vocabulary\Literal('?'),
]),
new GrammarProcessing\Vocabulary\Sequence([
new GrammarProcessing\Vocabulary\Nonterminal('term'),
new GrammarProcessing\Vocabulary\Nonterminal('opt_S'),
new GrammarProcessing\Vocabulary\Literal('*'),
]),
new GrammarProcessing\Vocabulary\Sequence([
new GrammarProcessing\Vocabulary\Nonterminal('term'),
new GrammarProcessing\Vocabulary\Nonterminal('opt_S'),
new GrammarProcessing\Vocabulary\Literal('+'),
]),
new GrammarProcessing\Vocabulary\Sequence([
new GrammarProcessing\Vocabulary\Nonterminal('term'),
new GrammarProcessing\Vocabulary\Nonterminal('opt_S'),
new GrammarProcessing\Vocabulary\Literal('-'),
new GrammarProcessing\Vocabulary\Nonterminal('opt_S'),
new GrammarProcessing\Vocabulary\Nonterminal('term'),
]),
new GrammarProcessing\Vocabulary\Sequence([
new GrammarProcessing\Vocabulary\Nonterminal('term'),
new GrammarProcessing\Vocabulary\Nonterminal('opt_S'),
]),
]),
'concatenation' => new GrammarProcessing\Vocabulary\Sequence([
new GrammarProcessing\Vocabulary\Nonterminal('opt_S'),
new GrammarProcessing\Vocabulary\Nonterminal('factor'),
new GrammarProcessing\Vocabulary\Nonterminal('opt_S'),
new GrammarProcessing\Vocabulary\Repeat(
new GrammarProcessing\Vocabulary\Sequence([
new GrammarProcessing\Vocabulary\Literal(','),
new GrammarProcessing\Vocabulary\Nonterminal('opt_S'),
new GrammarProcessing\Vocabulary\Nonterminal('factor'),
new GrammarProcessing\Vocabulary\Nonterminal('opt_S'),
]),
0,
null,
),
]),
'alternation' => new GrammarProcessing\Vocabulary\Sequence([
new GrammarProcessing\Vocabulary\Nonterminal('opt_S'),
new GrammarProcessing\Vocabulary\Nonterminal('concatenation'),
new GrammarProcessing\Vocabulary\Nonterminal('opt_S'),
new GrammarProcessing\Vocabulary\Repeat(
new GrammarProcessing\Vocabulary\Sequence([
new GrammarProcessing\Vocabulary\Literal('|'),
new GrammarProcessing\Vocabulary\Nonterminal('opt_S'),
new GrammarProcessing\Vocabulary\Nonterminal('concatenation'),
new GrammarProcessing\Vocabulary\Nonterminal('opt_S'),
]),
0,
null,
),
]),
'rhs' => new GrammarProcessing\Vocabulary\Nonterminal('alternation'),
'lhs' => new GrammarProcessing\Vocabulary\Nonterminal('identifier'),
'rule' => new GrammarProcessing\Vocabulary\Sequence([
new GrammarProcessing\Vocabulary\Nonterminal('lhs'),
new GrammarProcessing\Vocabulary\Nonterminal('opt_S'),
new GrammarProcessing\Vocabulary\Literal('='),
new GrammarProcessing\Vocabulary\Nonterminal('opt_S'),
new GrammarProcessing\Vocabulary\Nonterminal('rhs'),
new GrammarProcessing\Vocabulary\Nonterminal('opt_S'),
new GrammarProcessing\Vocabulary\Nonterminal('terminator'),
]),
'grammar' => new GrammarProcessing\Vocabulary\Repeat(
new GrammarProcessing\Vocabulary\Sequence([
new GrammarProcessing\Vocabulary\Nonterminal('opt_S'),
new GrammarProcessing\Vocabulary\Nonterminal('rule'),
new GrammarProcessing\Vocabulary\Nonterminal('opt_S'),
]),
0,
null,
),
];

return new GrammarProcessing\Grammar(
lexicalSymbols: $lexicalSymbols,
syntaxTokenSymbols: [
'identifier',
'terminal',
'symbol',
'S',
],
ignoredTokenSymbols: [],
syntacticSymbols: $syntacticSymbols,
);
}

}
43 changes: 43 additions & 0 deletions src/GrammarProcessing/Ebnf/InterpretationFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?php declare(strict_types=1);

namespace Vojtechdobes\GrammarProcessing\Ebnf;

use Vojtechdobes\GrammarProcessing;


final class InterpretationFactory
{

/**
* @template TLexicalSymbol of string
* @template TSyntaxTokenSymbol of TLexicalSymbol
* @template TIgnoredTokenSymbol of TLexicalSymbol
* @param non-empty-list<TLexicalSymbol> $lexicalSymbols
* @param non-empty-list<TSyntaxTokenSymbol> $syntaxTokenSymbols
* @param list<TIgnoredTokenSymbol> $ignoredTokenSymbols
*/
public function createInterpretation(
array $lexicalSymbols,
array $syntaxTokenSymbols,
array $ignoredTokenSymbols,
): GrammarProcessing\Interpretation
{
return new GrammarProcessing\Interpretation([
'alternation' => new Nodes\Alternation(),
'concatenation' => new Nodes\Concatenation(),
'factor' => new Nodes\Factor(),
'grammar' => new Nodes\Grammar(
lexicalSymbols: $lexicalSymbols,
syntaxTokenSymbols: $syntaxTokenSymbols,
ignoredTokenSymbols: $ignoredTokenSymbols,
),
'identifier' => new Nodes\Identifier(),
'lhs' => new Nodes\Lhs(),
'rhs' => new Nodes\Rhs(),
'rule' => new Nodes\Rule(),
'term' => new Nodes\Term(),
'terminal' => new Nodes\Terminal(),
]);
}

}
Loading