Skip to content

Commit 365551a

Browse files
codingsebcodingseb
authored
Merge pull request #132 from codingseb/dev
Dev
2 parents 9e659e3 + 7ee349b commit 365551a

File tree

5 files changed

+80
-15
lines changed

5 files changed

+80
-15
lines changed

‎CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorScriptEvaluateTests.cs

-1
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,6 @@ public static IEnumerable<TestCaseData> TestCasesForScriptEvaluateTests
620620
//.SetCategory("=")
621621
//.Returns();
622622

623-
624623
#endregion
625624

626625
#region Array content assignation

‎CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs

+27-4
Original file line numberDiff line numberDiff line change
@@ -990,7 +990,31 @@ public void TypeTesting(string expression, Type type)
990990
#region Bugs correction
991991

992992
[TestCase("new DateTime(1985,9,11).ToString(\"dd.MM.yyyy\")", ExpectedResult = "11.09.1985", Category = "Complex expression,Static method,Instance method,Lambda function,Cast")]
993-
993+
994+
[TestCase("(int)3.6", ExpectedResult = (int)3.6, Category = "Complex expression,Cast,double to int,#130")]
995+
[TestCase("(int)-3.6", ExpectedResult = (int)-3.6, Category = "Complex expression,Cast,double to int,#130")]
996+
[TestCase("(uint)3.6", ExpectedResult = (uint)3.6, Category = "Complex expression,Cast,double to uint,#130")]
997+
[TestCase("(long)3.6", ExpectedResult = (long)3.6, Category = "Complex expression,Cast,double to long,#130")]
998+
[TestCase("(short)3.6", ExpectedResult = (short)3.6, Category = "Complex expression,Cast,double to short,#130")]
999+
1000+
[TestCase("(int)3.6d", ExpectedResult = (int)3.6d, Category = "Complex expression,Cast,double to int,#130")]
1001+
[TestCase("(int)-3.6d", ExpectedResult = (int)-3.6d, Category = "Complex expression,Cast,double to int,#130")]
1002+
[TestCase("(uint)3.6d", ExpectedResult = (uint)3.6d, Category = "Complex expression,Cast,double to uint,#130")]
1003+
[TestCase("(long)3.6d", ExpectedResult = (long)3.6d, Category = "Complex expression,Cast,double to long,#130")]
1004+
[TestCase("(short)3.6d", ExpectedResult = (short)3.6d, Category = "Complex expression,Cast,double to short,#130")]
1005+
1006+
[TestCase("(int)3.6f", ExpectedResult = (int)3.6f, Category = "Complex expression,Cast,float to int,#130")]
1007+
[TestCase("(int)-3.6f", ExpectedResult = (int)-3.6f, Category = "Complex expression,Cast,float to int,#130")]
1008+
[TestCase("(uint)3.6f", ExpectedResult = (uint)3.6f, Category = "Complex expression,Cast,float to uint,#130")]
1009+
[TestCase("(long)3.6f", ExpectedResult = (long)3.6f, Category = "Complex expression,Cast,float to long,#130")]
1010+
[TestCase("(short)3.6f", ExpectedResult = (short)3.6f, Category = "Complex expression,Cast,float to short,#130")]
1011+
1012+
[TestCase("(int)3.6m", ExpectedResult = (int)3.6m, Category = "Complex expression,Cast,decimal to int,#130")]
1013+
[TestCase("(int)-3.6m", ExpectedResult = (int)-3.6m, Category = "Complex expression,Cast,decimal to int,#130")]
1014+
[TestCase("(uint)3.6m", ExpectedResult = (uint)3.6m, Category = "Complex expression,Cast,decimal to uint,#130")]
1015+
[TestCase("(long)3.6m", ExpectedResult = (long)3.6m, Category = "Complex expression,Cast,decimal to long,#130")]
1016+
[TestCase("(short)3.6m", ExpectedResult = (short)3.6m, Category = "Complex expression,Cast,decimal to short,#130")]
1017+
9941018
#endregion
9951019

9961020
#endregion
@@ -1592,7 +1616,7 @@ public void ExceptionThrowingEvaluation(ExpressionEvaluator evaluator, string ex
15921616
#region Bug corrections
15931617

15941618
/// <summary>
1595-
/// To correct #127 Evaluating "new DateTime(2022,1,20)" does not work
1619+
/// To correct #127 Evaluating "new DateTime(2022,1,20)" does not work
15961620
/// unless OptionInlineNamespacesEvaluationActive is turned on
15971621
/// </summary>
15981622
[Test]
@@ -1615,7 +1639,7 @@ public void Evaluate_NewDateTime_When_OptionInlineNamespacesEvaluationActive_is_
16151639
}
16161640

16171641
/// <summary>
1618-
/// To correct #127 Evaluating "new DateTime(2022,1,20)" does not work
1642+
/// To correct #127 Evaluating "new DateTime(2022,1,20)" does not work
16191643
/// unless OptionInlineNamespacesEvaluationActive is turned on
16201644
/// </summary>
16211645
[Test]
@@ -1637,7 +1661,6 @@ public void Evaluate_NewDateTime_When_OptionInlineNamespacesEvaluationActive_is_
16371661
dateTime.Value.Day.ShouldBe(20);
16381662
}
16391663

1640-
16411664
/// <summary>
16421665
/// To correct #81 Exception is assigned to variable
16431666
/// With simple variable

‎CodingSeb.ExpressionEvaluator.Tests/TestsUtils/ClassStructContainer.cs

-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@ public class ClassStructContainer
88
public StructForTest1 NestedStructProperty { get; set; }
99
}
1010
}
11-

