Added BenchmarkApp

Prepared for building nuget package
Changed target frameworks and retrofitted some code features to support bilding for pre-net5.0 targets

src/BenchmarkApp/BenchmarkApp.csproj

@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Content Include="..\..\jsonata-js\test\test-suite\datasets\employees.json" Link="employees.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
+    <PackageReference Include="Jsonata.Net.Js" Version="1.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Jsonata.Net.Native\Jsonata.Net.Native.csproj" />
+  </ItemGroup>
+
+</Project>

src/BenchmarkApp/Program.cs

@@ -0,0 +1,55 @@
+using BenchmarkDotNet.Attributes;
+using BenchmarkDotNet.Running;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Diagnostics;
+using System.IO;
+
+namespace BenchmarkApp
+{
+    public class Program
+    {
+        static void Main(string[] args)
+        {
+            BenchmarkRunner.Run<Program>();
+        }
+
+        private readonly string m_data;
+        private readonly string m_query;
+        private readonly int m_iterations = 1;
+
+        public Program()
+        {
+            Console.WriteLine(Directory.GetCurrentDirectory());
+            this.m_data = File.ReadAllText("employees.json");
+            this.m_query = @"
+                {
+                  'name': Employee.FirstName & ' ' & Employee.Surname,
+                  'mobile': Contact.Phone[type = 'mobile'].number
+                }
+            ";
+        }
+
+        [Benchmark]
+        public void ProcessNative()
+        {
+            Jsonata.Net.Native.JsonataQuery evaluator = new Jsonata.Net.Native.JsonataQuery(this.m_query);
+            JToken json = JToken.Parse(this.m_data);
+
+            for (int i = 0; i < this.m_iterations; ++i)
+            {
+                evaluator.Eval(json);
+            }
+        }
+
+        [Benchmark]
+        public void ProcessJs()
+        {
+            Jsonata.Net.Js.JsonataEngine engine = new Jsonata.Net.Js.JsonataEngine();
+            for (int i = 0; i < this.m_iterations; ++i)
+            {
+                engine.Execute(this.m_query, this.m_data);
+            }
+        }
+    }
+}

src/Jsonata.Net.Native.sln

