@@ -8,7 +8,6 @@ |
||
| 8 | 8 | namespace s9e\RegexpBuilder; |
| 9 | 9 | |
| 10 | 10 | use s9e\RegexpBuilder\Input\InputInterface; |
| 11 | -use s9e\RegexpBuilder\Output\OutputInterface; |
|
| 12 | 11 | use s9e\RegexpBuilder\Passes\CoalesceSingleCharacterPrefix; |
| 13 | 12 | use s9e\RegexpBuilder\Passes\GroupSingleCharacters; |
| 14 | 13 | use s9e\RegexpBuilder\Passes\MergePrefix; |
@@ -23,8 +23,7 @@ |
||
| 23 | 23 | if ($cp < 0x10000) |
| 24 | 24 | { |
| 25 | 25 | $codepoints[] = $cp; |
| 26 | - } |
|
| 27 | - else |
|
| 26 | + } else |
|
| 28 | 27 | { |
| 29 | 28 | $codepoints[] = 0xD7C0 + ($cp >> 10); |
| 30 | 29 | $codepoints[] = 0xDC00 + ($cp & 0x3FF); |
@@ -47,19 +47,16 @@ |
||
| 47 | 47 | if ($size === 1) |
| 48 | 48 | { |
| 49 | 49 | $cp = ord($char); |
| 50 | - } |
|
| 51 | - elseif ($size === 2) |
|
| 50 | + } elseif ($size === 2) |
|
| 52 | 51 | { |
| 53 | 52 | $cp = ((ord($char[0]) & 0b00011111) << 6) |
| 54 | 53 | | (ord($char[1]) & 0b00111111); |
| 55 | - } |
|
| 56 | - elseif ($size === 3) |
|
| 54 | + } elseif ($size === 3) |
|
| 57 | 55 | { |
| 58 | 56 | $cp = ((ord($char[0]) & 0b00001111) << 12) |
| 59 | 57 | | ((ord($char[1]) & 0b00111111) << 6) |
| 60 | 58 | | (ord($char[2]) & 0b00111111); |
| 61 | - } |
|
| 62 | - else |
|
| 59 | + } else |
|
| 63 | 60 | { |
| 64 | 61 | $cp = ((ord($char[0]) & 0b00000111) << 18) |
| 65 | 62 | | ((ord($char[1]) & 0b00111111) << 12) |
@@ -73,8 +73,7 @@ discard block |
||
| 73 | 73 | { |
| 74 | 74 | $info['quantifier'] = '?'; |
| 75 | 75 | unset($strings[$k]); |
| 76 | - } |
|
| 77 | - elseif (!isset($string[1])) |
|
| 76 | + } elseif (!isset($string[1])) |
|
| 78 | 77 | { |
| 79 | 78 | $chars[$k] = $string[0]; |
| 80 | 79 | } |
@@ -129,8 +128,7 @@ discard block |
||
| 129 | 128 | if ($values[$i] === $end + 1) |
| 130 | 129 | { |
| 131 | 130 | ++$end; |
| 132 | - } |
|
| 133 | - else |
|
| 131 | + } else |
|
| 134 | 132 | { |
| 135 | 133 | $ranges[] = [$start, $end]; |
| 136 | 134 | $start = $end = $values[$i]; |
@@ -34,8 +34,7 @@ |
||
| 34 | 34 | { |
| 35 | 35 | $newString[] = $element; |
| 36 | 36 | } |
| 37 | - } |
|
| 38 | - else |
|
| 37 | + } else |
|
| 39 | 38 | { |
| 40 | 39 | $newString[] = $element; |
| 41 | 40 | } |