@@ -20,13 +20,13 @@ |
||
| 20 | 20 | private readonly string $name, |
| 21 | 21 | private readonly array $nodes, |
| 22 | 22 | Context $context = null |
| 23 | - ) { |
|
| 23 | + ){ |
|
| 24 | 24 | $this->context = $context; |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | public function resolve(Builder $builder, string $name): ?Template |
| 28 | 28 | { |
| 29 | - if ($name !== $this->name) { |
|
| 29 | + if ($name !== $this->name){ |
|
| 30 | 30 | return null; |
| 31 | 31 | } |
| 32 | 32 | |
@@ -26,7 +26,8 @@ |
||
| 26 | 26 | |
| 27 | 27 | public function resolve(Builder $builder, string $name): ?Template |
| 28 | 28 | { |
| 29 | - if ($name !== $this->name) { |
|
| 29 | + if ($name !== $this->name) |
|
| 30 | + { |
|
| 30 | 31 | return null; |
| 31 | 32 | } |
| 32 | 33 | |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | public string $path, |
| 23 | 23 | ?string $prefix, |
| 24 | 24 | Context $context = null |
| 25 | - ) { |
|
| 25 | + ){ |
|
| 26 | 26 | $this->prefix = $prefix ?? \substr($path, \strrpos($path, '/') + 1); |
| 27 | 27 | $this->context = $context; |
| 28 | 28 | } |
@@ -32,6 +32,6 @@ discard block |
||
| 32 | 32 | $path = \substr($name, \strlen($this->prefix) + 1); |
| 33 | 33 | $path = \str_replace('.', DIRECTORY_SEPARATOR, $path); |
| 34 | 34 | |
| 35 | - return $builder->load($this->path . DIRECTORY_SEPARATOR . $path); |
|
| 35 | + return $builder->load($this->path.DIRECTORY_SEPARATOR.$path); |
|
| 36 | 36 | } |
| 37 | 37 | } |
@@ -22,10 +22,10 @@ discard block |
||
| 22 | 22 | private string $path, |
| 23 | 23 | string $alias = null, |
| 24 | 24 | Context $context = null |
| 25 | - ) { |
|
| 25 | + ){ |
|
| 26 | 26 | $this->alias = $alias ?? $path; |
| 27 | 27 | |
| 28 | - if ($alias === null && \strrpos($this->alias, '/') !== false) { |
|
| 28 | + if ($alias === null && \strrpos($this->alias, '/') !== false){ |
|
| 29 | 29 | $this->alias = \substr($this->alias, \strrpos($this->alias, '/') + 1); |
| 30 | 30 | } |
| 31 | 31 | |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | |
| 45 | 45 | public function resolve(Builder $builder, string $name): ?Template |
| 46 | 46 | { |
| 47 | - if ($this->alias !== $name) { |
|
| 47 | + if ($this->alias !== $name){ |
|
| 48 | 48 | return null; |
| 49 | 49 | } |
| 50 | 50 | |
@@ -25,7 +25,8 @@ discard block |
||
| 25 | 25 | ) { |
| 26 | 26 | $this->alias = $alias ?? $path; |
| 27 | 27 | |
| 28 | - if ($alias === null && \strrpos($this->alias, '/') !== false) { |
|
| 28 | + if ($alias === null && \strrpos($this->alias, '/') !== false) |
|
| 29 | + { |
|
| 29 | 30 | $this->alias = \substr($this->alias, \strrpos($this->alias, '/') + 1); |
| 30 | 31 | } |
| 31 | 32 | |
@@ -44,7 +45,8 @@ discard block |
||
| 44 | 45 | |
| 45 | 46 | public function resolve(Builder $builder, string $name): ?Template |
| 46 | 47 | { |
| 47 | - if ($this->alias !== $name) { |
|
| 48 | + if ($this->alias !== $name) |
|
| 49 | + { |
|
| 48 | 50 | return null; |
| 49 | 51 | } |
| 50 | 52 | |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | $parser->path = $path; |
| 44 | 44 | $parser->lexer = clone $this->lexer; |
| 45 | 45 | |
| 46 | - foreach ($parser->syntax as $grammar => $stx) { |
|
| 46 | + foreach ($parser->syntax as $grammar => $stx){ |
|
| 47 | 47 | $parser->syntax[$grammar] = clone $stx; |
| 48 | 48 | } |
| 49 | 49 | |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | { |
| 72 | 72 | $template = new Template(); |
| 73 | 73 | |
| 74 | - try { |
|
| 74 | + try{ |
|
| 75 | 75 | /** |
| 76 | 76 | * TODO issue #767 |
| 77 | 77 | * @link https://github.com/spiral/framework/issues/767 |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | new Assembler($template, 'nodes'), |
| 82 | 82 | $this->lexer->parse($stream) |
| 83 | 83 | ); |
| 84 | - } catch (SyntaxException $e) { |
|
| 84 | + }catch (SyntaxException $e){ |
|
| 85 | 85 | throw new ParserException( |
| 86 | 86 | $e->getMessage(), |
| 87 | 87 | new Context($e->getToken(), $this->getPath()), |
@@ -100,21 +100,21 @@ discard block |
||
| 100 | 100 | $node = $asm->getNode(); |
| 101 | 101 | |
| 102 | 102 | $syntax = []; |
| 103 | - foreach ($this->syntax as $grammar => $stx) { |
|
| 103 | + foreach ($this->syntax as $grammar => $stx){ |
|
| 104 | 104 | $syntax[$grammar] = clone $stx; |
| 105 | 105 | } |
| 106 | 106 | |
| 107 | - foreach ($tokens as $token) { |
|
| 108 | - if (!isset($syntax[$token->grammar])) { |
|
| 107 | + foreach ($tokens as $token){ |
|
| 108 | + if (!isset($syntax[$token->grammar])){ |
|
| 109 | 109 | throw new SyntaxException('Undefined token', $token); |
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | $syntax[$token->grammar]->handle($this, $asm, $token); |
| 113 | 113 | } |
| 114 | 114 | |
| 115 | - if ($asm->getNode() !== $node) { |
|
| 115 | + if ($asm->getNode() !== $node){ |
|
| 116 | 116 | throw new SyntaxException( |
| 117 | - 'Invalid node hierarchy, unclosed ' . $asm->getStackPath(), |
|
| 117 | + 'Invalid node hierarchy, unclosed '.$asm->getStackPath(), |
|
| 118 | 118 | $asm->getNode()->getContext()->getToken() |
| 119 | 119 | ); |
| 120 | 120 | } |
@@ -43,7 +43,8 @@ discard block |
||
| 43 | 43 | $parser->path = $path; |
| 44 | 44 | $parser->lexer = clone $this->lexer; |
| 45 | 45 | |
| 46 | - foreach ($parser->syntax as $grammar => $stx) { |
|
| 46 | + foreach ($parser->syntax as $grammar => $stx) |
|
| 47 | + { |
|
| 47 | 48 | $parser->syntax[$grammar] = clone $stx; |
| 48 | 49 | } |
| 49 | 50 | |
@@ -71,7 +72,8 @@ discard block |
||
| 71 | 72 | { |
| 72 | 73 | $template = new Template(); |
| 73 | 74 | |
| 74 | - try { |
|
| 75 | + try |
|
| 76 | + { |
|
| 75 | 77 | /** |
| 76 | 78 | * TODO issue #767 |
| 77 | 79 | * @link https://github.com/spiral/framework/issues/767 |
@@ -81,7 +83,9 @@ discard block |
||
| 81 | 83 | new Assembler($template, 'nodes'), |
| 82 | 84 | $this->lexer->parse($stream) |
| 83 | 85 | ); |
| 84 | - } catch (SyntaxException $e) { |
|
| 86 | + } |
|
| 87 | + catch (SyntaxException $e) |
|
| 88 | + { |
|
| 85 | 89 | throw new ParserException( |
| 86 | 90 | $e->getMessage(), |
| 87 | 91 | new Context($e->getToken(), $this->getPath()), |
@@ -100,19 +104,23 @@ discard block |
||
| 100 | 104 | $node = $asm->getNode(); |
| 101 | 105 | |
| 102 | 106 | $syntax = []; |
| 103 | - foreach ($this->syntax as $grammar => $stx) { |
|
| 107 | + foreach ($this->syntax as $grammar => $stx) |
|
| 108 | + { |
|
| 104 | 109 | $syntax[$grammar] = clone $stx; |
| 105 | 110 | } |
| 106 | 111 | |
| 107 | - foreach ($tokens as $token) { |
|
| 108 | - if (!isset($syntax[$token->grammar])) { |
|
| 112 | + foreach ($tokens as $token) |
|
| 113 | + { |
|
| 114 | + if (!isset($syntax[$token->grammar])) |
|
| 115 | + { |
|
| 109 | 116 | throw new SyntaxException('Undefined token', $token); |
| 110 | 117 | } |
| 111 | 118 | |
| 112 | 119 | $syntax[$token->grammar]->handle($this, $asm, $token); |
| 113 | 120 | } |
| 114 | 121 | |
| 115 | - if ($asm->getNode() !== $node) { |
|
| 122 | + if ($asm->getNode() !== $node) |
|
| 123 | + { |
|
| 116 | 124 | throw new SyntaxException( |
| 117 | 125 | 'Invalid node hierarchy, unclosed ' . $asm->getStackPath(), |
| 118 | 126 | $asm->getNode()->getContext()->getToken() |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | |
| 73 | 73 | public function renderCase(Directive $directive): string |
| 74 | 74 | { |
| 75 | - if ($this->firstSwitchCase) { |
|
| 75 | + if ($this->firstSwitchCase){ |
|
| 76 | 76 | $this->firstSwitchCase = false; |
| 77 | 77 | |
| 78 | 78 | return \sprintf('case (%s): ?>', $directive->body); |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | |
| 84 | 84 | public function renderDefault(Directive $directive): string |
| 85 | 85 | { |
| 86 | - if ($this->firstSwitchCase) { |
|
| 86 | + if ($this->firstSwitchCase){ |
|
| 87 | 87 | $this->firstSwitchCase = false; |
| 88 | 88 | |
| 89 | 89 | return 'default: ?>'; |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | |
| 100 | 100 | public function renderBreak(Directive $directive): string |
| 101 | 101 | { |
| 102 | - if (isset($directive->values[0])) { |
|
| 102 | + if (isset($directive->values[0])){ |
|
| 103 | 103 | return \sprintf('<?php break %s; ?>', $directive->values[0]); |
| 104 | 104 | } |
| 105 | 105 | |
@@ -72,7 +72,8 @@ discard block |
||
| 72 | 72 | |
| 73 | 73 | public function renderCase(Directive $directive): string |
| 74 | 74 | { |
| 75 | - if ($this->firstSwitchCase) { |
|
| 75 | + if ($this->firstSwitchCase) |
|
| 76 | + { |
|
| 76 | 77 | $this->firstSwitchCase = false; |
| 77 | 78 | |
| 78 | 79 | return \sprintf('case (%s): ?>', $directive->body); |
@@ -83,7 +84,8 @@ discard block |
||
| 83 | 84 | |
| 84 | 85 | public function renderDefault(Directive $directive): string |
| 85 | 86 | { |
| 86 | - if ($this->firstSwitchCase) { |
|
| 87 | + if ($this->firstSwitchCase) |
|
| 88 | + { |
|
| 87 | 89 | $this->firstSwitchCase = false; |
| 88 | 90 | |
| 89 | 91 | return 'default: ?>'; |
@@ -99,7 +101,8 @@ discard block |
||
| 99 | 101 | |
| 100 | 102 | public function renderBreak(Directive $directive): string |
| 101 | 103 | { |
| 102 | - if (isset($directive->values[0])) { |
|
| 104 | + if (isset($directive->values[0])) |
|
| 105 | + { |
|
| 103 | 106 | return \sprintf('<?php break %s; ?>', $directive->values[0]); |
| 104 | 107 | } |
| 105 | 108 | |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | |
| 34 | 34 | public function renderBreak(Directive $directive): string |
| 35 | 35 | { |
| 36 | - if (isset($directive->values[0])) { |
|
| 36 | + if (isset($directive->values[0])){ |
|
| 37 | 37 | return \sprintf('<?php break %s; ?>', $directive->values[0]); |
| 38 | 38 | } |
| 39 | 39 | |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | |
| 43 | 43 | public function renderContinue(Directive $directive): string |
| 44 | 44 | { |
| 45 | - if (isset($directive->values[0])) { |
|
| 45 | + if (isset($directive->values[0])){ |
|
| 46 | 46 | return \sprintf('<?php continue %s; ?>', $directive->values[0]); |
| 47 | 47 | } |
| 48 | 48 | |
@@ -33,7 +33,8 @@ discard block |
||
| 33 | 33 | |
| 34 | 34 | public function renderBreak(Directive $directive): string |
| 35 | 35 | { |
| 36 | - if (isset($directive->values[0])) { |
|
| 36 | + if (isset($directive->values[0])) |
|
| 37 | + { |
|
| 37 | 38 | return \sprintf('<?php break %s; ?>', $directive->values[0]); |
| 38 | 39 | } |
| 39 | 40 | |
@@ -42,7 +43,8 @@ discard block |
||
| 42 | 43 | |
| 43 | 44 | public function renderContinue(Directive $directive): string |
| 44 | 45 | { |
| 45 | - if (isset($directive->values[0])) { |
|
| 46 | + if (isset($directive->values[0])) |
|
| 47 | + { |
|
| 46 | 48 | return \sprintf('<?php continue %s; ?>', $directive->values[0]); |
| 47 | 49 | } |
| 48 | 50 | |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | public ?int $offset, |
| 17 | 17 | public string $content, |
| 18 | 18 | public ?string $grammar = null |
| 19 | - ) { |
|
| 19 | + ){ |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | /** |
@@ -32,11 +32,11 @@ discard block |
||
| 32 | 32 | 'content' => $this->content, |
| 33 | 33 | ]; |
| 34 | 34 | |
| 35 | - if ($this->grammar !== null) { |
|
| 35 | + if ($this->grammar !== null){ |
|
| 36 | 36 | $token['type'] = \call_user_func([$this->grammar, 'tokenName'], $this->type); |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | - if ($this->tokens !== []) { |
|
| 39 | + if ($this->tokens !== []){ |
|
| 40 | 40 | $token['tokens'] = $this->tokens; |
| 41 | 41 | } |
| 42 | 42 | |
@@ -32,11 +32,13 @@ |
||
| 32 | 32 | 'content' => $this->content, |
| 33 | 33 | ]; |
| 34 | 34 | |
| 35 | - if ($this->grammar !== null) { |
|
| 35 | + if ($this->grammar !== null) |
|
| 36 | + { |
|
| 36 | 37 | $token['type'] = \call_user_func([$this->grammar, 'tokenName'], $this->type); |
| 37 | 38 | } |
| 38 | 39 | |
| 39 | - if ($this->tokens !== []) { |
|
| 40 | + if ($this->tokens !== []) |
|
| 41 | + { |
|
| 40 | 42 | $token['tokens'] = $this->tokens; |
| 41 | 43 | } |
| 42 | 44 | |
@@ -20,11 +20,11 @@ discard block |
||
| 20 | 20 | $buffer = null; |
| 21 | 21 | $bufferOffset = 0; |
| 22 | 22 | |
| 23 | - foreach ($inner as $n) { |
|
| 23 | + foreach ($inner as $n){ |
|
| 24 | 24 | $token->offset ??= $n->offset; |
| 25 | 25 | |
| 26 | - if ($n instanceof Byte) { |
|
| 27 | - if ($buffer === null) { |
|
| 26 | + if ($n instanceof Byte){ |
|
| 27 | + if ($buffer === null){ |
|
| 28 | 28 | $buffer = ''; |
| 29 | 29 | $bufferOffset = $n->offset; |
| 30 | 30 | } |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | continue; |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | - if ($buffer !== null) { |
|
| 38 | + if ($buffer !== null){ |
|
| 39 | 39 | $token->tokens[] = new Token( |
| 40 | 40 | Token::TYPE_RAW, |
| 41 | 41 | $bufferOffset, |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | $token->tokens[] = $n; |
| 50 | 50 | } |
| 51 | 51 | |
| 52 | - if ($buffer !== null) { |
|
| 52 | + if ($buffer !== null){ |
|
| 53 | 53 | $token->tokens[] = new Token( |
| 54 | 54 | Token::TYPE_RAW, |
| 55 | 55 | $bufferOffset, |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | ); |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | - if (\count($token->tokens) === 1 && $token->tokens[0]->type === Token::TYPE_RAW) { |
|
| 61 | + if (\count($token->tokens) === 1 && $token->tokens[0]->type === Token::TYPE_RAW){ |
|
| 62 | 62 | $token->tokens = []; |
| 63 | 63 | } |
| 64 | 64 | |
@@ -20,11 +20,14 @@ discard block |
||
| 20 | 20 | $buffer = null; |
| 21 | 21 | $bufferOffset = 0; |
| 22 | 22 | |
| 23 | - foreach ($inner as $n) { |
|
| 23 | + foreach ($inner as $n) |
|
| 24 | + { |
|
| 24 | 25 | $token->offset ??= $n->offset; |
| 25 | 26 | |
| 26 | - if ($n instanceof Byte) { |
|
| 27 | - if ($buffer === null) { |
|
| 27 | + if ($n instanceof Byte) |
|
| 28 | + { |
|
| 29 | + if ($buffer === null) |
|
| 30 | + { |
|
| 28 | 31 | $buffer = ''; |
| 29 | 32 | $bufferOffset = $n->offset; |
| 30 | 33 | } |
@@ -35,7 +38,8 @@ discard block |
||
| 35 | 38 | continue; |
| 36 | 39 | } |
| 37 | 40 | |
| 38 | - if ($buffer !== null) { |
|
| 41 | + if ($buffer !== null) |
|
| 42 | + { |
|
| 39 | 43 | $token->tokens[] = new Token( |
| 40 | 44 | Token::TYPE_RAW, |
| 41 | 45 | $bufferOffset, |
@@ -49,7 +53,8 @@ discard block |
||
| 49 | 53 | $token->tokens[] = $n; |
| 50 | 54 | } |
| 51 | 55 | |
| 52 | - if ($buffer !== null) { |
|
| 56 | + if ($buffer !== null) |
|
| 57 | + { |
|
| 53 | 58 | $token->tokens[] = new Token( |
| 54 | 59 | Token::TYPE_RAW, |
| 55 | 60 | $bufferOffset, |
@@ -58,7 +63,8 @@ discard block |
||
| 58 | 63 | ); |
| 59 | 64 | } |
| 60 | 65 | |
| 61 | - if (\count($token->tokens) === 1 && $token->tokens[0]->type === Token::TYPE_RAW) { |
|
| 66 | + if (\count($token->tokens) === 1 && $token->tokens[0]->type === Token::TYPE_RAW) |
|
| 67 | + { |
|
| 62 | 68 | $token->tokens = []; |
| 63 | 69 | } |
| 64 | 70 | |
@@ -35,19 +35,19 @@ discard block |
||
| 35 | 35 | public function parse(Buffer $src): \Generator |
| 36 | 36 | { |
| 37 | 37 | $quoted = []; |
| 38 | - while ($n = $src->next()) { |
|
| 39 | - switch ($n->char) { |
|
| 38 | + while ($n = $src->next()){ |
|
| 39 | + switch ($n->char){ |
|
| 40 | 40 | case '"': |
| 41 | 41 | case "'": |
| 42 | - if ($this->keyword !== []) { |
|
| 42 | + if ($this->keyword !== []){ |
|
| 43 | 43 | yield $this->packToken($this->keyword, self::TYPE_KEYWORD); |
| 44 | 44 | $this->keyword = []; |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | $quoted[] = $n; |
| 48 | - while ($nn = $src->next()) { |
|
| 48 | + while ($nn = $src->next()){ |
|
| 49 | 49 | $quoted[] = $nn; |
| 50 | - if ($nn instanceof Byte && $nn->char === $n->char) { |
|
| 50 | + if ($nn instanceof Byte && $nn->char === $n->char){ |
|
| 51 | 51 | break; |
| 52 | 52 | } |
| 53 | 53 | } |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | |
| 58 | 58 | break; |
| 59 | 59 | case '=': |
| 60 | - if ($this->keyword !== []) { |
|
| 60 | + if ($this->keyword !== []){ |
|
| 61 | 61 | yield $this->packToken($this->keyword, self::TYPE_KEYWORD); |
| 62 | 62 | $this->keyword = []; |
| 63 | 63 | } |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | yield new Token(self::TYPE_EQUAL, $n->offset, '='); |
| 66 | 66 | break; |
| 67 | 67 | case ',': |
| 68 | - if ($this->keyword !== []) { |
|
| 68 | + if ($this->keyword !== []){ |
|
| 69 | 69 | yield $this->packToken($this->keyword, self::TYPE_KEYWORD); |
| 70 | 70 | $this->keyword = []; |
| 71 | 71 | } |
@@ -73,8 +73,8 @@ discard block |
||
| 73 | 73 | yield new Token(self::TYPE_COMMA, $n->offset, ','); |
| 74 | 74 | break; |
| 75 | 75 | default: |
| 76 | - if (\preg_match(self::REGEXP_WHITESPACE, $n->char)) { |
|
| 77 | - if ($this->keyword !== []) { |
|
| 76 | + if (\preg_match(self::REGEXP_WHITESPACE, $n->char)){ |
|
| 77 | + if ($this->keyword !== []){ |
|
| 78 | 78 | yield $this->packToken($this->keyword, self::TYPE_KEYWORD); |
| 79 | 79 | $this->keyword = []; |
| 80 | 80 | } |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | } |
| 87 | 87 | } |
| 88 | 88 | |
| 89 | - if ($this->keyword !== []) { |
|
| 89 | + if ($this->keyword !== []){ |
|
| 90 | 90 | yield $this->packToken($this->keyword, self::TYPE_KEYWORD); |
| 91 | 91 | } |
| 92 | 92 | } |
@@ -35,19 +35,24 @@ discard block |
||
| 35 | 35 | public function parse(Buffer $src): \Generator |
| 36 | 36 | { |
| 37 | 37 | $quoted = []; |
| 38 | - while ($n = $src->next()) { |
|
| 39 | - switch ($n->char) { |
|
| 38 | + while ($n = $src->next()) |
|
| 39 | + { |
|
| 40 | + switch ($n->char) |
|
| 41 | + { |
|
| 40 | 42 | case '"': |
| 41 | 43 | case "'": |
| 42 | - if ($this->keyword !== []) { |
|
| 44 | + if ($this->keyword !== []) |
|
| 45 | + { |
|
| 43 | 46 | yield $this->packToken($this->keyword, self::TYPE_KEYWORD); |
| 44 | 47 | $this->keyword = []; |
| 45 | 48 | } |
| 46 | 49 | |
| 47 | 50 | $quoted[] = $n; |
| 48 | - while ($nn = $src->next()) { |
|
| 51 | + while ($nn = $src->next()) |
|
| 52 | + { |
|
| 49 | 53 | $quoted[] = $nn; |
| 50 | - if ($nn instanceof Byte && $nn->char === $n->char) { |
|
| 54 | + if ($nn instanceof Byte && $nn->char === $n->char) |
|
| 55 | + { |
|
| 51 | 56 | break; |
| 52 | 57 | } |
| 53 | 58 | } |
@@ -57,7 +62,8 @@ discard block |
||
| 57 | 62 | |
| 58 | 63 | break; |
| 59 | 64 | case '=': |
| 60 | - if ($this->keyword !== []) { |
|
| 65 | + if ($this->keyword !== []) |
|
| 66 | + { |
|
| 61 | 67 | yield $this->packToken($this->keyword, self::TYPE_KEYWORD); |
| 62 | 68 | $this->keyword = []; |
| 63 | 69 | } |
@@ -65,7 +71,8 @@ discard block |
||
| 65 | 71 | yield new Token(self::TYPE_EQUAL, $n->offset, '='); |
| 66 | 72 | break; |
| 67 | 73 | case ',': |
| 68 | - if ($this->keyword !== []) { |
|
| 74 | + if ($this->keyword !== []) |
|
| 75 | + { |
|
| 69 | 76 | yield $this->packToken($this->keyword, self::TYPE_KEYWORD); |
| 70 | 77 | $this->keyword = []; |
| 71 | 78 | } |
@@ -73,8 +80,10 @@ discard block |
||
| 73 | 80 | yield new Token(self::TYPE_COMMA, $n->offset, ','); |
| 74 | 81 | break; |
| 75 | 82 | default: |
| 76 | - if (\preg_match(self::REGEXP_WHITESPACE, $n->char)) { |
|
| 77 | - if ($this->keyword !== []) { |
|
| 83 | + if (\preg_match(self::REGEXP_WHITESPACE, $n->char)) |
|
| 84 | + { |
|
| 85 | + if ($this->keyword !== []) |
|
| 86 | + { |
|
| 78 | 87 | yield $this->packToken($this->keyword, self::TYPE_KEYWORD); |
| 79 | 88 | $this->keyword = []; |
| 80 | 89 | } |
@@ -86,7 +95,8 @@ discard block |
||
| 86 | 95 | } |
| 87 | 96 | } |
| 88 | 97 | |
| 89 | - if ($this->keyword !== []) { |
|
| 98 | + if ($this->keyword !== []) |
|
| 99 | + { |
|
| 90 | 100 | yield $this->packToken($this->keyword, self::TYPE_KEYWORD); |
| 91 | 101 | } |
| 92 | 102 | } |