Correctly parse negative numbers with no leading 0

closes #54 as fixed
MyIntervals · Mar 19, 2013 · a80739f · a80739f
1 parent 6322db9
commit a80739f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/lib/Sabberworm/CSS/Parser.php b/lib/Sabberworm/CSS/Parser.php
@@ -357,7 +357,7 @@ private static function listDelimiterForRule($sRule) {
 	private function parsePrimitiveValue() {
 		$oValue = null;
 		$this->consumeWhiteSpace();
-		if (is_numeric($this->peek()) || (($this->comes('-') || $this->comes('.')) && is_numeric($this->peek(1, 1)))) {
+		if (is_numeric($this->peek()) || ($this->comes('-.') && is_numeric($this->peek(1, 2))) || (($this->comes('-') || $this->comes('.')) && is_numeric($this->peek(1, 1)))) {
 			$oValue = $this->parseNumericValue();
 		} else if ($this->comes('#') || $this->comes('rgb') || $this->comes('hsl')) {
 			$oValue = $this->parseColorValue();

diff --git a/tests/Sabberworm/CSS/ParserTest.php b/tests/Sabberworm/CSS/ParserTest.php
@@ -149,7 +149,7 @@ function testSpecificity() {
 
 	function testManipulation() {
 		$oDoc = $this->parsedStructureForFile('atrules');
-		$this->assertSame('@charset "utf-8";@font-face {font-family: "CrassRoots";src: url("../media/cr.ttf");}html, body {font-size: 1.6em;}
+		$this->assertSame('@charset "utf-8";@font-face {font-family: "CrassRoots";src: url("../media/cr.ttf");}html, body {font-size: -0.6em;}
 @keyframes mymove {from {top: 0px;}
 to {top: 200px;}
 }@-moz-keyframes some-move {from {top: 0px;}
@@ -167,7 +167,7 @@ function testManipulation() {
 				$oSelector->setSelector('#my_id ' . $oSelector->getSelector());
 			}
 		}
-		$this->assertSame('@charset "utf-8";@font-face {font-family: "CrassRoots";src: url("../media/cr.ttf");}#my_id html, #my_id body {font-size: 1.6em;}
+		$this->assertSame('@charset "utf-8";@font-face {font-family: "CrassRoots";src: url("../media/cr.ttf");}#my_id html, #my_id body {font-size: -0.6em;}
 @keyframes mymove {from {top: 0px;}
 to {top: 200px;}
 }@-moz-keyframes some-move {from {top: 0px;}
@@ -316,7 +316,7 @@ function testListValueRemoval() {
 				continue;
 			}
 		}
-		$this->assertSame('html, body {font-size: 1.6em;}' . "\n", $oDoc->__toString());
+		$this->assertSame('html, body {font-size: -0.6em;}' . "\n", $oDoc->__toString());
 
 		$oDoc = $this->parsedStructureForFile('nested');
 		foreach ($oDoc->getAllDeclarationBlocks() as $oBlock) {

diff --git a/tests/files/atrules.css b/tests/files/atrules.css
@@ -6,7 +6,7 @@
 }
 
 html, body {
-	font-size: 1.6em
+	font-size: -0.6em
 }
 
 @keyframes mymove {