@@ -25,7 +25,8 @@ discard block |
||
| 25 | 25 | public function testIterate(): void |
| 26 | 26 | { |
| 27 | 27 | $out = ''; |
| 28 | - foreach ($this->buffer('abc') as $n) { |
|
| 28 | + foreach ($this->buffer('abc') as $n) |
|
| 29 | + { |
|
| 29 | 30 | $out .= $n->char; |
| 30 | 31 | } |
| 31 | 32 | |
@@ -149,14 +150,16 @@ discard block |
||
| 149 | 150 | |
| 150 | 151 | private function generate(StreamInterface $src) |
| 151 | 152 | { |
| 152 | - while (!$src->isEOI()) { |
|
| 153 | + while (!$src->isEOI()) |
|
| 154 | + { |
|
| 153 | 155 | yield new Byte($src->getOffset(), $src->peak()); |
| 154 | 156 | } |
| 155 | 157 | } |
| 156 | 158 | |
| 157 | 159 | private function generateToken(StreamInterface $src): \Generator |
| 158 | 160 | { |
| 159 | - while (!$src->isEOI()) { |
|
| 161 | + while (!$src->isEOI()) |
|
| 162 | + { |
|
| 160 | 163 | yield new Token(0, null, $src->peak()); |
| 161 | 164 | } |
| 162 | 165 | } |
@@ -30,7 +30,8 @@ discard block |
||
| 30 | 30 | */ |
| 31 | 31 | public function getIterator(): \Traversable |
| 32 | 32 | { |
| 33 | - while ($n = $this->next()) { |
|
| 33 | + while ($n = $this->next()) |
|
| 34 | + { |
|
| 34 | 35 | yield $n; |
| 35 | 36 | } |
| 36 | 37 | } |
@@ -42,18 +43,23 @@ discard block |
||
| 42 | 43 | |
| 43 | 44 | public function next(): Byte|Token|null |
| 44 | 45 | { |
| 45 | - if ($this->replay !== []) { |
|
| 46 | + if ($this->replay !== []) |
|
| 47 | + { |
|
| 46 | 48 | $n = \array_shift($this->replay); |
| 47 | - } else { |
|
| 49 | + } |
|
| 50 | + else |
|
| 51 | + { |
|
| 48 | 52 | $n = $this->generator->current(); |
| 49 | - if ($n === null) { |
|
| 53 | + if ($n === null) |
|
| 54 | + { |
|
| 50 | 55 | return null; |
| 51 | 56 | } |
| 52 | 57 | $this->generator->next(); |
| 53 | 58 | $this->buffer[] = $n; |
| 54 | 59 | } |
| 55 | 60 | |
| 56 | - if ($n !== null && $n->offset !== null) { |
|
| 61 | + if ($n !== null && $n->offset !== null) |
|
| 62 | + { |
|
| 57 | 63 | $this->offset = $n->offset; |
| 58 | 64 | } |
| 59 | 65 | |
@@ -66,10 +72,14 @@ discard block |
||
| 66 | 72 | public function nextBytes(): string |
| 67 | 73 | { |
| 68 | 74 | $result = ''; |
| 69 | - while ($n = $this->next()) { |
|
| 70 | - if ($n instanceof Byte) { |
|
| 75 | + while ($n = $this->next()) |
|
| 76 | + { |
|
| 77 | + if ($n instanceof Byte) |
|
| 78 | + { |
|
| 71 | 79 | $result .= $n->char; |
| 72 | - } else { |
|
| 80 | + } |
|
| 81 | + else |
|
| 82 | + { |
|
| 73 | 83 | break; |
| 74 | 84 | } |
| 75 | 85 | } |
@@ -82,12 +92,14 @@ discard block |
||
| 82 | 92 | */ |
| 83 | 93 | public function lookahead(): Byte|Token|null |
| 84 | 94 | { |
| 85 | - if ($this->replay !== []) { |
|
| 95 | + if ($this->replay !== []) |
|
| 96 | + { |
|
| 86 | 97 | return $this->replay[0]; |
| 87 | 98 | } |
| 88 | 99 | |
| 89 | 100 | $n = $this->next(); |
| 90 | - if ($n !== null) { |
|
| 101 | + if ($n !== null) |
|
| 102 | + { |
|
| 91 | 103 | \array_unshift($this->replay, $n); |
| 92 | 104 | } |
| 93 | 105 | |
@@ -103,20 +115,24 @@ discard block |
||
| 103 | 115 | { |
| 104 | 116 | $result = ''; |
| 105 | 117 | $replay = []; |
| 106 | - for ($i = 0; $i < $size; $i++) { |
|
| 118 | + for ($i = 0; $i < $size; $i++) |
|
| 119 | + { |
|
| 107 | 120 | $n = $this->next(); |
| 108 | - if ($n !== null) { |
|
| 121 | + if ($n !== null) |
|
| 122 | + { |
|
| 109 | 123 | $replay[] = $n; |
| 110 | 124 | } |
| 111 | 125 | |
| 112 | - if (!$n instanceof Byte) { |
|
| 126 | + if (!$n instanceof Byte) |
|
| 127 | + { |
|
| 113 | 128 | break; |
| 114 | 129 | } |
| 115 | 130 | |
| 116 | 131 | $result .= $n->char; |
| 117 | 132 | } |
| 118 | 133 | |
| 119 | - foreach (\array_reverse($replay) as $n) { |
|
| 134 | + foreach (\array_reverse($replay) as $n) |
|
| 135 | + { |
|
| 120 | 136 | \array_unshift($this->replay, $n); |
| 121 | 137 | } |
| 122 | 138 | |
@@ -128,8 +144,10 @@ discard block |
||
| 128 | 144 | */ |
| 129 | 145 | public function replay(int $offset): void |
| 130 | 146 | { |
| 131 | - foreach ($this->buffer as $n) { |
|
| 132 | - if ($n->offset > $offset) { |
|
| 147 | + foreach ($this->buffer as $n) |
|
| 148 | + { |
|
| 149 | + if ($n->offset > $offset) |
|
| 150 | + { |
|
| 133 | 151 | $this->replay[] = $n; |
| 134 | 152 | } |
| 135 | 153 | } |