@@ -5,9 +5,11 @@ VisualStudioVersion = 16.0.31702.278
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Jsonata.Net.Native", "Jsonata.Net.Native\Jsonata.Net.Native.csproj", "{BEC03473-EAA4-4202-A57B-1E3A9148635E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jsonata.Net.Native.Tests", "Jsonata.Net.Native.Tests\Jsonata.Net.Native.Tests.csproj", "{BE20B518-F1F6-4F51-95E8-AAA6D98D38C1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Jsonata.Net.Native.Tests", "Jsonata.Net.Native.Tests\Jsonata.Net.Native.Tests.csproj", "{BE20B518-F1F6-4F51-95E8-AAA6D98D38C1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jsonata.Net.Native.TestSuite", "Jsonata.Net.Native.TestSuite\Jsonata.Net.Native.TestSuite.csproj", "{B9E0AE50-801A-4192-BB56-11C9556CBBD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Jsonata.Net.Native.TestSuite", "Jsonata.Net.Native.TestSuite\Jsonata.Net.Native.TestSuite.csproj", "{B9E0AE50-801A-4192-BB56-11C9556CBBD4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BenchmarkApp", "BenchmarkApp\BenchmarkApp.csproj", "{3EA3F316-CAE2-47B4-BCDF-0E6411C50C71}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -27,6 +29,10 @@ Global
 		{B9E0AE50-801A-4192-BB56-11C9556CBBD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B9E0AE50-801A-4192-BB56-11C9556CBBD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B9E0AE50-801A-4192-BB56-11C9556CBBD4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3EA3F316-CAE2-47B4-BCDF-0E6411C50C71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3EA3F316-CAE2-47B4-BCDF-0E6411C50C71}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3EA3F316-CAE2-47B4-BCDF-0E6411C50C71}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3EA3F316-CAE2-47B4-BCDF-0E6411C50C71}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/Jsonata.Net.Native/Eval/ExplicitArray.cs

@@ -3,7 +3,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
 namespace Jsonata.Net.Native.Eval

src/Jsonata.Net.Native/Eval/Sequence.cs

@@ -3,7 +3,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
 namespace Jsonata.Net.Native.Eval

src/Jsonata.Net.Native/IsExternalInit.cs

@@ -0,0 +1,7 @@
+#if !NET5_0
+//see https://stackoverflow.com/a/64749403/376066
+namespace System.Runtime.CompilerServices
+{
+    internal static class IsExternalInit { }
+}
+#endif

src/Jsonata.Net.Native/Jsonata.Net.Native.csproj

@@ -1,13 +1,46 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFrameworks>net47;netstandard2.0;net5.0</TargetFrameworks>
+    <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
-    <WarningsAsErrors></WarningsAsErrors>
+    <DebugType>embedded</DebugType>
+    <DebugSymbols>true</DebugSymbols>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <WarningsAsErrors />
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Authors>Mikhail Barg</Authors>
+    <Description>.Net native implementation of JSONata query and transformation language</Description>
+    <Copyright>Copyright © 2021 Mikhail Barg</Copyright>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <PackageProjectUrl>https://github.com/mikhail-barg/jsonata.net.native</PackageProjectUrl>
+    <PackageIcon>jsonata-button.png</PackageIcon>
+    <PackageIconUrl />
+    <PackageTags>jsonata</PackageTags>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <Version>1.0.0-pre1</Version>
+
+    <!-- see https://github.com/dotnet/sourcelink/blob/master/docs/README.md#continuousintegrationbuild -->
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+    <DeterministicSourcePaths>true</DeterministicSourcePaths>
+
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- see https://github.com/dotnet/sourcelink/blob/master/docs/README.md#continuousintegrationbuild -->
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="..\..\jsonata-button.png" Pack="true" PackagePath="" />
+    <None Include="..\..\LICENSE" Pack="true" PackagePath="" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>

src/Jsonata.Net.Native/Parsing/Lexer.cs

@@ -183,7 +183,7 @@ private Token scanName()
 			{
 				result = this.newToken(TokenType.typeVariable);
 			}
-			else if (this.lookupKeyword(this.m_queryText[this.StartPos .. this.CurrentPos], out TokenType tt))
+			else if (this.lookupKeyword(this.m_queryText.Substring(this.StartPos, this.CurrentPos - this.StartPos), out TokenType tt))
 			{
 				result = this.newToken(tt);
 			}
@@ -386,7 +386,7 @@ private bool acceptAll(Func<char, bool> isValid)
 
 		private Token newToken(TokenType type)
         {
-			Token result = new Token(type, this.m_queryText[this.StartPos..this.CurrentPos], this.StartPos);
+			Token result = new Token(type, this.m_queryText.Substring(this.StartPos, this.CurrentPos - this.StartPos), this.StartPos);
 			this.StartPos = this.CurrentPos;
 			return result;
 		}

src/Jsonata.Net.Native/Parsing/Nodes.cs

@@ -660,7 +660,7 @@ public override string ToString()
     // A LambdaNode represents a user-defined JSONata function.
     internal sealed record LambdaNode(bool isShorthand, List<string> paramNames, LambdaNode.Signature? signature, Node body) : Node
     {
-        internal override LambdaNode optimize()
+        internal override Node optimize()
         {
             Node body = this.body.optimize();
             if (body != this.body)

src/Jsonata.Net.Native/Parsing/Parser.cs

@@ -140,7 +140,7 @@ private static Dictionary<TokenType, int> InitBindingPowers()
                 }
             }
 
-            foreach (TokenType tt in Enum.GetValues<TokenType>())
+            foreach (TokenType tt in Enum.GetValues(typeof(TokenType)))
             {
                 if (!results.ContainsKey(tt))
                 {
@@ -157,7 +157,7 @@ private static Dictionary<TokenType, int> InitBindingPowers()
         // have a binding power.
         private static void ValidateBindingPowers(Dictionary<TokenType, int> bps, Dictionary<TokenType, Led> leds)
         {
-            foreach (TokenType tt in Enum.GetValues<TokenType>())
+            foreach (TokenType tt in Enum.GetValues(typeof(TokenType)))
             {
                 if (leds.ContainsKey(tt) && bps[tt] == 0)
                 {