‎CodingSeb.ExpressionEvaluator/CodingSeb.ExpressionEvaluator.csproj

+4-7
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<Product>CodingSeb.ExpressionEvaluator</Product>
66
<Description>A Simple Math and Pseudo C# Expression Evaluator in One C# File. Can also execute small C# like scripts</Description>
77
<Copyright>Copyright © Coding Seb 2017</Copyright>
8-
<Version>1.4.36.0</Version>
9-
<AssemblyVersion>1.4.36.0</AssemblyVersion>
10-
<FileVersion>1.4.36.0</FileVersion>
8+
<Version>1.4.37.0</Version>
9+
<AssemblyVersion>1.4.37.0</AssemblyVersion>
10+
<FileVersion>1.4.37.0</FileVersion>
1111
<OutputPath>bin\$(Configuration)\</OutputPath>
1212
<Authors>Coding Seb</Authors>
1313
<PackageId>CodingSeb.ExpressionEvaluator</PackageId>
@@ -19,10 +19,7 @@
1919
<PackageIconUrl>https://github.com/codingseb/ExpressionEvaluator/blob/master/Icon.png?raw=true</PackageIconUrl>
2020
<PackageIcon>Icon.png</PackageIcon>
2121
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
22-
<PackageReleaseNotes>
23-
* Correction of creation of instance with new keyword when OptionInlineNamespacesEvaluationActive is set to false
24-
* Add the option OptionVariablesPersistenceCustomComparer to reuse variables outside of the evaluator (In this case OptionCaseSensitiveEvaluationActive is not used anymore for variables)
25-
</PackageReleaseNotes>
22+
<PackageReleaseNotes>* Correction of the explicit cast between primitive types and rounding numbers before (int)3.6 -&gt; 4 now (int)3.6 -&gt; 3</PackageReleaseNotes>
2623
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
2724
<RepositoryUrl>https://github.com/codingseb/ExpressionEvaluator</RepositoryUrl>
2825
<GenerateDocumentationFile>true</GenerateDocumentationFile>

‎CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

+49-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/******************************************************************************************************
22
Title : ExpressionEvaluator (https://github.com/codingseb/ExpressionEvaluator)
3-
Version : 1.4.36.0
3+
Version : 1.4.37.0
44
(if last digit (the forth) is not a zero, the version is an intermediate version and can be unstable)
55
66
Author : Coding Seb
@@ -14,6 +14,7 @@
1414
using System.Dynamic;
1515
using System.Globalization;
1616
using System.Linq;
17+
using System.Linq.Expressions;
1718
using System.Reflection;
1819
using System.Runtime.CompilerServices;
1920
using System.Runtime.InteropServices;
@@ -916,7 +917,7 @@ public IDictionary<string, object> Variables
916917
}
917918
else
918919
{
919-
variables = value == null ? new Dictionary<string, object>(StringComparerForCasing) : new Dictionary<string, object>(value, StringComparerForCasing);
920+
variables = value == null ? new Dictionary<string, object>(StringComparerForCasing) : new Dictionary<string, object>(value, StringComparerForCasing);
920921
}
921922
}
922923
}
@@ -4147,9 +4148,55 @@ protected static object ChangeType(object value, Type conversionType)
41474148
{
41484149
return Enum.ToObject(conversionType, value);
41494150
}
4151+
4152+
if (value.GetType().IsPrimitive && conversionType.IsPrimitive)
4153+
{
4154+
return primitiveExplicitCastMethodInfo
4155+
.MakeGenericMethod(conversionType)
4156+
.Invoke(null, new object[] {value});
4157+
}
4158+
4159+
if (DynamicCast(value, conversionType, out object ret))
4160+
{
4161+
return ret;
4162+
}
4163+
41504164
return Convert.ChangeType(value, conversionType);
41514165
}
41524166

4167+
protected static MethodInfo primitiveExplicitCastMethodInfo = typeof(ExpressionEvaluator).GetMethod(nameof(PrimitiveExplicitCast), BindingFlags.Static | BindingFlags.NonPublic);
4168+
4169+
protected static object PrimitiveExplicitCast<T>(dynamic value)
4170+
{
4171+
return (T)value;
4172+
}
4173+
4174+
protected static bool DynamicCast(object source, Type destType, out object result)
4175+
{
4176+
Type srcType = source.GetType();
4177+
if (srcType == destType) { result = source; return true; }
4178+
result = null;
4179+
4180+
BindingFlags bindingFlags = BindingFlags.Static | BindingFlags.Public | BindingFlags.FlattenHierarchy;
4181+
MethodInfo castOperator = destType.GetMethods(bindingFlags)
4182+
.Union(srcType.GetMethods(bindingFlags))
4183+
.Where(methodInfo => methodInfo.Name == "op_Explicit" || methodInfo.Name == "op_Implicit")
4184+
.Where(methodInfo =>
4185+
{
4186+
var pars = methodInfo.GetParameters();
4187+
return pars.Length == 1 && pars[0].ParameterType == srcType;
4188+
})
4189+
.Where(mi => mi.ReturnType == destType)
4190+
.FirstOrDefault();
4191+
4192+
if (castOperator != null)
4193+
result = castOperator.Invoke(null, new object[] { source });
4194+
else
4195+
return false;
4196+
4197+
return true;
4198+
}
4199+
41534200
protected virtual string GetCodeUntilEndOfString(string subExpr, Match stringBeginningMatch)
41544201
{
41554202
StringBuilder stringBuilder = new StringBuilder();

0 commit comments

Comments
 (0)