More tests about struct

Author: Sébastien Geiser

CodingSeb.ExpressionEvaluator.Tests/CodingSeb.ExpressionEvaluator.Tests.csproj

@@ -13,14 +13,23 @@
     <PackageReference Include="Shouldly" Version="3.0.2" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Update="OthersTests.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Update="Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <Compile Update="TestsUtils\StructForTest3.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Update="TestsUtils\StructForTest1.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Update="TestsUtils\StructForTest4.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Update="TestsUtils\StructForTest2.cs">
       <SubType>Code</SubType>
     </Compile>

CodingSeb.ExpressionEvaluator.Tests/OthersTests.cs

@@ -0,0 +1,45 @@
+using NUnit.Framework;
+using Shouldly;
+
+namespace CodingSeb.ExpressionEvaluator.Tests
+{
+    public class OthersTests
+    {
+        [Test]
+        public void RealNestedStructAssignationToSeeHowItWorksScript0055()
+        {
+            // The real version of Script0055
+            StructForTest2 otherStruct;
+
+            otherStruct.AnOtherIntValue = 5;
+            otherStruct.nestedStruct = new StructForTest1()
+            {
+                myIntvalue = 8,
+                myStringValue = "Hey"
+            };
+
+            otherStruct.nestedStruct.myIntvalue = 9;
+
+            $"Result {otherStruct.nestedStruct.myStringValue} {otherStruct.nestedStruct.myIntvalue}, {otherStruct.AnOtherIntValue}".ShouldBe("Result Hey 9, 5");
+        }
+
+        [Test]
+        public void RealNestedStructByPropertyAssignationToSeeHowItWorks()
+        {
+            // Same sa Script0055 with properties
+            StructForTest4 otherStruct = new StructForTest4();
+
+            otherStruct.AnOtherIntValue = 5;
+            otherStruct.NestedStruct = new StructForTest3()
+            {
+                MyIntvalue = 8,
+                MyStringValue = "Hey"
+            };
+
+            // Do not compile 
+            //otherStruct.NestedStruct.MyIntvalue = 9;
+
+            $"Result {otherStruct.NestedStruct.MyStringValue} {otherStruct.NestedStruct.MyIntvalue}, {otherStruct.AnOtherIntValue}".ShouldBe("Result Hey 8, 5");
+        }
+    }
+}

CodingSeb.ExpressionEvaluator.Tests/Resources/Script0055.txt

@@ -1,11 +1,12 @@
 /* Script0055 */
 otherStruct.AnOtherIntValue = 5;
-otherStruct.struct1 = new StructForTest1()
+
+otherStruct.nestedStruct = new StructForTest1()
 { 
 	myIntvalue = 8, 
 	myStringValue = "Hey"
 };
 
-otherStruct.struct1.myIntvalue = 9;
+otherStruct.nestedStruct.myIntvalue = 9;
 
-return $"Result {otherStruct.struct1.myStringValue} {otherStruct.struct1.myIntvalue}, {otherStruct.AnOtherIntValue}";
+return $"Result {otherStruct.nestedStruct.myStringValue} {otherStruct.nestedStruct.myIntvalue}, {otherStruct.AnOtherIntValue}";

CodingSeb.ExpressionEvaluator.Tests/TestsUtils/StructForTest2.cs

@@ -3,6 +3,6 @@
     public struct StructForTest2
     {
         public int AnOtherIntValue;
-        public StructForTest1 struct1;
+        public StructForTest1 nestedStruct;
     }
 }

CodingSeb.ExpressionEvaluator.Tests/TestsUtils/StructForTest3.cs

@@ -0,0 +1,8 @@
+namespace CodingSeb.ExpressionEvaluator.Tests
+{
+    public struct StructForTest3
+    {
+        public int MyIntvalue { get; set; }
+        public string MyStringValue { get; set; }
+    }
+}

CodingSeb.ExpressionEvaluator.Tests/TestsUtils/StructForTest4.cs

@@ -0,0 +1,8 @@
+namespace CodingSeb.ExpressionEvaluator.Tests
+{
+    public struct StructForTest4
+    {
+        public int AnOtherIntValue { get; set; }
+        public StructForTest3 NestedStruct { get; set; }
+    }
+}

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -15,6 +15,7 @@
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
+using System.Reflection.Emit;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -1958,7 +1959,7 @@ private bool EvaluateVarOrFunc(string expr, string restOfExpression, Stack<objec
                                         bool isDynamic = (flag & BindingFlags.Instance) != 0 && obj is IDynamicMetaObjectProvider && obj is IDictionary<string, object>;
                                         IDictionary<string, object> dictionaryObject = obj as IDictionary<string, object>;
 
-                                        dynamic member = isDynamic ? null : objType?.GetProperty(varFuncName, flag);
+                                        MemberInfo member = isDynamic ? null : objType?.GetProperty(varFuncName, flag);
                                         dynamic varValue = null;
                                         bool assign = true;
 
@@ -1976,7 +1977,7 @@ private bool EvaluateVarOrFunc(string expr, string restOfExpression, Stack<objec
                                         }
                                         else
                                         {
-                                            varValue = member.GetValue(obj);
+                                            varValue = ((dynamic)member).GetValue(obj);
                                         }
 
                                         if (pushVarValue)
@@ -2021,9 +2022,22 @@ private bool EvaluateVarOrFunc(string expr, string restOfExpression, Stack<objec
                                             if (assign)
                                             {
                                                 if (isDynamic)
+                                                {
                                                     dictionaryObject[varFuncName] = varValue;
+                                                }
                                                 else
-                                                    member.SetValue(obj, varValue);
+                                                {
+                                                    //if (objType.IsValueType && member is FieldInfo fieldInfo)
+                                                    //{
+                                                    //    Action<object, object> setter = GetDelegateForStruct(objType, fieldInfo);
+                                                    //    ValueType valueType = obj as ValueType;
+                                                    //    setter(valueType, varValue);
+                                                    //}
+                                                    //else
+                                                    //{
+                                                        ((dynamic)member).SetValue(obj, varValue);
+                                                    //}
+                                                }
                                             }
                                         }
                                         else if (varFuncMatch.Groups["assignationOperator"].Success)