Merge remote-tracking branch 'upstream/master'

.editorconfig

@@ -6,5 +6,8 @@ root = true
 
 # 4 space indentation
 [*.cs]
+csharp_indent_case_contents_when_block = false
+dotnet_sort_system_directives_first = true
 indent_style = space
 indent_size = 4
+trim_trailing_whitespace = true

src/NCalc.Async/AsyncExpression.cs

@@ -1,12 +1,12 @@
-using NCalc.Cache;
+using System.Diagnostics.CodeAnalysis;
+using NCalc.Cache;
 using NCalc.Domain;
 using NCalc.Exceptions;
 using NCalc.Factories;
-using NCalc.Visitors;
-using System.Diagnostics.CodeAnalysis;
 using NCalc.Handlers;
 using NCalc.Helpers;
 using NCalc.Services;
+using NCalc.Visitors;
 
 namespace NCalc;
 
@@ -22,7 +22,7 @@ public class AsyncExpression
     /// Default Value: True
     /// </summary>
     public static bool CacheEnabled { get; set; } = true;
-    
+
     /// <summary>
     /// Options for the expression evaluation.
     /// </summary>
@@ -40,7 +40,7 @@ public CultureInfo CultureInfo
         get => Context.CultureInfo;
         set => Context.CultureInfo = value;
     }
-    
+
     protected AsyncExpressionContext Context { get; init; }
 
     /// <summary>
@@ -52,20 +52,18 @@ public CultureInfo CultureInfo
         set => Context.StaticParameters = value;
     }
 
-
     public IDictionary<string, AsyncExpressionParameter> DynamicParameters
     {
         get => Context.DynamicParameters;
         set => Context.DynamicParameters = value;
     }
-    
+
     public IDictionary<string, AsyncExpressionFunction> Functions
     {
         get => Context.Functions;
         set => Context.Functions = value;
     }
-
-
+
     /// <summary>
     /// Event triggered to handle function evaluation.
     /// </summary>
@@ -74,7 +72,7 @@ public event AsyncEvaluateFunctionHandler EvaluateFunctionAsync
         add => Context.AsyncEvaluateFunctionHandler += value;
         remove => Context.AsyncEvaluateFunctionHandler -= value;
     }
-    
+
     /// <summary>
     /// Event triggered to handle parameter evaluation.
     /// </summary>
@@ -83,7 +81,7 @@ public event AsyncEvaluateParameterHandler EvaluateParameterAsync
         add => Context.AsyncEvaluateParameterHandler += value;
         remove => Context.AsyncEvaluateParameterHandler -= value;
     }
-    
+
     /// <summary>
     /// Textual representation of the expression.
     /// </summary>
@@ -93,13 +91,12 @@ public event AsyncEvaluateParameterHandler EvaluateParameterAsync
 
     public Exception? Error { get; private set; }
 
-    protected ILogicalExpressionCache LogicalExpressionCache { get;}
+    protected ILogicalExpressionCache LogicalExpressionCache { get; }
 
     protected ILogicalExpressionFactory LogicalExpressionFactory { get; }
 
     protected IAsyncEvaluationService EvaluationService { get; }
-
-
+
     private AsyncExpression(AsyncExpressionContext? context = null)
     {
         LogicalExpressionCache = Cache.LogicalExpressionCache.GetInstance();
@@ -121,7 +118,7 @@ public AsyncExpression(
         EvaluationService = evaluationService;
         LogicalExpressionFactory = factory;
     }
-    
+
     public AsyncExpression(
         LogicalExpression logicalExpression,
         AsyncExpressionContext context,
@@ -135,13 +132,12 @@ public AsyncExpression(
         EvaluationService = evaluationService;
         LogicalExpressionFactory = factory;
     }
-    
+
     public AsyncExpression(string expression, AsyncExpressionContext? context = null) : this(context)
     {
         ExpressionString = expression;
     }
 
-
     // ReSharper disable once RedundantOverload.Global
     // Reason: False positive, ExpressionContext have implicit conversions.
     public AsyncExpression(string expression) : this(expression, ExpressionOptions.None)
@@ -169,7 +165,7 @@ public AsyncExpression(LogicalExpression logicalExpression, ExpressionOptions op
         CultureInfo? cultureInfo = null) : this(logicalExpression, new AsyncExpressionContext(options, cultureInfo))
     {
     }
-    
+
     private LogicalExpression? GetLogicalExpression()
     {
         if (string.IsNullOrEmpty(ExpressionString))
@@ -195,7 +191,7 @@ public AsyncExpression(LogicalExpression logicalExpression, ExpressionOptions op
 
         return logicalExpression;
     }
-    
+
     /// <summary>
     /// Create the LogicalExpression in order to check syntax errors.
     /// If errors are detected, the Error property contains the exception.
@@ -217,7 +213,7 @@ public bool HasErrors()
             return true;
         }
     }
-    
+
 
     /// <summary>
     /// Asynchronously evaluates the logical expression.
@@ -240,7 +236,7 @@ public bool HasErrors()
 
         return await EvaluationService.EvaluateAsync(LogicalExpression!, Context);
     }
