Streamline parseCalcValue()

raxbg · raxbg · commit 4a0a464a8e56 · 2018-06-29T15:34:47.000+03:00
diff --git a/lib/Sabberworm/CSS/Parser.php b/lib/Sabberworm/CSS/Parser.php
@@ -525,13 +525,9 @@ private function parseURLValue() {
 	}
 
 	private function parseCalcValue() {
-		$func = $this->comes('calc', true) ? 'calc' : '-webkit-calc';
-		$this->consume($func);
-		$this->consumeWhiteSpace();
-		$this->consume('(');
+		$func = trim($this->consumeUntil('(', false, true));
 		$aArguments = $this->parseValue(array('+', '-', '*', '/', ' '), '\Sabberworm\CSS\Value\CalcRuleValueList');
-		$this->consumeWhiteSpace();
-		$this->consume(')');
+		$this->consumeUntil(')', false, true);
 		return new CalcFunction($func, $aArguments, ',', $this->iLineNo);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -525,13 +525,9 @@ private function parseURLValue() {`
`525`	`525`	`}`
`526`	`526`
`527`	`527`	`private function parseCalcValue() {`
`528`		`- $func = $this->comes('calc', true) ? 'calc' : '-webkit-calc';`
`529`		`- $this->consume($func);`
`530`		`- $this->consumeWhiteSpace();`
`531`		`- $this->consume('(');`
	`528`	`+ $func = trim($this->consumeUntil('(', false, true));`
`532`	`529`	`$aArguments = $this->parseValue(array('+', '-', '*', '/', ' '), '\Sabberworm\CSS\Value\CalcRuleValueList');`
`533`		`- $this->consumeWhiteSpace();`
`534`		`- $this->consume(')');`
	`530`	`+ $this->consumeUntil(')', false, true);`
`535`	`531`	`return new CalcFunction($func, $aArguments, ',', $this->iLineNo);`
`536`	`532`	`}`
`537`	`533`