Handle EOF when parsing calc functions

Author: raxbg

lib/Sabberworm/CSS/Value/CalcFunction.php

@@ -11,7 +11,7 @@ class CalcFunction extends CSSFunction {
 
 	public static function parse(ParserState $oParserState) {
 		$aOperators = array('+', '-', '*', '/');
-		$aTerminators = array('(', ';', "\n", "\r");
+		$aTerminators = array('(', ';', "\n", "\r", ParserState::EOF);
 		$sFunction = $oParserState->consumeUntil($aTerminators, false, true);
 		if ($oParserState->peek(1, -1) != '(') {
 			// Found ; or end of line before an opening bracket
@@ -25,6 +25,7 @@ public static function parse(ParserState $oParserState) {
 		$iNestingLevel = 0;
 		$iLastComponentType = NULL;
 		while(!$oParserState->comes(')') || $iNestingLevel > 0) {
+			if ($oParserState->isEnd() && $iNestingLevel === 0) break;
 			$oParserState->consumeWhiteSpace();
 			if ($oParserState->comes('(')) {
 				$iNestingLevel++;
@@ -66,7 +67,9 @@ public static function parse(ParserState $oParserState) {
 			$oParserState->consumeWhiteSpace();
 		}
 		$oList->addListComponent($oCalcList);
-		$oParserState->consume(')');
+		if (!$oParserState->isEnd()) {
+			$oParserState->consume(')');
+		}
 		return new CalcFunction($sFunction, $oList, ',', $oParserState->currentLine());
 	}
 

lib/Sabberworm/CSS/Value/Value.php

@@ -17,7 +17,7 @@ public static function parseValue(ParserState $oParserState, $aListDelimiters =
 		$aStack = array();
 		$oParserState->consumeWhiteSpace();
 		//Build a list of delimiters and parsed values
-		while (!($oParserState->comes('}') || $oParserState->comes(';') || $oParserState->comes('!') || $oParserState->comes(')') || $oParserState->comes('\\'))) {
+		while (!($oParserState->comes('}') || $oParserState->comes(';') || $oParserState->comes('!') || $oParserState->comes(')') || $oParserState->comes('\\') || $oParserState->isEnd())) {
 			if (count($aStack) > 0) {
 				$bFoundDelimiter = false;
 				foreach ($aListDelimiters as $sDelimiter) {

tests/Sabberworm/CSS/ParserTest.php

@@ -425,6 +425,32 @@ function testInvalidCalcInFile() {
 		$this->assertSame($sExpected, $oDoc->render());
 	}
 
+	function testInvalidCalc() {
+		$parser = new Parser('div { height: calc(100px');
+		$oDoc = $parser->parse();
+		$this->assertSame('div {height: calc(100px);}', $oDoc->render());
+
+		$parser = new Parser('div { height: calc(100px)');
+		$oDoc = $parser->parse();
+		$this->assertSame('div {height: calc(100px);}', $oDoc->render());
+
+		$parser = new Parser('div { height: calc(100px);');
+		$oDoc = $parser->parse();
+		$this->assertSame('div {height: calc(100px);}', $oDoc->render());
+
+		$parser = new Parser('div { height: calc(100px}');
+		$oDoc = $parser->parse();
+		$this->assertSame('div {}', $oDoc->render());
+
+		$parser = new Parser('div { height: calc(100px;');
+		$oDoc = $parser->parse();
+		$this->assertSame('div {}', $oDoc->render());
+
+		$parser = new Parser('div { height: calc(100px;}');
+		$oDoc = $parser->parse();
+		$this->assertSame('div {}', $oDoc->render());
+	}
+
 	function testGridLineNameInFile() {
 		$oDoc = $this->parsedStructureForFile('grid-linename', Settings::create()->withMultibyteSupport(true));
 		$sExpected = "div {grid-template-columns: [linename] 100px;}\nspan {grid-template-columns: [linename1 linename2] 100px;}";