Merge pull request #143 from b3b00/bugfix/better_error_reporting_on_p…

…arser_build bugfix : error reportin on parser build
b3b00 · Dec 17, 2019 · 9906162 · 9906162
2 parents 01d016d + 3f7cf3c
commit 9906162
Show file tree

Hide file tree

Showing 9 changed files with 99 additions and 32 deletions.
diff --git a/samples/ParserExample/Program.cs b/samples/ParserExample/Program.cs
@@ -405,34 +405,33 @@ public static void test104()
         public static void testJSON()
         {
             try {
-            Console.WriteLine("starting json test.");
 
                 var instance = new EbnfJsonGenericParser();
             var builder = new ParserBuilder<JsonTokenGeneric, JSon>();
             var buildResult = builder.BuildParser(instance, ParserType.EBNF_LL_RECURSIVE_DESCENT, "root");
-            if (buildResult.IsOk)
-            {
-                Console.WriteLine("parser built.");
-                var parser = buildResult.Result;
-                var content = File.ReadAllText("test.json");
-                Console.WriteLine("test.json read.");
-                var jsonResult = parser.Parse(content);
-                Console.WriteLine("json parse done.");
-                if (jsonResult.IsOk)
-                {
-                    Console.WriteLine("YES !");
-                }
-                else
-                {
-                    Console.WriteLine("Ooh no !");
-                }
-                Console.WriteLine("Done.");
-
-            }
-            else
-            {
-                buildResult.Errors.ForEach(e => Console.WriteLine(e.Message));
-            }
+            // if (buildResult.IsOk)
+            // {
+            //     Console.WriteLine("parser built.");
+            //     var parser = buildResult.Result;
+            //     var content = File.ReadAllText("test.json");
+            //     Console.WriteLine("test.json read.");
+            //     var jsonResult = parser.Parse(content);
+            //     Console.WriteLine("json parse done.");
+            //     if (jsonResult.IsOk)
+            //     {
+            //         Console.WriteLine("YES !");
+            //     }
+            //     else
+            //     {
+            //         Console.WriteLine("Ooh no !");
+            //     }
+            //     Console.WriteLine("Done.");
+            //
+            // }
+            // else
+            // {
+            //     buildResult.Errors.ForEach(e => Console.WriteLine(e.Message));
+            // }
             }
             catch(Exception e) {
                 Console.WriteLine($"ERROR {e.Message} : \n {e.StackTrace}");
@@ -494,15 +493,61 @@ private static void TestChars()
             }
         }
 
+        private static void TestGrammarParser()
+        {
+            string productionRule = "clauses : clause (COMMA [D] clause)*";
+            var ruleparser = new RuleParser<TestGrammarToken>();
+            var builder = new ParserBuilder<EbnfTokenGeneric, GrammarNode<TestGrammarToken>>();
+            var grammarParser = builder.BuildParser(ruleparser, ParserType.LL_RECURSIVE_DESCENT, "rule").Result;
+            var result = grammarParser.Parse(productionRule);
+            grammarParser.Lexer.ResetLexer();
+            //(grammarParser.Lexer as GenericLexer<TestGrammarToken>).ResetLexer();
+            Console.WriteLine($"alors ? {string.Join('\n',result.Errors.Select(e => e.ErrorMessage))}");
+            result = grammarParser.Parse(productionRule);
+            Console.WriteLine($"alors ? {string.Join('\n',result.Errors.Select(e => e.ErrorMessage))}");
+            ;
+
+            Console.WriteLine("starting");
+            ErroneousGrammar parserInstance = new ErroneousGrammar();
+            Console.WriteLine("new instance");
+
+            var builder2 = new ParserBuilder<TestGrammarToken, object>();
+            Console.WriteLine("builder");
+
+            var Parser = builder.BuildParser(parserInstance,ParserType.EBNF_LL_RECURSIVE_DESCENT,"rule");
+            Console.WriteLine($"built : {Parser.IsOk}");
+
+
+        }
+
         private static void Main(string[] args)
         {
             //TestContextualParser();
             //TestTokenCallBacks();
             //test104();
             //testJSON();
-            TestGraphViz();
+            TestGrammarParser();
+            // TestGraphViz();
             //TestGraphViz();
-            TestChars();
+            //TestChars();
+
         }
     }
+
+    public enum TestGrammarToken
+    {
+        [Lexeme(GenericToken.SugarToken,",")]
+        COMMA = 1
+    }
+
+    public class ErroneousGrammar
+    {
+        [Production("clauses : clause (COMMA [D] clause)*")]
+
+            public object test()
+            {
+                return null;
+            }    
+    }
+
 }
