Minor fixes to prevent duplicate tokens and missing RAV's

Author: waltertamboer

src/Lexer/AbstractLexer.php

@@ -87,13 +87,13 @@ public function getNextToken(): ?TokenInterface
         // Match a Recursive Annotation Variation:
         if (preg_match('/^\s*[\(|\)]/s', $this->buffer, $matches)) {
             $this->buffer = substr($this->buffer, strlen($matches[0]));
-            return new RecursiveAnnotationVariation($matches[0] === '(');
+            return new RecursiveAnnotationVariation(trim($matches[0]) === '(');
         }
 
         // Match a Numeric Annotation Glyph
         if (preg_match('/^\s*\$([0-9]+)\s*/', $this->buffer, $matches)) {
             $this->buffer = substr($this->buffer, strlen($matches[0]));
-            return new NumericAnnotationGlyph((int)$matches[1]);
+            return new NumericAnnotationGlyph((int)trim($matches[1]));
         }
 
         // Match a null move

src/Reader/AbstractReader.php

@@ -39,12 +39,12 @@ public function __construct(LexerInterface $lexer)
      */
     public function read(): ?TokenIterator
     {
-        $token = $this->lexer->peekNextToken();
-
-        if ($token === null) {
+        if ($this->lexer->peekNextToken() === null) {
             return null;
         }
 
+        $token = $this->lexer->getNextToken();
+
         $tokens = [];
 
         while ($token instanceof TagPair) {

tests/Lexer/AbstractLexerTest.php

@@ -183,6 +183,36 @@ public function testMatchRecursiveAnnotationVariationOpening()
         static::assertTrue($result->isOpening());
     }
 
+    public function testMatchRecursiveAnnotationVariationOpeningWithSpaceAtBegin()
+    {
+        // Arrange
+        $buffer = ' (';
+
+        $lexer = new StringLexer($buffer);
+
+        // Act
+        $result = $lexer->getNextToken();
+
+        // Assert
+        static::assertInstanceOf(RecursiveAnnotationVariation::class, $result);
+        static::assertTrue($result->isOpening());
+    }
+
+    public function testMatchRecursiveAnnotationVariationOpeningWithSpaceAtEnd()
+    {
+        // Arrange
+        $buffer = '( ';
+
+        $lexer = new StringLexer($buffer);
+
+        // Act
+        $result = $lexer->getNextToken();
+
+        // Assert
+        static::assertInstanceOf(RecursiveAnnotationVariation::class, $result);
+        static::assertTrue($result->isOpening());
+    }
+
     public function testMatchRecursiveAnnotationVariationClosing()
     {
         // Arrange
@@ -198,6 +228,36 @@ public function testMatchRecursiveAnnotationVariationClosing()
         static::assertFalse($result->isOpening());
     }
 
+    public function testMatchRecursiveAnnotationVariationClosingWithSpaceAtEnd()
+    {
+        // Arrange
+        $buffer = ') ';
+
+        $lexer = new StringLexer($buffer);
+
+        // Act
+        $result = $lexer->getNextToken();
+
+        // Assert
+        static::assertInstanceOf(RecursiveAnnotationVariation::class, $result);
+        static::assertFalse($result->isOpening());
+    }
+
+    public function testMatchRecursiveAnnotationVariationClosingWithSpaceAtBegin()
+    {
+        // Arrange
+        $buffer = ' )';
+
+        $lexer = new StringLexer($buffer);
+
+        // Act
+        $result = $lexer->getNextToken();
+
+        // Assert
+        static::assertInstanceOf(RecursiveAnnotationVariation::class, $result);
+        static::assertFalse($result->isOpening());
+    }
+
     public function testMatchNumericAnnotationGlyph()
     {
         // Arrange
@@ -213,6 +273,21 @@ public function testMatchNumericAnnotationGlyph()
         static::assertEquals(123, $result->getValue());
     }
 
+    public function testMatchNumericAnnotationGlyphWithSpace()
+    {
+        // Arrange
+        $buffer = ' $123';
+
+        $lexer = new StringLexer($buffer);
+
+        // Act
+        $result = $lexer->getNextToken();
+
+        // Assert
+        static::assertInstanceOf(NumericAnnotationGlyph::class, $result);
+        static::assertEquals(123, $result->getValue());
+    }
+
     public function testMatchSANCastling()
     {
         // Arrange