More accurate parsing of calc functions

Author: raxbg

lib/Sabberworm/CSS/OutputFormat.php

@@ -41,10 +41,6 @@ class OutputFormat {
 	// This is what’s printed after the comma of value lists
 	public $sSpaceBeforeListArgumentSeparator = '';
 	public $sSpaceAfterListArgumentSeparator = '';
-
-	// This is what’s printed after the operators in a calc function
-	public $sSpaceBeforeCalcListArgumentSeparator = ' ';
-	public $sSpaceAfterCalcListArgumentSeparator = ' ';
 
 	public $sSpaceBeforeOpeningBrace = ' ';
 
@@ -223,14 +219,6 @@ public function spaceAfterListArgumentSeparator($sSeparator) {
 		return $this->space('AfterListArgumentSeparator', $sSeparator);
 	}
 
-	public function spaceBeforeCalcListArgumentSeparator($sSeparator) {
-		return $this->space('BeforeCalcListArgumentSeparator', $sSeparator);
-	}
-
-	public function spaceAfterCalcListArgumentSeparator($sSeparator) {
-		return $this->space('AfterCalcListArgumentSeparator', $sSeparator);
-	}
-
 	public function spaceBeforeOpeningBrace() {
 		return $this->space('BeforeOpeningBrace');
 	}

lib/Sabberworm/CSS/Parser.php

@@ -374,7 +374,7 @@ private function parseRule() {
 		return $oRule;
 	}
 
-	private function parseValue($aListDelimiters, $ruleValueListClass = '\Sabberworm\CSS\Value\RuleValueList') {
+	private function parseValue($aListDelimiters) {
 		$aStack = array();
 		$this->consumeWhiteSpace();
 		//Build a list of delimiters and parsed values
@@ -410,7 +410,7 @@ private function parseValue($aListDelimiters, $ruleValueListClass = '\Sabberworm
 						break;
 					}
 				}
-				$oList = new $ruleValueListClass($sDelimiter, $this->iLineNo);
+				$oList = new RuleValueList($sDelimiter, $this->iLineNo);
 				for ($i = $iStartPosition - 1; $i - $iStartPosition + 1 < $iLength * 2; $i+=2) {
 					$oList->addListComponent($aStack[$i]);
 				}
@@ -525,10 +525,39 @@ private function parseURLValue() {
 	}
 
 	private function parseCalcValue() {
-		$func = trim($this->consumeUntil('(', false, true));
-		$aArguments = $this->parseValue(array('+', '-', '*', '/', ' '), '\Sabberworm\CSS\Value\CalcRuleValueList');
-		$this->consumeUntil(')', false, true);
-		return new CalcFunction($func, $aArguments, ',', $this->iLineNo);
+		$aOperators = array('+', '-', '*', '/', '(', ')');
+		$sFunction = trim($this->consumeUntil('(', false, true));
+		$oCalcList = new CalcRuleValueList($this->iLineNo);
+		$oList = new RuleValueList(',', $this->iLineNo);
+		$iNestingLevel = 0;
+		$iLastComponentType = NULL;
+		while(!$this->comes(')') || $iNestingLevel > 0) {
+			$this->consumeWhiteSpace();
+			if (in_array($this->peek(), $aOperators)) {
+				if (($this->comes('-') || $this->comes('+'))) {
+					if ($this->peek(1, -1) != ' ' || !($this->comes('- ') || $this->comes('+ '))) {
+						throw new UnexpectedTokenException(" {$this->peek()} ", $this->peek(1, -1) . $this->peek(2), 'literal', $this->iLineNo);
+					}
+				} else if ($this->comes('(')) {
+					$iNestingLevel++;
+				} else if ($this->comes(')')) {
+					$iNestingLevel--;
+				}
+				$oCalcList->addListComponent($this->consume(1));
+				$iLastComponentType = CalcFunction::T_OPERATOR;
+			} else {
+				$oVal = $this->parsePrimitiveValue();
+				if ($iLastComponentType == CalcFunction::T_OPERAND) {
+					throw new UnexpectedTokenException(sprintf('Next token was expected to be an operand of type %s. Instead "%s" was found.', implode(', ', $aOperators), $oVal), '', 'custom', $this->iLineNo);
+				}
+
+				$oCalcList->addListComponent($oVal);
+				$iLastComponentType = CalcFunction::T_OPERAND;
+			}
+		}
+		$oList->addListComponent($oCalcList);
+		$this->consume(')');
+		return new CalcFunction($sFunction, $oList, ',', $this->iLineNo);
 	}
 
 	/**

lib/Sabberworm/CSS/Value/CalcFunction.php

@@ -3,10 +3,6 @@
 namespace Sabberworm\CSS\Value;
 
 class CalcFunction extends CSSFunction {
-
-	public function render(\Sabberworm\CSS\OutputFormat $oOutputFormat) {
-		$aArguments = $oOutputFormat->implode($oOutputFormat->spaceBeforeCalcListArgumentSeparator($this->sSeparator) . $this->sSeparator . $oOutputFormat->spaceAfterCalcListArgumentSeparator($this->sSeparator), $this->aComponents);
-		return "{$this->sName}({$aArguments})";
-	}
-
+	const T_OPERAND  = 1;
+	const T_OPERATOR = 2;
 }

lib/Sabberworm/CSS/Value/CalcRuleValueList.php

@@ -3,9 +3,12 @@
 namespace Sabberworm\CSS\Value;
 
 class CalcRuleValueList extends RuleValueList {
+	public function __construct($iLineNo = 0) {
+		parent::__construct(array(), ',', $iLineNo);
+	}
 
 	public function render(\Sabberworm\CSS\OutputFormat $oOutputFormat) {
-		return $oOutputFormat->implode($oOutputFormat->spaceBeforeCalcListArgumentSeparator($this->sSeparator) . $this->sSeparator . $oOutputFormat->spaceAfterCalcListArgumentSeparator($this->sSeparator), $this->aComponents);
+		return $oOutputFormat->implode(' ', $this->aComponents);
 	}
 
 }

tests/Sabberworm/CSS/ParserTest.php

@@ -390,10 +390,17 @@ function testUrlInFile() {
 	function testCalcInFile() {
 		$oDoc = $this->parsedStructureForFile('calc', Settings::create()->withMultibyteSupport(true));
 		$sExpected = 'div {width: calc(100% / 4);}
-div {height: -webkit-calc(9 / 16 * 100%) !important;width: -moz-calc(50px - 50%);}';
+div {height: -webkit-calc(9 / 16 * 100%) !important;width: -moz-calc(( 50px - 50% ) * 2);}';
 		$this->assertSame($sExpected, $oDoc->render());
 	}
 
+	/**
+	* @expectedException Sabberworm\CSS\Parsing\UnexpectedTokenException
+	*/
+	function testCalcFailure() {
+		$this->parsedStructureForFile('-calc-no-space-around-minus', Settings::create()->withLenientParsing(false));
+	}
+
 	function testUrlInFileMbOff() {
 		$oDoc = $this->parsedStructureForFile('url', Settings::create()->withMultibyteSupport(false));
 		$sExpected = 'body {background: #fff url("http://somesite.com/images/someimage.gif") repeat top center;}

tests/files/-calc-no-space-around-minus.css

@@ -0,0 +1 @@
+div { width: calc(50% -8px); }

tests/files/calc.css

@@ -1,5 +1,5 @@
 div { width: calc(100% / 4); }
 div {
 	height: -webkit-calc(9/16 * 100%)!important;
-	width: -moz-calc(50px-50%);
+	width: -moz-calc((50px - 50%)*2);
 }