Add support for negative numbers, fixes #6

Author: koesie10

src/TokenStream.php

@@ -91,6 +91,9 @@ protected function readNext() {
         if ($this->isDigit($char)) {
             return $this->readNumber();
         }
+        if ($char === '-') {
+            return $this->readNumber();
+        }
         if ($this->isStartIdentifierCharacter($char)) {
             return $this->readIdentifier();
         }
@@ -233,6 +236,23 @@ protected function readEscaped($end) {
      * @return Token
      */
     protected function readNumber() {
+        $isNegative = false;
+
+        if ($this->input->peek() === '-') {
+            $isNegative = true;
+            $this->input->next();
+        }
+
+        $number = $this->readNumberValue();
+
+        if ($isNegative) {
+            $number *= -1;
+        }
+
+        return new Token(Token::TYPE_NUMBER, $number);
+    }
+
+    private function readNumberValue() {
         $hasDot = false;
         $number = $this->readWhile(
             function ($char) use (&$hasDot) {
@@ -246,7 +266,8 @@ function ($char) use (&$hasDot) {
                 return $this->isDigit($char);
             }
         );
-        return new Token(Token::TYPE_NUMBER, $hasDot ? floatval($number) : intval($number));
+
+        return $hasDot ? floatval($number) : intval($number);
     }
 
     /**

tests/LuaToPhpConverterTest.php

@@ -111,4 +111,18 @@ public function testAdvancedTable() {
             count($result)
         );
     }
+
+    // https://github.com/koesie10/LuaSerializer/issues/6
+    public function testNegativeNumberTable() {
+        $parser = new Parser(new TokenStream(new InputStream('{1.75,0.6,-1.78}')));
+
+        $node = $parser->parse();
+
+        $result = LuaToPhpConverter::convertToPhpValue($node);
+
+        $this->assertEquals(
+            [1.75, 0.6, -1.78,],
+            $result
+        );
+    }
 }

tests/LuaTokenStreamTest.php

@@ -87,6 +87,14 @@ public function testNumberFloat() {
         $this->assertEquals(13.37, $token->getValue());
     }
 
+    public function testNumberNegative() {
+        $obj = new TokenStream(new InputStream("-13.37"));
+
+        $token = $obj->next();
+        $this->assertEquals(Token::TYPE_NUMBER, $token->getType());
+        $this->assertEquals(-13.37, $token->getValue());
+    }
+
     public function testPunctuation() {
         foreach ([',', '{', '}', '=', '[', ']'] as $punc) {
             $obj = new TokenStream(new InputStream($punc));