Typed variable in progress

Author: Sébastien Geiser

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorScriptEvaluateTests.cs

@@ -1293,6 +1293,14 @@ public static IEnumerable<TestCaseData> TestCasesForScriptEvaluateTests
                     .SetCategory("=")
                     .Returns("0,1,2,3,4,");
 
+                yield return new TestCaseData(Resources.Script0067, null, null, null, null)
+                    .SetCategory("Script")
+                    .SetCategory("primaryTyped variable")
+                    .SetCategory("List")
+                    .SetCategory("int")
+                    .SetCategory("=")
+                    .Returns("[1,2,3,4]");
+
                 #endregion
 
                 #region More complex script

CodingSeb.ExpressionEvaluator.Tests/Resources.Designer.cs

@@ -316,4 +316,7 @@
   <data name="Script0066" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>resources\script0066.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
+  <data name="Script0067" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>resources\script0067.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
 </root>

CodingSeb.ExpressionEvaluator.Tests/Resources.resx

@@ -0,0 +1,2 @@
+/* Script0067 */
+List<int> myList = new List<int>{1, 2, 3, 4}.Json;

CodingSeb.ExpressionEvaluator.Tests/Resources/Script0067.txt

@@ -1,6 +1,6 @@
 /******************************************************************************************************
     Title : ExpressionEvaluator (https://github.com/codingseb/ExpressionEvaluator)
-    Version : 1.4.2.1 
+    Version : 1.4.2.2 
     (if last digit (the forth) is not a zero, the version is an intermediate version and can be unstable)
 
     Author : Coding Seb
@@ -33,7 +33,7 @@ public partial class ExpressionEvaluator
         protected const string primaryTypesGroupPattern = "(?<primaryType>object|string|bool[?]?|byte[?]?|char[?]?|decimal[?]?|double[?]?|short[?]?|int[?]?|long[?]?|sbyte[?]?|float[?]?|ushort[?]?|uint[?]?|ulong[?]?|void)";
         protected const string primaryTypesRegexPattern = "(?<=^|[^" + diactiticsKeywordsRegexPattern + "])" + primaryTypesGroupPattern + "(?=[^a-zA-Z_]|$)";
 
-        protected static readonly Regex varOrFunctionRegEx = new Regex($@"^((?<sign>[+-])|(?<prefixOperator>[+][+]|--)|(?<varKeyword>var)\s+|(?<dynamicKeyword>dynamic)\s+|{primaryTypesGroupPattern}\s+|(?<inObject>(?<nullConditional>[?])?\.)?)(?<name>[{ diactiticsKeywordsRegexPattern }](?>[{ diactiticsKeywordsRegexPattern }0-9]*))(?>\s*)((?<assignationOperator>(?<assignmentPrefix>[+\-*/%&|^]|<<|>>)?=(?![=>]))|(?<postfixOperator>([+][+]|--)(?![{ diactiticsKeywordsRegexPattern}0-9]))|((?<isgeneric>[<](?>([{ diactiticsKeywordsRegexPattern }](?>[{ diactiticsKeywordsRegexPattern }0-9]*)|(?>\s+)|[,\.])+|(?<gentag>[<])|(?<-gentag>[>]))*(?(gentag)(?!))[>])?(?<isfunction>[(])?))", RegexOptions.IgnoreCase | RegexOptions.Compiled);
+        protected static readonly Regex varOrFunctionRegEx = new Regex($@"^((?<sign>[+-])|(?<prefixOperator>[+][+]|--)|(?<varKeyword>var)\s+|(?<dynamicKeyword>dynamic)\s+|(?<inObject>(?<nullConditional>[?])?\.)?)(?<name>[{ diactiticsKeywordsRegexPattern }](?>[{ diactiticsKeywordsRegexPattern }0-9]*))(?>\s*)((?<assignationOperator>(?<assignmentPrefix>[+\-*/%&|^]|<<|>>)?=(?![=>]))|(?<postfixOperator>([+][+]|--)(?![{ diactiticsKeywordsRegexPattern}0-9]))|((?<isgeneric>[<](?>([{ diactiticsKeywordsRegexPattern }](?>[{ diactiticsKeywordsRegexPattern }0-9]*)|(?>\s+)|[,\.])+|(?<gentag>[<])|(?<-gentag>[>]))*(?(gentag)(?!))[>])?(?<isfunction>[(])?))", RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
         protected const string numberRegexOrigPattern = @"^(?<sign>[+-])?([0-9][0-9_{1}]*[0-9]|\d)(?<hasdecimal>{0}?([0-9][0-9_]*[0-9]|\d)(e[+-]?([0-9][0-9_]*[0-9]|\d))?)?(?<type>ul|[fdulm])?";
         protected string numberRegexPattern = null;
@@ -2117,6 +2117,19 @@ protected virtual bool EvaluateVarOrFunc(string expression, Stack<object> stack,
                         else if ((Variables.TryGetValue(varFuncName, out object cusVarValueToPush) || varFuncMatch.Groups["assignationOperator"].Success)
                             && (cusVarValueToPush == null || !TypesToBlock.Contains(cusVarValueToPush.GetType())))
                         {
+                            StronglyTypedVariable stronglyTypedVariable;
+
+                            if (stack.Count == 1 && stack.Peek() is ClassOrEnumType classOrEnum && varFuncMatch.Groups["assignationOperator"].Success)
+                            {
+                                stack.Pop();
+
+                                stronglyTypedVariable = new StronglyTypedVariable
+                                {
+                                    Type = classOrEnum.Type,
+                                    Value = !varFuncMatch.Groups["assignationOperator"].Success && classOrEnum.Type.IsValueType ? Activator.CreateInstance(classOrEnum.Type) : null,
+                                };
+                            }
+
                             stack.Push(cusVarValueToPush);
 
                             if (OptionVariableAssignationActive)
@@ -3599,6 +3612,13 @@ public partial class ClassOrEnumType
         public Type Type { get; set; }
     }
 
+    public partial class StronglyTypedVariable
+    {
+        public Type Type { get; set; }
+
+        public object Value { get; set; }
+    }
+
     public partial class ExpressionEvaluatorSyntaxErrorException : Exception
     {
         public ExpressionEvaluatorSyntaxErrorException() : base()