Fix OneOf compilation and tests (#64)

sebastienros · Jan 7, 2022 · 457caa4 · 457caa4
1 parent 5dee9de
commit 457caa4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/Parlot/Fluent/OneOf.cs b/src/Parlot/Fluent/OneOf.cs
@@ -162,10 +162,7 @@ public CompilationResult Compile(CompilationContext context)
                     Expression group = Expression.Empty();
 
                     // The list is reversed since the parsers are unwrapped
-                    var parsers = kvp.Value.ToArray();
-                    parsers.Reverse();
-
-                    foreach (var parser in parsers)
+                    foreach (var parser in kvp.Value.ToArray().Reverse())
                     {
                         var groupResult = parser.Build(context);
 
@@ -180,7 +177,7 @@ public CompilationResult Compile(CompilationContext context)
                                     ? Expression.Empty()
                                     : Expression.Assign(value, groupResult.Value)
                                     ),
-                                block
+                                group
                                 )
                             );
                     }

diff --git a/test/Parlot.Tests/CompileTests.cs b/test/Parlot.Tests/CompileTests.cs
@@ -605,11 +605,12 @@ public void SkipWhiteSpaceCompiledShouldResponseParseContextUseNewLines()
         [Fact]
         public void OneOfCompileShouldNotFailWithLookupConflicts()
         {
-            var parser = Literals.Text("abc").Or(Literals.Text("ab")).Or(Literals.Text("a")).Compile();
+            var parser = OneOf(Literals.Text(">="), Literals.Text(">"), Literals.Text("<="), Literals.Text("<")).Compile();
 
-            Assert.True(parser.TryParse("a", out _));
-            Assert.True(parser.TryParse("ab", out _));
-            Assert.True(parser.TryParse("abc", out _));
+            Assert.Equal("<", parser.Parse("<"));
+            Assert.Equal("<=", parser.Parse("<="));
+            Assert.Equal(">", parser.Parse(">"));
+            Assert.Equal(">=", parser.Parse(">="));
         }
 
         [Fact]