Skip to content

Parser improvement on :not(...) and others #696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robocoder merged 1 commit into from
May 16, 2019
Merged

Parser improvement on :not(...) and others #696

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 51 additions & 21 deletions src/Parser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2142,19 +2142,19 @@ protected function propertyName(&$out)
*
* @return boolean
*/
protected function selectors(&$out)
protected function selectors(&$out, $subSelector = false)
{
$s = $this->count;
$selectors = [];

while ($this->selector($sel)) {
while ($this->selector($sel, $subSelector)) {
$selectors[] = $sel;

if (! $this->matchChar(',')) {
if (! $this->matchChar(',', true)) {
break;
}

while ($this->matchChar(',')) {
while ($this->matchChar(',', true)) {
; // ignore extra
}
}
Expand All @@ -2177,23 +2177,23 @@ protected function selectors(&$out)
*
* @return boolean
*/
protected function selector(&$out)
protected function selector(&$out, $subSelector = false)
{
$selector = [];

for (;;) {
if ($this->match('[>+~]+', $m)) {
if ($this->match('[>+~]+', $m, true)) {
$selector[] = [$m[0]];
continue;
}

if ($this->selectorSingle($part)) {
if ($this->selectorSingle($part, $subSelector)) {
$selector[] = $part;
$this->match('\s+', $m);
continue;
}

if ($this->match('\/[^\/]+\/', $m)) {
if ($this->match('\/[^\/]+\/', $m, true)) {
$selector[] = [$m[0]];
continue;
}
Expand All @@ -2220,7 +2220,7 @@ protected function selector(&$out)
*
* @return boolean
*/
protected function selectorSingle(&$out)
protected function selectorSingle(&$out, $subSelector = false)
{
$oldWhite = $this->eatWhiteDefault;
$this->eatWhiteDefault = false;
Expand All @@ -2244,6 +2244,11 @@ protected function selectorSingle(&$out)
break;
}

// parsing a sub selector in () stop with the closing )
if ($subSelector && $char === ')') {
break;
}

//self
switch ($char) {
case '&':
Expand Down Expand Up @@ -2307,21 +2312,46 @@ protected function selectorSingle(&$out)

$ss = $this->count;

if ($this->matchChar('(') &&
($this->openString(')', $str, '(') || true) &&
$this->matchChar(')')
) {
$parts[] = '(';

if (! empty($str)) {
$parts[] = $str;
if ($nameParts === ['not'] || $nameParts === ['is'] || $nameParts === ['has'] || $nameParts === ['where']) {
if ($this->matchChar('(') &&
($this->selectors($subs, true) || true) &&
$this->matchChar(')')
) {
$parts[] = '(';

while ($sub = array_shift($subs)) {
while ($ps = array_shift($sub)) {
foreach ($ps as &$p) {
$parts[] = $p;
}
if (count($sub) && reset($sub)) {
$parts[] = ' ';
}
}
if (count($subs) && reset($subs)) {
$parts[] = ', ';
}
}
$parts[] = ')';
} else {
$this->seek($ss);
}

$parts[] = ')';
} else {
$this->seek($ss);
if ($this->matchChar('(') &&
($this->openString(')', $str, '(') || true) &&
$this->matchChar(')')
) {
$parts[] = '(';

if (! empty($str)) {
$parts[] = $str;
}

$parts[] = ')';
} else {
$this->seek($ss);
}
}

continue;
}
}
Expand Down