Merge branch 'dev' into tech/actions

* dev: cleaning UT cleaning cleaning cleaning cleaning clean todos
b3b00 · Oct 8, 2021 · 0c4769c · 0c4769c
2 parents de9b92e + cd59b69
commit 0c4769c
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 111 deletions.
diff --git a/.github/workflows/codesee-arch-diagram.yml b/.github/workflows/codesee-arch-diagram.yml
diff --git a/Directory.Build.props b/Directory.Build.props
diff --git a/ParserTests/Issue164/TestOption164Parser.cs b/ParserTests/Issue164/TestOption164Parser.cs
@@ -8,7 +8,6 @@ public class TestOption164Parser
         [Production("root: INT [PLUS|MINUS|TIMES|DIVIDE] INT")]
         public int root(Token<TestOption164Lexer> left, Token<TestOption164Lexer> op, Token<TestOption164Lexer> right)
         {
-            int res = 0;
             int l = left.IntValue;
             int r = right.IntValue;
             switch (op.TokenID)

diff --git a/ParserTests/IssuesTests.cs b/ParserTests/IssuesTests.cs
@@ -175,7 +175,6 @@ public static void Issue218()
                 n++;
                 count++;
             }
-            Console.WriteLine(dump);
             Assert.Equal(1, count);
             var eoss = tokens.Where(x => x.IsEOS);
             Assert.Single(eoss);

diff --git a/ParserTests/samples/IndentedWhileTests.cs b/ParserTests/samples/IndentedWhileTests.cs
@@ -152,7 +152,7 @@ public void TestFactorialProgramExecAsIL()
     i := i + 1
 return r";
             var compiler = new IndentedWhileCompiler();
-            var func = compiler.CompileToFunction(program);
+            var func = compiler.CompileToFunction(program,true);
             Assert.NotNull(func);
             var f = func();
             Assert.Equal(3628800, f);

diff --git a/ParserTests/samples/WhileTests.cs b/ParserTests/samples/WhileTests.cs
@@ -140,7 +140,7 @@ public void TestFactorialProgramExecAsIL()
 return r
 )";
             var compiler = new WhileCompiler();
-            var func = compiler.CompileToFunction(program);
+            var func = compiler.CompileToFunction(program,true);
             Assert.NotNull(func);
             var f = func();
             Assert.Equal(3628800, f);

diff --git a/samples/IndentedWhile/IndentedWhileCompiler.cs b/samples/IndentedWhile/IndentedWhileCompiler.cs
@@ -80,7 +80,7 @@ public string TranspileToCSharp(string whileCode)
         }
 
 
-        public Func<int> CompileToFunction(string whileCode)
+        public Func<int> CompileToFunction(string whileCode, bool isQuiet = false)
         {
             Func<int> function = null;
 
@@ -93,15 +93,14 @@ public Func<int> CompileToFunction(string whileCode)
 
                     var checker = new SemanticChecker();
 
-                    var context = checker.SemanticCheck(ast);
+                    var context = checker.SemanticCheck(ast,isQuiet);
 
                     var emiter = Emit<Func<int>>.NewDynamicMethod("Method" + Guid.NewGuid());
 
                     emiter = ast.EmitByteCode(context, emiter);
                     //emiter.LoadConstant(42);                    
                     //emiter.Return();
                     function = emiter.CreateDelegate();
-                    object res = function.Invoke();
                 }
             }
             catch

diff --git a/samples/ParserExample/Program.cs b/samples/ParserExample/Program.cs
@@ -139,7 +139,7 @@ private static void TestFactorial()
 
                     var compiler = new WhileCompiler();
                     var code = compiler.TranspileToCSharp(program);
-                    var f = compiler.CompileToFunction(program);
+                    var f = compiler.CompileToFunction(program,false);
                     int r = f();
                     if (r != 3628800)
                     {
@@ -206,7 +206,7 @@ private static void TestIndentedFactorial()
 
                     var compiler = new IndentedWhileCompiler();
                     var code = compiler.TranspileToCSharp(program);
-                    var f = compiler.CompileToFunction(program);
+                    var f = compiler.CompileToFunction(program,false);
                     Console.WriteLine("***********************************");
                     Console.WriteLine("***********************************");
                     Console.WriteLine("***********************************");

diff --git a/samples/while/compiler/CompilerContext.cs b/samples/while/compiler/CompilerContext.cs
@@ -10,6 +10,7 @@ public CompilerContext()
             CurrentScope = RootScope;
         }
 
