Skip to content

Commit a928085

Browse files
committed
Removing duplicated code for Reserved class
1 parent 0341ac1 commit a928085

File tree

2 files changed

+2
-34
lines changed

2 files changed

+2
-34
lines changed

src/Tokenizer/Parser/Reserved.php

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,6 @@ public static function isReservedPrecededByDotCharacter($previous)
3030
return !$previous || !isset($previous[Tokenizer::TOKEN_VALUE]) || $previous[Tokenizer::TOKEN_VALUE] !== '.';
3131
}
3232

33-
/**
34-
* @param string $string
35-
* @param array $matches
36-
* @param string $regexReservedTopLevel
37-
* @param string $regexBoundaries
38-
*
39-
* @return bool
40-
*/
41-
public static function isReservedTopLevelString($string, array &$matches, $regexReservedTopLevel, $regexBoundaries)
42-
{
43-
return 1 == preg_match(
44-
'/^(' . $regexReservedTopLevel . ')($|\s|' . $regexBoundaries . ')/',
45-
strtoupper($string),
46-
$matches
47-
);
48-
}
4933

5034
/**
5135
* @param string $string
@@ -61,22 +45,6 @@ public static function getReservedTopLevelString($string, array &$matches)
6145
];
6246
}
6347

64-
/**
65-
* @param string $string
66-
* @param $matches
67-
* @param string $regexReservedNewLine
68-
* @param string $regexBoundaries
69-
*
70-
* @return bool
71-
*/
72-
public static function isReservedNewLineString($string, &$matches, $regexReservedNewLine, $regexBoundaries)
73-
{
74-
return 1 == preg_match(
75-
'/^(' . $regexReservedNewLine . ')($|\s|' . $regexBoundaries . ')/',
76-
strtoupper($string),
77-
$matches
78-
);
79-
}
8048

8149
/**
8250
* @param string $string

src/Tokenizer/Tokenizer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ protected function getNextToken($string, $previous = null)
230230
}
231231

232232
if (Reserved::isReservedPrecededByDotCharacter($previous)) {
233-
if (Reserved::isReservedTopLevelString(
233+
if (Reserved::isReservedString(
234234
$string,
235235
$matches,
236236
$this->regexReservedTopLevel,
@@ -240,7 +240,7 @@ protected function getNextToken($string, $previous = null)
240240
return Reserved::getReservedTopLevelString($string, $matches);
241241
}
242242

243-
if (Reserved::isReservedNewLineString(
243+
if (Reserved::isReservedString(
244244
$string,
245245
$matches,
246246
$this->regexReservedNewLine,

0 commit comments

Comments
 (0)