-    
+
     private async Task<List<object?>> IterateParametersAsync()
     {
         var parameterEnumerators = ParametersHelper.GetEnumerators(Parameters, out var size);
@@ -260,7 +256,7 @@ public bool HasErrors()
 
         return results;
     }
-    
+
     /// <summary>
     /// Returns a list with all parameter names from the expression.
     /// </summary>
@@ -276,7 +272,7 @@ public List<string> GetParametersNames()
     {
         return GetParameterNames();
     }
-    
+
     /// <summary>
     /// Returns a list with all function names from the expression.
     /// </summary>

src/NCalc.Async/AsyncExpressionContext.cs

@@ -10,10 +10,10 @@ public record AsyncExpressionContext : ExpressionContextBase
     public IDictionary<string, AsyncExpressionFunction> Functions { get; set; } =
         new Dictionary<string, AsyncExpressionFunction>();
 
-    
+
     public AsyncEvaluateParameterHandler? AsyncEvaluateParameterHandler { get; set; }
     public AsyncEvaluateFunctionHandler? AsyncEvaluateFunctionHandler { get; set; }
-    
+
     public AsyncExpressionContext()
     {
     }

src/NCalc.Async/AsyncExpressionFunctionData.cs

@@ -5,13 +5,13 @@ public class AsyncExpressionFunctionData(Guid id, AsyncExpression[] arguments, A
     public Guid Id { get; } = id;
     private AsyncExpression[] Arguments { get; } = arguments;
     public AsyncExpressionContext Context { get; } = context;
-    
+
     public AsyncExpression this[int index]
     {
         get => Arguments[index];
         set => Arguments[index] = value;
     }
-    
+
     public IEnumerator<AsyncExpression> GetEnumerator()
     {
         return ((IEnumerable<AsyncExpression>)Arguments).GetEnumerator();

src/NCalc.Async/Handlers/AsyncFunctionArgs.cs

@@ -1,9 +1,9 @@
 namespace NCalc.Handlers;
 
-public class AsyncFunctionArgs(Guid id,AsyncExpression[] parameters) : EventArgs
+public class AsyncFunctionArgs(Guid id, AsyncExpression[] parameters) : EventArgs
 {
     public Guid Id { get; } = id;
-    
+
     private object? _result;
 
     public object? Result
@@ -15,10 +15,10 @@ public object? Result
             HasResult = true;
         }
     }
-    
+
     public AsyncExpression[] Parameters { get; } = parameters;
-    
-    public bool HasResult { get;  private set; }
+
+    public bool HasResult { get; private set; }
 
     public async Task<object?[]> EvaluateParametersAsync()
     {

src/NCalc.Async/Handlers/AsyncParameterArgs.cs

@@ -3,7 +3,7 @@ namespace NCalc.Handlers;
 public class AsyncParameterArgs(Guid id) : EventArgs
 {
     public Guid Id { get; } = id;
-    
+
     private object? _result;
     public object? Result
     {

src/NCalc.Async/Helpers/AsyncBuiltInFunctionHelper.cs

@@ -2,13 +2,12 @@
 
 namespace NCalc.Helpers;
 
-
 public static class AsyncBuiltInFunctionHelper
 {
     public static async Task<object?> EvaluateAsync(string functionName, AsyncExpression[] arguments, AsyncExpressionContext context)
     {
-        var caseSensitive = !context.Options.HasFlag(ExpressionOptions.IgnoreCaseAtBuiltInFunctions);
-        var comparison = caseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase;
+        var caseInsensitive = context.Options.HasFlag(ExpressionOptions.IgnoreCaseAtBuiltInFunctions);
+        var comparison = caseInsensitive ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal;
 
         if (functionName.Equals("Abs", comparison))
         {

src/NCalc.Async/Services/AsyncEvaluationService.cs

@@ -6,7 +6,6 @@ namespace NCalc.Services;
 /// <inheritdoc cref="IAsyncEvaluationService"/>
 public class AsyncEvaluationService : IAsyncEvaluationService
 {
-
     public Task<object?> EvaluateAsync(LogicalExpression expression, AsyncExpressionContext context)
     {
         var visitor = new AsyncEvaluationVisitor(context);

src/NCalc.Async/Services/IAsyncEvaluationService.cs

@@ -1,5 +1,4 @@
 using NCalc.Domain;
-using NCalc.Handlers;
 
 namespace NCalc.Services;
 

src/NCalc.Async/Visitors/AsyncEvaluationVisitor.cs

@@ -1,6 +1,6 @@
-using ExtendedNumerics;
-using System.Numerics;
+using System.Numerics;
 using System.Threading;
+using ExtendedNumerics;
 using NCalc.Domain;
 using NCalc.Exceptions;
 using NCalc.Handlers;
@@ -121,12 +121,14 @@ public class AsyncEvaluationVisitor(AsyncExpressionContext context) : ILogicalEx
                 return Math.Pow(Convert.ToDouble(await left.Value, context.CultureInfo),
                     Convert.ToDouble(await right.Value, context.CultureInfo));
             }
+
             case BinaryExpressionType.In:
             {
                 var rightValue = await right.Value;
                 var leftValue = await left.Value;
                 return EvaluationHelper.In(rightValue, leftValue, context);
             }
+
             case BinaryExpressionType.NotIn:
             {
                 var rightValue = await right.Value;

src/NCalc.Core/Domain/BinaryExpression.cs

@@ -15,6 +15,6 @@ public sealed class BinaryExpression(
 
     public override T Accept<T>(ILogicalExpressionVisitor<T> visitor)
     {
-       return visitor.Visit(this);
+        return visitor.Visit(this);
     }
 }

src/NCalc.Core/Domain/ValueExpression.cs

@@ -36,7 +36,7 @@ public ValueExpression(string value)
         Value = value;
         Type = ValueType.String;
     }
-    
+
     public ValueExpression(char value)
     {
         Value = value;

src/NCalc.Core/ExpressionOptions.cs

@@ -10,10 +10,10 @@ public enum ExpressionOptions
     /// Specifies that no options are set.
     /// </summary>
     None = 1 << 0,
-    
+
     [Obsolete("Please use IgnoreCaseAtBuiltInFunctions")]
     IgnoreCase = 1 << 1,
-    
+
     /// <summary>
     /// Specifies case-insensitive matching for built-in functions
     /// </summary>
@@ -33,7 +33,7 @@ public enum ExpressionOptions
     /// When using Round(), if a number is halfway between two others, it is rounded toward the nearest number that is away from zero.
     /// </summary>
     RoundAwayFromZero = 1 << 4,
-    
+
     /// <summary>
     /// Specifies the use of CaseInsensitiveComparer for comparisons.
     /// </summary>
@@ -68,7 +68,7 @@ public enum ExpressionOptions
     /// Concat values as strings instead of arithmetic addition
     /// </summary>
     StringConcat = 1 << 11,
-    
+
     /// <summary>
     /// Parse single quoted strings as <see cref="char"/>
     /// </summary>

src/NCalc.Core/Factories/LogicalExpressionFactory.cs

@@ -23,20 +23,19 @@ LogicalExpression ILogicalExpressionFactory.Create(string expression, Expression
 
     public static LogicalExpression Create(string expression, ExpressionOptions options = ExpressionOptions.None)
     {
-        LogicalExpression? logicalExpression;
         try
         {
             var parserContext = new LogicalExpressionParserContext(expression, options);
-            logicalExpression = LogicalExpressionParser.Parse(parserContext);
+            var logicalExpression = LogicalExpressionParser.Parse(parserContext);
 
             if (logicalExpression is null)
                 throw new ArgumentNullException(nameof(logicalExpression));
+
+            return logicalExpression;
         }
         catch (Exception exception)
         {
             throw new NCalcParserException("Error parsing the expression.", exception);
         }
-
-        return logicalExpression;
     }
 }

src/NCalc.Core/Helpers/EvaluationHelper.cs

@@ -29,7 +29,7 @@ public static class EvaluationHelper
             return string.Concat(leftValue, rightValue);
         }
     }
-    
+
     /// <summary>
     /// Determines if the left value is contained within the right value, which must be either an enumerable or a string.
     /// </summary>
@@ -59,7 +59,7 @@ public static bool In(object? rightValue, object? leftValue, ExpressionContextBa
                     "'in' operator right value must implement IEnumerable or be a string.");
         }
     }
-    
+
     /// <summary>
     /// Evaluates a unary expression.
     /// </summary>

src/NCalc.Core/Helpers/MathHelper.cs

@@ -1,5 +1,5 @@
-using ExtendedNumerics;
-using System.Numerics;
+using System.Numerics;
+using ExtendedNumerics;
 
 namespace NCalc.Helpers;