diff --git a/samples/jsonparser/JSONLexer.cs b/samples/jsonparser/JSONLexer.cs
@@ -202,9 +202,11 @@ public LexerResult<JsonToken> Tokenize(ReadOnlyMemory<char> source)
                     position++;
                 }
             }
-
-
             return new LexerResult<JsonToken>(tokens);
         }
+
+        public void ResetLexer()
+        {
+        }
     }
 }
diff --git a/sly/lexer/GenericLexer.cs b/sly/lexer/GenericLexer.cs
@@ -752,5 +752,10 @@ public string ToGraphViz()
         {
             return LexerFsm.ToGraphViz();
         }
+
+        public void ResetLexer()
+        {
+            LexerFsm.Reset();
+        }
     }
 }
diff --git a/sly/lexer/ILexer.cs b/sly/lexer/ILexer.cs
@@ -9,5 +9,7 @@ public interface ILexer<T> where T : struct
         LexerResult<T> Tokenize(string source);
 
         LexerResult<T> Tokenize(ReadOnlyMemory<char> source);
+
+        void ResetLexer();
     }
 }
diff --git a/sly/lexer/Lexer.cs b/sly/lexer/Lexer.cs
@@ -82,5 +82,10 @@ public LexerResult<T> Tokenize(ReadOnlyMemory<char> source)
         {
             throw new NotImplementedException();
         }
+
+        public void ResetLexer()
+        {
+
+        }
     }
 }
diff --git a/sly/lexer/fsm/FSMLexer.cs b/sly/lexer/fsm/FSMLexer.cs
@@ -269,5 +269,12 @@ private void ConsumeIgnored(ReadOnlyMemory<char> source)
         }
 
         #endregion
+
+        public void Reset()
+        {
+            CurrentColumn = 0;
+            CurrentLine = 0;
+            CurrentPosition = 0;
+        }
     }
 }
diff --git a/sly/parser/generator/EBNFParserBuilder.cs b/sly/parser/generator/EBNFParserBuilder.cs
@@ -34,7 +34,7 @@ public override BuildResult<Parser<IN, OUT>> BuildParser(object parserInstance,
             }
             catch (Exception e)
             {
-                result.AddError(new ParserInitializationError(ErrorLevel.ERROR, e.Message+"\n"+e.StackTrace));
+                result.AddError(new ParserInitializationError(ErrorLevel.ERROR, e.Message));
                 return result;
             }
 
@@ -128,6 +128,7 @@ protected virtual ParserConfiguration<IN, OUT> ExtractEbnfParserConfiguration(Ty
                             .Errors
                             .Select(e => e.ErrorMessage)
                             .Aggregate((e1, e2) => e1 + "\n" + e2);
+                        message = $"rule error [{ruleString}] : {message}";
                         throw new ParserConfigurationException(message);
                     }
                 }

diff --git a/sly/parser/parser/Parser.cs b/sly/parser/parser/Parser.cs
@@ -58,7 +58,7 @@ public ParseResult<IN, OUT> Parse(string source, string startingNonTerminal = nu
         public ParseResult<IN, OUT> ParseWithContext(string source, object context, string startingNonTerminal = null)
         {
             ParseResult<IN, OUT> result = null;
-
+            Lexer.ResetLexer();
             var lexingResult = Lexer.Tokenize(source);
             if (lexingResult.IsError)
             {

diff --git a/sly/sly.csproj b/sly/sly.csproj
@@ -6,11 +6,11 @@
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <Description>#LY is a parser generator halfway between parser combinators and parser generator like ANTLR</Description>
     <Authors>b3b00</Authors>
-    <version>2.4.1.0</version>
+    <version>2.4.1.1</version>
     <PackageProjectUrl>https://github.com/b3b00/sly</PackageProjectUrl>
     <RepositoryUrl>https://github.com/b3b00/sly</RepositoryUrl>
     <PackageLicenseUrl>https://github.com/b3b00/sly/blob/master/LICENSE</PackageLicenseUrl>
-    <PackageVersion>2.4.1.0</PackageVersion>
+    <PackageVersion>2.4.1.1</PackageVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
      <NoWarn>1701;1702;1705;1591</NoWarn>
-Original file line number
+Diff line change
@@ Expand Up / @@ -82,5 +82,10 @@ public LexerResult<T> Tokenize(ReadOnlyMemory<char> source) @@
             {
                 throw new NotImplementedException();
             }
+            public void ResetLexer()
+            {
+            }
         }
     }