+        public bool IsQuiet { get; set; }
 
         public Scope RootScope { get; protected set; }
 

diff --git a/samples/while/compiler/SemanticChecker.cs b/samples/while/compiler/SemanticChecker.cs
@@ -6,10 +6,12 @@ public class SemanticChecker
     {
         private ExpressionTyper expressionTyper;
 
-        public CompilerContext SemanticCheck(WhileAST ast)
+        public CompilerContext SemanticCheck(WhileAST ast, bool isQuiet = false)
         {
             expressionTyper = new ExpressionTyper();
-            return SemanticCheck(ast, new CompilerContext());
+            var context = new CompilerContext();
+            context.IsQuiet = isQuiet;
+            return SemanticCheck(ast, context);
         }
 
         private CompilerContext SemanticCheck(WhileAST ast, CompilerContext context)

diff --git a/samples/while/compiler/WhileCompiler.cs b/samples/while/compiler/WhileCompiler.cs
@@ -78,7 +78,7 @@ public string TranspileToCSharp(string whileCode)
         }
 
 
-        public Func<int> CompileToFunction(string whileCode)
+        public Func<int> CompileToFunction(string whileCode, bool isQuiet)
         {
             Func<int> function = null;
 
@@ -91,15 +91,14 @@ public Func<int> CompileToFunction(string whileCode)
 
                     var checker = new SemanticChecker();
 
-                    var context = checker.SemanticCheck(ast);
+                    var context = checker.SemanticCheck(ast, isQuiet);
 
                     var emiter = Emit<Func<int>>.NewDynamicMethod("Method" + Guid.NewGuid());
 
                     emiter = ast.EmitByteCode(context, emiter);
                     //emiter.LoadConstant(42);                    
                     //emiter.Return();
                     function = emiter.CreateDelegate();
-                    object res = function.Invoke();
                 }
             }
             catch

diff --git a/samples/while/model/PrintStatement.cs b/samples/while/model/PrintStatement.cs
@@ -35,10 +35,12 @@ public string Transpile(CompilerContext context)
 
         public Emit<Func<int>> EmitByteCode(CompilerContext context, Emit<Func<int>> emiter)
         {
-            var mi = typeof(Console).GetMethod("WriteLine", new[] {typeof(string)});
-
-            emiter = Value.EmitByteCode(context, emiter);
-            emiter.Call(mi);
+            if (!context.IsQuiet)
+            {
+                var mi = typeof(Console).GetMethod("WriteLine", new[] { typeof(string) });
+                emiter = Value.EmitByteCode(context, emiter);
+                emiter.Call(mi);
+            }
 
             return emiter;
         }

diff --git a/sly/lexer/fsm/FSMLexer.cs b/sly/lexer/fsm/FSMLexer.cs
@@ -292,7 +292,6 @@ private FSMMatch<N> ConsumeIndents(ReadOnlyMemory<char> source, LexerPosition le
                     while (i < currentIndentations.Count && indentPosition < indents.Count)
                     {
                         var current = currentIndentations[currentIndentations.Count-i-1];
-                        bool ok = true;
                         int j = 0;
                         if (indentPosition + current.Length > indents.Count)
                         {

diff --git a/sly/parser/parser/llparser/RecursiveDescentSyntaxParser.cs b/sly/parser/parser/llparser/RecursiveDescentSyntaxParser.cs
@@ -371,7 +371,6 @@ public SyntaxParseResult<IN> ParseTerminal(IList<Token<IN>> tokens, TerminalClau
             int currentPosition)
         {
             var startPosition = currentPosition;
-            var endingPosition = 0;
             var nt = Configuration.NonTerminals[nonTermClause.NonTerminalName];
             var errors = new List<UnexpectedTokenSyntaxError<IN>>();