Correction of Int32 in caseinsensitive + Simplify primarytypes detection

Author: codingseb

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs

@@ -2474,6 +2474,15 @@ ExpressionEvaluator evaluatorForMethodArgs()
                     .Returns(typeof(List<Regex>))
                     .SetCategory("Bug resolution");
 
+                yield return new TestCaseData(new ExpressionEvaluator()
+                    {
+                        OptionCaseSensitiveEvaluationActive = false
+                    }
+                    , "Int32.Parse(\"2\")"
+                    , null)
+                    .Returns(2)
+                    .SetCategory("Bug resolution");
+
                 #region For bug #65
                 var Persons = new List<Person2>() { new Person2() { Code = "QT00010", Name = "Pedrito", Number = 11.11m },
                     new Person2() { Code = "QT00011", Name = "Pablito", Number = 12.11m }};

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -29,8 +29,6 @@ public partial class ExpressionEvaluator
     {
         #region Regex declarations
 
-        protected const string primaryTypesRegexPattern = @"(?<=^|[^\p{L}_])(?<primaryType>object|string|bool[?]?|byte[?]?|char[?]?|decimal[?]?|double[?]?|short[?]?|int[?]?|long[?]?|sbyte[?]?|float[?]?|ushort[?]?|uint[?]?|ulong[?]?|void)(?=[^a-zA-Z_]|$)";
-
         protected static readonly Regex varOrFunctionRegEx = new Regex(@"^((?<sign>[+-])|(?<prefixOperator>[+][+]|--)|(?<varKeyword>var)\s+|(?<dynamicKeyword>dynamic)\s+|((?<nullConditional>[?])?(?<inObject>\.))?)(?<name>[\p{L}_](?>[\p{L}_0-9]*))(?>\s*)((?<assignationOperator>(?<assignmentPrefix>[+\-*/%&|^]|<<|>>|\?\?)?=(?![=>]))|(?<postfixOperator>([+][+]|--)(?![\p{L}_0-9]))|((?<isgeneric>[<](?>([\p{L}_](?>[\p{L}_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])?";
@@ -3929,6 +3927,11 @@ protected virtual Type GetTypeByFriendlyName(string typeName, string genericType
                 typeName = typeName.Replace(" ", "").Replace("\t", "").Replace("\r", "").Replace("\n", "");
                 genericTypes = genericTypes.Replace(" ", "").Replace("\t", "").Replace("\r", "").Replace("\n", "");
 
+                if (primaryTypesDict.ContainsKey(OptionCaseSensitiveEvaluationActive ? typeName : typeName.ToLower()))
+                {
+                    result = primaryTypesDict[OptionCaseSensitiveEvaluationActive ? typeName : typeName.ToLower()];
+                }
+
                 if (CacheTypesResolutions && (TypesResolutionCaching?.ContainsKey(typeName + genericTypes) ?? false))
                 {
                     result = TypesResolutionCaching[typeName + genericTypes];
@@ -3946,14 +3949,6 @@ protected virtual Type GetTypeByFriendlyName(string typeName, string genericType
                     result = Type.GetType(typeName + formatedGenericTypes, false, !OptionCaseSensitiveEvaluationActive);
                 }
 
-                if (result == null)
-                {
-                    typeName = Regex.Replace(typeName, primaryTypesRegexPattern,
-                        (Match match) => primaryTypesDict[OptionCaseSensitiveEvaluationActive ? match.Value : match.Value.ToLower()].ToString(), optionCaseSensitiveEvaluationActive ? RegexOptions.None : RegexOptions.IgnoreCase);
-
-                    result = Type.GetType(typeName, false, !OptionCaseSensitiveEvaluationActive);
-                }
-
                 if (result == null)
                 {
                     result = Types.ToList().Find(type => type.Name.Equals(typeName, StringComparisonForCasing) || type.FullName.StartsWith(typeName + ","));

TryWindow/MainWindow.xaml

@@ -28,6 +28,9 @@
             <WrapPanel>
                 <CheckBox x:Name="NeedSemicolonAtTheEndCheckBox"
                           Content="Need semicolon [;] At the end" />
+                <CheckBox x:Name="CaseSensitiveCheckBox"
+                          Content="Case sensitive"
+                          IsChecked="True"/>
             </WrapPanel>
 
             <Button x:Name="CalculateButton" Content="_Execute" IsDefault="True" Click="CalculateButton_Click" />

TryWindow/MainWindow.xaml.cs

@@ -39,6 +39,7 @@ private async void CalculateButton_Click(object sender, RoutedEventArgs e)
             ExpressionEvaluator evaluator = new ExpressionEvaluator()
             {
                 OptionScriptNeedSemicolonAtTheEndOfLastExpression = NeedSemicolonAtTheEndCheckBox.IsChecked.GetValueOrDefault(),
+                OptionCaseSensitiveEvaluationActive = CaseSensitiveCheckBox.IsChecked.GetValueOrDefault()
             };
 
             if (UseCachesCheckbox.IsChecked ?? false)