@@ -14,14 +14,12 @@ |
||
14 | 14 | use Psr\Log\LoggerInterface; |
15 | 15 | use Railt\Io\File; |
16 | 16 | use Railt\Io\Readable; |
17 | -use Railt\Reflection\Contracts\Document; |
|
18 | 17 | use Railt\Reflection\Contracts\Document as DocumentInterface; |
19 | 18 | use Railt\Reflection\Reflection; |
20 | 19 | use Railt\SDL\Compiler\Dictionary; |
21 | 20 | use Railt\SDL\Compiler\Store; |
22 | 21 | use Railt\SDL\Exception\CompilerException; |
23 | 22 | use Railt\SDL\Exception\InternalException; |
24 | -use Railt\SDL\Frontend\Record\RecordInterface; |
|
25 | 23 | |
26 | 24 | /** |
27 | 25 | * Class Compiler |
@@ -57,7 +57,7 @@ |
||
57 | 57 | |
58 | 58 | /** |
59 | 59 | * @param Readable $readable |
60 | - * @return iterable |
|
60 | + * @return \Generator |
|
61 | 61 | * @throws SyntaxException |
62 | 62 | * @throws \Railt\Io\Exception\ExternalFileException |
63 | 63 | */ |
@@ -14,7 +14,6 @@ |
||
14 | 14 | use Psr\Log\LoggerInterface; |
15 | 15 | use Railt\Io\Readable; |
16 | 16 | use Railt\Parser\Ast\RuleInterface; |
17 | -use Railt\Parser\Exception\UnexpectedTokenException; |
|
18 | 17 | use Railt\Parser\Exception\UnrecognizedTokenException; |
19 | 18 | use Railt\SDL\Exception\SyntaxException; |
20 | 19 | use Railt\SDL\Frontend\Builder; |
@@ -101,8 +101,8 @@ |
||
101 | 101 | |
102 | 102 | /** |
103 | 103 | * @param Readable $file |
104 | - * @param iterable $ast |
|
105 | - * @return iterable |
|
104 | + * @param RuleInterface $ast |
|
105 | + * @return \Generator |
|
106 | 106 | * @throws \Railt\Io\Exception\ExternalFileException |
107 | 107 | */ |
108 | 108 | public function build(Readable $file, iterable $ast): iterable |
@@ -16,11 +16,9 @@ |
||
16 | 16 | use Railt\SDL\Frontend; |
17 | 17 | use Railt\SDL\Frontend\Context\ContextInterface; |
18 | 18 | use Railt\SDL\Frontend\Context\GlobalContext; |
19 | -use Railt\SDL\Frontend\Context\GlobalContextInterface; |
|
20 | 19 | use Railt\SDL\IR\SymbolTable; |
21 | 20 | use Railt\SDL\IR\SymbolTable\ValueInterface; |
22 | 21 | use Railt\SDL\IR\SymbolTableInterface; |
23 | -use Railt\SDL\IR\Type\TypeNameInterface; |
|
24 | 22 | |
25 | 23 | /** |
26 | 24 | * Class Builder |
@@ -116,13 +116,13 @@ |
||
116 | 116 | } |
117 | 117 | |
118 | 118 | |
119 | - echo \str_repeat('=', 60) . "\n"; |
|
120 | - echo \sprintf('| %5s | %-48s |', 'ID', 'VARIABLE') . "\n"; |
|
121 | - echo \str_repeat('-', 60) . "\n"; |
|
119 | + echo \str_repeat('=', 60)."\n"; |
|
120 | + echo \sprintf('| %5s | %-48s |', 'ID', 'VARIABLE')."\n"; |
|
121 | + echo \str_repeat('-', 60)."\n"; |
|
122 | 122 | foreach ($this->table as $id => $var) { |
123 | - echo \sprintf('| %5d | %-48s |', $id, $var) . "\n"; |
|
123 | + echo \sprintf('| %5d | %-48s |', $id, $var)."\n"; |
|
124 | 124 | } |
125 | - echo \str_repeat('=', 60) . "\n"; |
|
125 | + echo \str_repeat('=', 60)."\n"; |
|
126 | 126 | } |
127 | 127 | |
128 | 128 | /** |
@@ -37,7 +37,7 @@ |
||
37 | 37 | /** |
38 | 38 | * @param ContextInterface $ctx |
39 | 39 | * @param RuleInterface $rule |
40 | - * @return mixed|\Generator|void |
|
40 | + * @return \Generator |
|
41 | 41 | */ |
42 | 42 | public function reduce(ContextInterface $ctx, RuleInterface $rule) |
43 | 43 | { |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | $value = yield $rule->getChild(0); |
46 | 46 | |
47 | 47 | if ($value->getType()->typeOf(Type::string())) { |
48 | - yield from $this->load($this->include($ctx, (string)$value->getValue())); |
|
48 | + yield from $this->load($this->include($ctx, (string) $value->getValue())); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | $error = 'Argument of include should be a string, but %s given'; |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | return $inclusion; |
97 | 97 | } |
98 | 98 | |
99 | - $pathname = \dirname($file->getPathname()) . \DIRECTORY_SEPARATOR . $inclusion; |
|
99 | + $pathname = \dirname($file->getPathname()).\DIRECTORY_SEPARATOR.$inclusion; |
|
100 | 100 | $pathname = \str_replace('/./', '/', $pathname); |
101 | 101 | |
102 | 102 | return $pathname; |
@@ -38,7 +38,7 @@ |
||
38 | 38 | /** |
39 | 39 | * @param ContextInterface $ctx |
40 | 40 | * @param RuleInterface $rule |
41 | - * @return \Generator|mixed|void |
|
41 | + * @return \Generator |
|
42 | 42 | */ |
43 | 43 | public function reduce(ContextInterface $ctx, RuleInterface $rule) |
44 | 44 | { |
@@ -31,7 +31,7 @@ |
||
31 | 31 | /** |
32 | 32 | * @param ContextInterface $ctx |
33 | 33 | * @param RuleInterface $rule |
34 | - * @return \Generator|mixed|void |
|
34 | + * @return \Generator |
|
35 | 35 | */ |
36 | 36 | public function reduce(ContextInterface $ctx, RuleInterface $rule) |
37 | 37 | { |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | /** |
39 | 39 | * @param ContextInterface $ctx |
40 | 40 | * @param RuleInterface $rule |
41 | - * @return \Generator|Definition |
|
41 | + * @return \Generator |
|
42 | 42 | * @throws InvalidArgumentException |
43 | 43 | */ |
44 | 44 | public function reduce(ContextInterface $ctx, RuleInterface $rule): \Generator |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | |
61 | 61 | /** |
62 | 62 | * @param RuleInterface $argument |
63 | - * @return \Generator|TypeNameInterface |
|
63 | + * @return \Generator |
|
64 | 64 | */ |
65 | 65 | private function getArgumentName(RuleInterface $argument): \Generator |
66 | 66 | { |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | |
71 | 71 | /** |
72 | 72 | * @param RuleInterface $argument |
73 | - * @return \Generator|TypeNameInterface |
|
73 | + * @return \Generator |
|
74 | 74 | */ |
75 | 75 | private function getArgumentValue(RuleInterface $argument): \Generator |
76 | 76 | { |
@@ -11,14 +11,9 @@ |
||
11 | 11 | |
12 | 12 | use Railt\Parser\Ast\RuleInterface; |
13 | 13 | use Railt\SDL\Exception\InvalidArgumentException; |
14 | -use Railt\SDL\Frontend\AST\TypeNameNode; |
|
15 | 14 | use Railt\SDL\Frontend\Builder\Definition\Definition; |
16 | 15 | use Railt\SDL\Frontend\Context\ContextInterface; |
17 | -use Railt\SDL\Frontend\Matcher; |
|
18 | -use Railt\SDL\Frontend\Parser; |
|
19 | 16 | use Railt\SDL\IR\SymbolTable\ValueInterface; |
20 | -use Railt\SDL\IR\Type; |
|
21 | -use Railt\SDL\IR\Type\Name; |
|
22 | 17 | use Railt\SDL\IR\Type\TypeNameInterface; |
23 | 18 | |
24 | 19 | /** |
@@ -52,7 +52,7 @@ |
||
52 | 52 | yield from $name = $this->getArgumentName($argument); |
53 | 53 | yield from $value = $this->getArgumentValue($argument); |
54 | 54 | |
55 | - $definition->addArgument((string)$name->getReturn(), $value->getReturn()); |
|
55 | + $definition->addArgument((string) $name->getReturn(), $value->getReturn()); |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | return $definition; |
@@ -41,8 +41,8 @@ |
||
41 | 41 | |
42 | 42 | /** |
43 | 43 | * @param ContextInterface $ctx |
44 | - * @param RuleInterface|AstValueInterface $rule |
|
45 | - * @return mixed|Value |
|
44 | + * @param RuleInterface $rule |
|
45 | + * @return Value|null |
|
46 | 46 | */ |
47 | 47 | public function reduce(ContextInterface $ctx, RuleInterface $rule) |
48 | 48 | { |
@@ -35,7 +35,7 @@ |
||
35 | 35 | /** |
36 | 36 | * @param ContextInterface $ctx |
37 | 37 | * @param RuleInterface $rule |
38 | - * @return \Generator|ValueInterface |
|
38 | + * @return \Generator |
|
39 | 39 | */ |
40 | 40 | public function reduce(ContextInterface $ctx, RuleInterface $rule): \Generator |
41 | 41 | { |
@@ -42,7 +42,7 @@ |
||
42 | 42 | /** @var ValueInterface $value */ |
43 | 43 | $value = yield $rule->first('> #GenericInvocationName')->getChild(0); |
44 | 44 | |
45 | - $name = Name::new((string)$value->getValue()); |
|
45 | + $name = Name::new((string) $value->getValue()); |
|
46 | 46 | |
47 | 47 | // TODO Add arguments |
48 | 48 |