Struct with Properties works better

Author: Sébastien Geiser

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -1202,7 +1202,6 @@ void ExecuteBlocksStacks()
                                         if (isContinue)
                                         {
                                             isContinue = false;
-                                            continue;
                                         }
                                     }
                                     while (!isReturn && (bool)ManageJumpStatementsOrExpressionEval(keywordAttributes[0]));
@@ -1231,7 +1230,6 @@ void ExecuteBlocksStacks()
                                 if (isContinue)
                                 {
                                     isContinue = false;
-                                    continue;
                                 }
                             }
                         }
@@ -1289,7 +1287,6 @@ void forAction(int index)
                                     if (isContinue)
                                     {
                                         isContinue = false;
-                                        continue;
                                     }
                                 }
                             }
@@ -1981,14 +1978,16 @@ private bool EvaluateVarOrFunc(string expr, string restOfExpression, Stack<objec
                                         {
                                             varValue = ((dynamic)member).GetValue(obj);
 
-                                            if (varValue is ValueType valueType && member is FieldInfo fieldInfo)
+                                            if (varValue is ValueType)
                                             {
-                                                varValue = valueTypeNestingTrace = new ValueTypeNestingTrace
+                                                stack.Push(valueTypeNestingTrace = new ValueTypeNestingTrace
                                                 {
                                                     Container = valueTypeNestingTrace ?? obj,
-                                                    Field = fieldInfo,
-                                                    Value = valueType
-                                                };
+                                                    Member = member,
+                                                    Value = varValue
+                                                });
+
+                                                pushVarValue = false;
                                             }
                                         }
 
@@ -3121,22 +3120,21 @@ private class ValueTypeNestingTrace
         {
             public object Container { get; set; }
 
-            public FieldInfo Field { get; set; }
+            public MemberInfo Member { get; set; }
 
             public object Value { get; set; }
 
             public void AssignValue()
             {
                 if(Container is ValueTypeNestingTrace valueTypeNestingTrace)
                 {
-                    Field.SetValue(valueTypeNestingTrace.Value, Value);
+                    ((dynamic)Member).SetValue(valueTypeNestingTrace.Value, Value);
                     valueTypeNestingTrace.AssignValue();
                 }
                 else
                 {
-                    Field.SetValue(Container, Value);
+                    ((dynamic)Member).SetValue(Container, Value);
                 }
-
             }
         }