Merge pull request #24 from navtech-io/develop

Cleanup

Author: rajeshjn

src/Simpleflow/CodeGenerator/FastExpressionCompiler.cs

@@ -42,14 +42,12 @@ public SimpleflowCodeVisitor(IFunctionRegister functionRegister, ParserEventPubl
             InputParam = Expression.Parameter(typeof(TArg));
             OutputParam = Expression.Parameter(typeof(FlowOutput));
             // use context parameter name in order to access in script
-            ScriptHelperContextParam = Expression.Parameter(typeof(ScriptHelperContext), "context");
-
+            ScriptHelperContextParam = Expression.Parameter(typeof(ScriptHelperContext));
 
             /* A label expression of the void type that is the target for Expression.Return(). */
             TargetLabelToExitFunction = Expression.Label();
         }
 
-
         public override Expression VisitProgram(SimpleflowParser.ProgramContext context)
         {
             if (context.exception != null)
@@ -236,13 +234,15 @@ private void ReplaceVirtualSmartVariablesWithReal(List<Expression> statementExpr
         private List<Expression> CreateDefaultVariablesAndAssign()
         {
             var argVar = Expression.Variable(typeof(TArg), "arg");
+            var contextVar = Expression.Variable(typeof(ScriptHelperContext), "context");
 
-            Variables.Add(argVar);               // arg
-            Variables.Add(ScriptHelperContextParam);  // script
+            Variables.Add(argVar);      
+            Variables.Add(contextVar);  
 
             return new List<Expression>()
             {
-                Expression.Assign(argVar, InputParam)
+                Expression.Assign(argVar, InputParam),
+                Expression.Assign(contextVar, ScriptHelperContextParam)
             };
         }
 

src/Simpleflow/CodeGenerator/SimpleflowCodeVisitor.cs

@@ -4,9 +4,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
-
-using Antlr4.Runtime;
 using FastExpressionCompiler;
+using Antlr4.Runtime;
 
 using Simpleflow.Exceptions;
 using Simpleflow.Parser;

src/Simpleflow/CodeGenerator/SimpleflowCompiler.cs

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
     <PackageIcon>PackageIcon.png</PackageIcon>
-    <VersionPrefix>1.0.6</VersionPrefix>
+    <VersionPrefix>1.0.7</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
@@ -13,7 +13,6 @@
 
   <ItemGroup>
     <PackageReference Include="Antlr4.Runtime.Standard" Version="4.10.1" />
-    <PackageReference Include="FastExpressionCompiler" Version="3.3.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
   </ItemGroup>
 

src/Simpleflow/Simpleflow.csproj

@@ -102,7 +102,7 @@ public void AccessArrayValue()
             var script =
                 @"
                  let i = 1
-                 let x=arg[i]
+                 let x=arg[i] # don't provide space here, like arg [ i ], intended this way for testing
                  output x
 
                 ";

src/Simpleflow/Simpleflow.xml

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>