Merge pull request #555 from b3b00/bugfix/issue554

Bugfix/issue554

Author: b3b00

src/sly/lexer/GenericLexer.cs

@@ -578,7 +578,7 @@ public void AddHexa(IN token, string prefix, BuildResult<ILexer<IN>> result)
         public void AddDate(IN token, DateFormat format, char separator, LexemeAttribute doubleLexeme,
             BuildResult<ILexer<IN>> result)
         {
-            if (doubleLexeme != null)
+            if (doubleLexeme != null && FSMBuilder.HasMark(in_double))
             {
                 char decimalSeparator = (doubleLexeme.HasGenericTokenParameters)
                     ? doubleLexeme.GenericTokenParameters[0][0]

src/sly/lexer/fsm/FSMLexerBuilder.cs

@@ -582,6 +582,11 @@ public FSMLexerBuilder<N> AnyTransitionTo(string toNodeMark, TransitionPrecondit
         }
 
         #endregion
+
+        public bool HasMark(string mark)
+        {
+            return Marks.ContainsKey(mark);
+        }
     }
 
 

tests/ParserTests/dateIssue/Issue554Parser.cs

@@ -0,0 +1,15 @@
+using sly.lexer;
+using sly.parser.generator;
+
+namespace ParserTests.dateIssue;
+
+
+    [ParserRoot("root")]
+    public class Issue554Parser
+    {
+        [Production("root : DOUBLE INT DATE")]
+        public string root_DOUBLE_INT_DATE(Token<Issue554lexer> d, Token<Issue554lexer> i, Token<Issue554lexer> date)
+        {
+            return $"{d.Value}/{i.Value}/{date.Value}";  
+        }
+    }

tests/ParserTests/dateIssue/Issue554Test.cs

@@ -0,0 +1,22 @@
+using System;
+using NFluent;
+using sly.parser.generator;
+using Xunit;
+
+namespace ParserTests.dateIssue;
+
+public class Issue554Test
+{
+    [Fact]
+    public void TestDateIssue()
+    {
+        var builder = new ParserBuilder<Issue554lexer, string>();
+        var instance = new Issue554Parser();
+
+        var buildParser = builder.BuildParser(instance, ParserType.EBNF_LL_RECURSIVE_DESCENT, null, null);
+        Check.That(buildParser).IsOk();
+        var result = buildParser.Result.Parse("3.14 42 1977.03.30");
+        Check.That(result).IsOkParsing();
+        Check.That(result.Result).IsEqualTo("3.14/42/1977.03.30");
+    }
+}

tests/ParserTests/dateIssue/Issue554lexer.cs

@@ -0,0 +1,13 @@
+using sly.lexer;
+
+namespace ParserTests.dateIssue;
+
+public enum Issue554lexer
+{
+    [Date(DateFormat.YYYYMMDD, '.')]
+    DATE,
+    [Double]
+    DOUBLE,
+    [Int]
+    INT,
+}