issue472

.github/workflows/publish.yml

@@ -2,47 +2,46 @@ name: Publish
 
 on:
   push:
-    tags: 
-      - 'v*.*.*'
+    tags:
+      - "v*.*.*"
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
     env:
       DOTNET_NOLOGO: true
       DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
       DOTNET_CLI_TELEMETRY_OPTOUT: true
 
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-dotnet@v4
-      with:
-        global-json-file: global.json
-    
-    - name: Build
-      run: dotnet build -c:Release
-
-    - name: Make Internal
-      shell: pwsh
-      run: ./BuildScripts/MakeInternal.ps1
-
-    - name: Pack with dotnet
-      run: |
-        arrTag=(${GITHUB_REF//\// })
-        VERSION="${arrTag[2]}"
-        VERSION="${VERSION//v}"
-        echo "$VERSION"
-        
-        dotnet pack --no-build --output artifacts -p:Version=$VERSION -p:ContinuousIntegrationBuild=True ./nuspecs/FastExpressionCompiler.src.nuspec
-        dotnet pack --no-build --output artifacts -p:Version=$VERSION -p:ContinuousIntegrationBuild=True ./nuspecs/FastExpressionCompiler.LightExpression.src.nuspec
-        dotnet pack --no-build --output artifacts -p:Version=$VERSION -p:ContinuousIntegrationBuild=True ./nuspecs/FastExpressionCompiler.Internal.src.nuspec
-        dotnet pack --no-build --output artifacts -p:Version=$VERSION -p:ContinuousIntegrationBuild=True ./nuspecs/FastExpressionCompiler.LightExpression.Internal.src.nuspec
-
-    - uses: actions/upload-artifact@v4
-      with:
-        name: Packages
-        path: ./artifacts
-        
+      - uses: actions/checkout@v4
+      - uses: actions/setup-dotnet@v4
+        with:
+          global-json-file: global.json
+
+      - name: Build
+        run: dotnet build -c:Release
+
+      - name: Make Internal
+        shell: pwsh
+        run: ./BuildScripts/MakeInternal.ps1
+
+      - name: Pack with dotnet
+        run: |
+          arrTag=(${GITHUB_REF//\// })
+          VERSION="${arrTag[2]}"
+          VERSION="${VERSION//v}"
+          echo "$VERSION"
+
+          dotnet pack --no-build --output artifacts -p:Version=$VERSION -p:ContinuousIntegrationBuild=True ./nuspecs/FastExpressionCompiler.src.nuspec
+          dotnet pack --no-build --output artifacts -p:Version=$VERSION -p:ContinuousIntegrationBuild=True ./nuspecs/FastExpressionCompiler.LightExpression.src.nuspec
+          dotnet pack --no-build --output artifacts -p:Version=$VERSION -p:ContinuousIntegrationBuild=True ./nuspecs/FastExpressionCompiler.Internal.src.nuspec
+          dotnet pack --no-build --output artifacts -p:Version=$VERSION -p:ContinuousIntegrationBuild=True ./nuspecs/FastExpressionCompiler.LightExpression.Internal.src.nuspec
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: Packages
+          path: ./artifacts
+
     # - name: Push with dotnet
     #   run: dotnet nuget push artifacts/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json

Directory.Build.props

@@ -5,12 +5,15 @@
 
         <NeutralLanguage>en-US</NeutralLanguage>
         <LangVersion>latest</LangVersion>
-        <LatestSupportedNet>net9.0</LatestSupportedNet>
 
         <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
         <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
 
         <NoWarn>IDE0251;IDE0079;IDE0047;NETSDK1212</NoWarn>
+
+        <!-- When set, reducec number of the TargetPlatforms to speedup a local Dev -->
+        <DevMode>false</DevMode>
+
     </PropertyGroup>
 
     <ItemGroup>

b.bat

@@ -1,13 +1,19 @@
 @echo off
 
+echo:
+echo:## Starting BUILD...
+echo: 
+dotnet build -p:DevMode=true -v:m -c:Release
+if %ERRORLEVEL% neq 0 goto :error
+
 echo: 
-echo:## Starting: TESTS...
+echo:## Starting TESTS...
 echo:
 
-dotnet run -c:Release -f:net9.0 --project test/FastExpressionCompiler.TestsRunner/FastExpressionCompiler.TestsRunner.csproj
+dotnet run --no-build -p:DevMode=true -f:net9.0 -c:Release --project test/FastExpressionCompiler.TestsRunner/FastExpressionCompiler.TestsRunner.csproj
 if %ERRORLEVEL% neq 0 goto :error
 
-dotnet run -c:Release --project test/FastExpressionCompiler.TestsRunner.Net472
+dotnet run --no-build -p:DevMode=true -c:Release --project test/FastExpressionCompiler.TestsRunner.Net472
 if %ERRORLEVEL% neq 0 goto :error
 
 echo:

bt.bat

@@ -3,7 +3,7 @@
 echo: 
 echo:## Running TESTS on the Latest Supported .NET...
 echo:
-dotnet run -c:Release -f:net9.0 --project test/FastExpressionCompiler.TestsRunner/FastExpressionCompiler.TestsRunner.csproj
+dotnet run -p:DevMode=true -f:net9.0 -c:Release --project test/FastExpressionCompiler.TestsRunner/FastExpressionCompiler.TestsRunner.csproj
 if %ERRORLEVEL% neq 0 goto :error
 
 echo:

build.bat

@@ -3,22 +3,11 @@ setlocal EnableDelayedExpansion
 
 echo: # BUILDING AND RUNNING THE TESTS IN RELEASE MODE
 echo:
-echo:
-
-set "FrameworkParam=-f:net9.0"
-set "LatestSupportedNetProp=-p:LatestSupportedNet=net9.0"
-if [%1] NEQ [] (
-    set "FrameworkParam=-f:%1"
-    set "LatestSupportedNetProp=-p:LatestSupportedNet=%1"
-)
-echo:FrameworkParam == '%FrameworkParam%', LatestSupportedNetProp == '%LatestSupportedNetProp%'
-
 echo:
 echo:## Starting: RESTORE and BUILD...
 echo: 
-
-dotnet clean -v:m %LatestSupportedNetProp%
-dotnet build -v:m %LatestSupportedNetProp% -c:Release
+dotnet clean -v:m
+dotnet build -v:m -c:Release
 if %ERRORLEVEL% neq 0 goto :error
 
 echo:
@@ -27,19 +16,22 @@ echo:## Finished: RESTORE and BUILD
 echo: 
 echo:## Starting: TESTS...
 echo:
-echo: running on .NET 9.0 (Latest)
-echo:
-dotnet run --no-build net9.0 %FrameworkParam% -c:Release --project test/FastExpressionCompiler.TestsRunner
+echo:running on .NET 9.0 (Latest)
+dotnet run --no-build -f:net9.0 -c:Release --project test/FastExpressionCompiler.TestsRunner
+if %ERRORLEVEL% neq 0 goto :error
 
-echo: running on .NET 8.0 (LTS)
 echo:
-dotnet run --no-build net8.0 %FrameworkParam% -c:Release --project test/FastExpressionCompiler.TestsRunner
+echo:running on .NET 8.0 (LTS)
+dotnet run --no-build -f:net8.0 -c:Release --project test/FastExpressionCompiler.TestsRunner
+if %ERRORLEVEL% neq 0 goto :error
 
-echo: running on .NET 6.0 (LTS)
 echo:
-dotnet run --no-build net6.0 %FrameworkParam% -c:Release --project test/FastExpressionCompiler.TestsRunner
+echo:running on .NET 6.0 (Previous LTS)
+dotnet run --no-build -f:net6.0 -c:Release --project test/FastExpressionCompiler.TestsRunner
 if %ERRORLEVEL% neq 0 goto :error
 
+echo:
+echo:running on .NET 4.7.2
 dotnet run --no-build -c:Release --project test/FastExpressionCompiler.TestsRunner.Net472
 if %ERRORLEVEL% neq 0 goto :error
 echo:

build_debug.bat

@@ -1,23 +1,13 @@
 @echo off
 setlocal EnableDelayedExpansion
 
-echo: # BUILDING AND RUNNNG THE TESTS IN DEBUG MODE
+echo: # BUILDING AND RUNNING THE TESTS IN DEBUG MODE
 echo:
-echo:
-
-set "FrameworkParam=-f:net9.0"
-set "LatestSupportedNetProp=-p:LatestSupportedNet=net9.0"
-if [%1] NEQ [] (
-    set "FrameworkParam=-f:%1"
-    set "LatestSupportedNetProp=-p:LatestSupportedNet=%1"
-)
-echo:FrameworkParam == '%FrameworkParam%', LatestSupportedNetProp == '%LatestSupportedNetProp%'
-
 echo:
 echo:## Starting: RESTORE and BUILD...
 echo: 
 
-dotnet build %LatestSupportedNetProp% -c:Debug
+dotnet build -c:Debug
 if %ERRORLEVEL% neq 0 goto :error
 
 echo:
@@ -26,10 +16,22 @@ echo:## Finished: RESTORE and BUILD
 echo: 
 echo:## Starting: TESTS...
 echo:
+echo:running on .NET 9.0 (Latest)
+dotnet run --no-build -f:net9.0 -c:Debug --project test/FastExpressionCompiler.TestsRunner
+if %ERRORLEVEL% neq 0 goto :error
 
-dotnet run --no-build %LatestSupportedNetProp% %FrameworkParam% -c:Debug --project test/FastExpressionCompiler.TestsRunner
+echo:
+echo:running on .NET 8.0 (LTS)
+dotnet run --no-build -f:net8.0 -c:Debug --project test/FastExpressionCompiler.TestsRunner
 if %ERRORLEVEL% neq 0 goto :error
 
+echo:
+echo:running on .NET 6.0 (Previous LTS)
+dotnet run --no-build -f:net6.0 -c:Debug --project test/FastExpressionCompiler.TestsRunner
+if %ERRORLEVEL% neq 0 goto :error
+
+echo:
+echo:running on .NET 4.7.2
 dotnet run --no-build -c:Debug --project test/FastExpressionCompiler.TestsRunner.Net472
 if %ERRORLEVEL% neq 0 goto :error
 echo:

running

@@ -0,0 +1,6 @@
+ on .NET 9.0 (Latest)
+ on .NET 8.0 (LTS)
+ on .NET 6.0 (Previous LTS)
+ on .NET 4.7.2
+ on .NET 9.0 (Latest)
+ on .NET 8.0 (LTS)

src/FastExpressionCompiler.LightExpression/Expression.cs

@@ -184,9 +184,25 @@ private static ParameterExpression TryToMakeKnownTypeParameter(Type type, string
     public static readonly ConstantExpression OneConstant = new IntConstantExpression(1);
     public static readonly ConstantExpression MinusOneConstant = new IntConstantExpression(-1);
 
-    public static ConstantRefExpression<T> ConstantRef<T>(T value) => new ConstantRefExpression<T>(value);
+    /// <summary>Holds the value that you can change lately</summary>
+    public sealed class ValueRef<T>
+    {
+        /// <summary>Reflection access to the value FieldInfo</summary>
+        public static readonly FieldInfo ValueField = typeof(ValueRef<T>).GetField(nameof(Value), BindingFlags.Public | BindingFlags.Instance);
+        /// <summary>The adjustable value</summary>
+        public T Value;
+        /// <summary>Construct with the initial value</summary>
+        public ValueRef(T value) => Value = value;
+    }
 
-    public static ConstantRefExpression ConstantRef(object value, Type type) => new ConstantRefExpression(value, type);
+    /// <summary>Simplifies the constant which is always hold in Closure and which Value can be modified after the compilation</summary>
+    public static Expression ConstantRef<T>(T value, out ValueRef<T> valueRef)
+    {
+        valueRef = new ValueRef<T>(value);
+
+        // todo: @perf try the intrinsic?
+        return new InstanceFieldExpression(new ValueConstantExpression<ValueRef<T>>(valueRef), ValueRef<T>.ValueField);
+    }
 
     /// <summary>Avoids the boxing for all (two) bool values</summary>
     public static ConstantExpression Constant(bool value) => value ? TrueConstant : FalseConstant;
@@ -3827,10 +3843,6 @@ public abstract class ConstantExpression : Expression
     public sealed override ExpressionType NodeType => ExpressionType.Constant;
     public abstract object Value { get; }
 
-    ///<summary>Constant with this field defined will be always put in Closure as a Constant instance and not its value, 
-    /// and will always be accessed by its mutable Field directly, without putting its value into the local variable</summary> 
-    public virtual FieldInfo RefField => null;
-
 #if SUPPORTS_VISITOR
     [RequiresUnreferencedCode(Trimming.Message)]
     protected internal override Expression Accept(ExpressionVisitor visitor) => visitor.VisitConstant(this);
@@ -3869,36 +3881,7 @@ public sealed class ValueConstantExpression<T> : ConstantExpression
     // Note: the Value is specifically an object despite possibility of strongly typed T, because this way it will be a single boxing.
     // Otherwise even using the typed `T _value`, it will be boxed multiple times through its `object Value` accessor.
     public override object Value { get; }
-    internal ValueConstantExpression(object value) => Value = value;
-}
-
-/// <summary>A special case of Constant entirely stored in Closure,
-/// so that its ValueRef can be updated and the all its Value usage sites will be updated as well, #466.</summary>
-public sealed class ConstantRefExpression<T> : ConstantExpression
-{
-    public override Type Type => typeof(T);
-    public override object Value => ValueRef;
-    private static readonly FieldInfo ValueRefField = typeof(ConstantRefExpression<T>).GetField(nameof(ValueRef));
-    public override FieldInfo RefField => ValueRefField;
-    public T ValueRef;
-    internal ConstantRefExpression(T value) => ValueRef = value;
-}
-
-/// <summary>
-/// Note: There is no RefConstantExpression which relies on `Value.GetType()`, because the Value may change (by design), so the Type, which may produce unexpected results.
-/// </summary>
-public sealed class ConstantRefExpression : ConstantExpression
-{
-    public override Type Type { get; }
-    public override object Value => ValueRef;
-    public object ValueRef;
-    private static readonly FieldInfo ValueRefField = typeof(ConstantRefExpression).GetField(nameof(ValueRef));
-    public override FieldInfo RefField => ValueRefField;
-    internal ConstantRefExpression(object value, Type type)
-    {
-        Type = type ?? typeof(object); // The type always should be set
-        ValueRef = value;
-    }
+    internal ValueConstantExpression(T value) => Value = value;
 }
 
 public sealed class TypedValueConstantExpression : ConstantExpression

src/FastExpressionCompiler.LightExpression/FastExpressionCompiler.LightExpression.csproj

@@ -1,11 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks Condition=" '$(LatestSupportedNet)' == 'net7.0' ">net472;netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
-        <TargetFrameworks Condition=" '$(LatestSupportedNet)' == 'net8.0' ">net472;netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
-        <TargetFrameworks Condition=" '$(LatestSupportedNet)' == 'net9.0' ">net472;netstandard2.0;netstandard2.1;net6.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks Condition="'$(DevMode)' != 'true'">net472;netstandard2.0;netstandard2.1;net6.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks Condition="'$(DevMode)' == 'true'">net472;net9.0</TargetFrameworks>
 
         <VersionPrefix>5.2.0</VersionPrefix>
-        <VersionSuffix>preview-02</VersionSuffix>
+        <VersionSuffix>preview-03</VersionSuffix>
 
         <Product>FastExpressionCompiler.LightExpression</Product>
 
@@ -16,7 +15,8 @@
         <PackageReleaseNotes><![CDATA[
 ## v5.2.0
 
-- add: Expose TestTools and FastExpressionCompiler.ILDecoder to enable testing and diagnostic in the consumer projects
+- feat: #472 Interpreter to reduce the IL emitted by the Logical, Comparison, Arithmetics expressions, by calculating them during compile time and using the calculation result in IL
+- feat: Expose TestTools and FastExpressionCompiler.ILDecoder to enable testing and diagnostic in the consumer code
 
 
 ## v5.1.1. Bug-fix release