Merge pull request #1 from ginpei/negativeNumbers

Support negative numbers

Author: jhartikainen

index.js

@@ -39,7 +39,7 @@ Parser.prototype.ident = function(){
 };
 
 Parser.prototype.int = function(){
-  var m = /^((\d+)([^\s\/]+)?) */.exec(this.str);
+  var m = /^((-?\d+)([^\s\/]+)?) */.exec(this.str);
   if (!m) return;
   this.skip(m[0]);
   var n = ~~m[2];
@@ -54,7 +54,7 @@ Parser.prototype.int = function(){
 };
 
 Parser.prototype.float = function(){
-  var m = /^(((?:\d+)?\.\d+)([^\s\/]+)?) */.exec(this.str);
+  var m = /^((-?(?:\d+)?\.\d+)([^\s\/]+)?) */.exec(this.str);
   if (!m) return;
   this.skip(m[0]);
   var n = parseFloat(m[2]);

test/cases/numbers.js

@@ -1,5 +1,5 @@
 
-exports.string = '1px 0 0 5% .5px .10 1.5';
+exports.string = '1px 0 0 5% .5px .10 1.5 -1 -0.1';
 
 exports.object = [
   { type: 'number', string: '1px', unit: 'px', value: 1 },
@@ -8,5 +8,7 @@ exports.object = [
   { type: 'number', string: '5%', unit: '%', value: 5 },
   { type: 'number', string: '.5px', unit: 'px', value: .5 },
   { type: 'number', string: '.10', unit: '', value: .1 },
-  { type: 'number', string: '1.5', unit: '', value: 1.5 }
+  { type: 'number', string: '1.5', unit: '', value: 1.5 },
+  { type: 'number', string: '-1', unit: '', value: -1 },
+  { type: 'number', string: '-0.1', unit: '', value: -0.1 }
 ];