Fix comments not working, fixes #2

Author: koesie10

src/TokenStream.php

@@ -75,7 +75,7 @@ protected function readNext() {
             return null;
         }
         $char = $this->input->peek();
-        if ($char == "--") {
+        if ($this->isComment()) {
             $this->skipComment();
             return $this->readNext();
         }
@@ -267,6 +267,13 @@ protected function isDoubleBracketString() {
         return $this->input->peek() == '[' && !$this->input->eof(1) && $this->input->peek(1) == '[';
     }
 
+    /**
+     * @return bool
+     */
+    protected function isComment() {
+        return $this->input->peek() == '-' && !$this->input->eof(1) && $this->input->peek(1) == '-';
+    }
+
     /**
      * @param string $char
      *

tests/LuaParserTest.php

@@ -185,4 +185,25 @@ public function testInvalid() {
 
         $parser->parse();
     }
+
+    public function testComments() {
+        $parser = new Parser(new TokenStream(new InputStream('{
+        -- comment
+    foo = {
+        test = 123
+    }
+}')));
+
+        $parser->parse();
+    }
+
+    public function testInlineComments() {
+        $parser = new Parser(new TokenStream(new InputStream('{
+    foo = {
+        test = 123 -- comment
+    }
+}')));
+
+        $parser->parse();
+    }
 }

tests/LuaToPhpConverterTest.php

@@ -81,4 +81,21 @@ public function testEmptyTable() {
 
         $this->assertEquals([], $result);
     }
+
+    public function testSimpleTableWithComments() {
+        $parser = new Parser(new TokenStream(new InputStream('{ 
+        foo = "bar" -- comment
+        }')));
+
+        $node = $parser->parse();
+
+        $result = LuaToPhpConverter::convertToPhpValue($node);
+
+        $this->assertEquals(
+            [
+                'foo' => 'bar',
+            ],
+            $result
+        );
+    }
 }