Thousand separator and public CultureInfoForNumberParsing property to test

Author: Sébastien Geiser

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -1,6 +1,6 @@
 /******************************************************************************************************
     Title : ExpressionEvaluator (https://github.com/codingseb/ExpressionEvaluator)
-    Version : 1.3.3.3 
+    Version : 1.3.3.4 
     (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 class ExpressionEvaluator
 
         private static readonly Regex varOrFunctionRegEx = new Regex($@"^((?<sign>[+-])|(?<prefixOperator>[+][+]|--)|(?<inObject>(?<nullConditional>[?])?\.)?)(?<name>[{ diactiticsKeywordsRegexPattern }][{ diactiticsKeywordsRegexPattern }0-9]*)\s*((?<assignationOperator>(?<assignmentPrefix>[+\-*/%&|^]|<<|>>)?=(?![=>]))|(?<postfixOperator>([+][+]|--)(?![{ diactiticsKeywordsRegexPattern}0-9]))|((?<isgeneric>[<](?>[^<>]+|(?<gentag>[<])|(?<-gentag>[>]))*(?(gentag)(?!))[>])?(?<isfunction>[(])?))", RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
-        private string numberRegexPattern = @"^(?<sign>[+-])?([0-9][0-9_]*[0-9]|\d)(?<hasdecimal>{0}?([0-9][0-9_]*[0-9]|\d)(e[+-]?([0-9][0-9_]*[0-9]|\d))?)?(?<type>ul|[fdulm])?";
+        private string numberRegexPattern = @"^(?<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])?";
         private Regex numberRegex = null;
 
         private static readonly Regex otherBasesNumberRegex = new Regex(@"^(?<sign>[+-])?(?<value>0(?<type>x)([0-9a-f][0-9a-f_]*[0-9a-f]|[0-9a-f])|0(?<type>b)([01][01_]*[01]|[01]))", RegexOptions.IgnoreCase);
@@ -533,12 +533,36 @@ private StringComparer StringComparerForCasing
         }
 
         private CultureInfo cultureInfoForNumberParsing = CultureInfo.InvariantCulture.Clone() as CultureInfo;
+
         private string optionNumberParsingDecimalSeparator = ".";
 
+        /// <summary>
+        /// The culture used to evaluate numbers
+        /// Synchronized with OptionNumberParsingDecimalSeparator and OptionNumberParsingThousandSeparator.
+        /// So always set a full CultureInfo object and do not change NumberFormat.NumberDecimalSeparator and NumberFormat.NumberGroupSeparator properties directly.
+        /// Warning if using comma in separators change also OptionFunctionArgumentsSeparator and OptionInitializersSeparator otherwise it will create conflicts
+        /// </summary>
+        public CultureInfo CultureInfoForNumberParsing
+        {
+            get
+            {
+                return cultureInfoForNumberParsing;
+            }
+
+            set
+            {
+                cultureInfoForNumberParsing = value;
+                
+                OptionNumberParsingDecimalSeparator = cultureInfoForNumberParsing.NumberFormat.NumberDecimalSeparator;
+                OptionNumberParsingThousandSeparator = cultureInfoForNumberParsing.NumberFormat.NumberGroupSeparator;
+            }
+        }
+
         /// <summary>
         /// Allow to change the decimal separator of numbers when parsing expressions.
         /// By default "."
-        /// Warning if using comma change also OptionFunctionArgumentsSeparator and OptionInitializersSeparator otherwise it will create conflicts
+        /// Warning if using comma change also OptionFunctionArgumentsSeparator and OptionInitializersSeparator otherwise it will create conflicts.
+        /// Modify CultureInfoForNumberParsing.
         /// </summary>
         public string OptionNumberParsingDecimalSeparator
         {
@@ -548,9 +572,32 @@ public string OptionNumberParsingDecimalSeparator
             set
             {
                 optionNumberParsingDecimalSeparator = value;
-                cultureInfoForNumberParsing.NumberFormat.NumberDecimalSeparator = value;
+                CultureInfoForNumberParsing.NumberFormat.NumberDecimalSeparator = value;
+
+                numberRegex = new Regex(string.Format(numberRegexPattern, Regex.Escape(optionNumberParsingDecimalSeparator), Regex.Escape(optionNumberParsingThousandSeparator)), RegexOptions.IgnoreCase);
+            }
+        }
+
+        /// <summary>
+        /// Allow to change the thousand separator of numbers when parsing expressions.
+        /// By default string.Empty
+        /// Warning if using comma change also OptionFunctionArgumentsSeparator and OptionInitializersSeparator otherwise it will create conflicts.
+        /// Modify CultureInfoForNumberParsing.
+        /// </summary>
+        public string OptionNumberParsingThousandSeparator
+        {
+            get
+            {
+                return optionNumberParsingThousandSeparator;
+            }
+
+            set
+            {
+                optionNumberParsingThousandSeparator = value;
+                CultureInfoForNumberParsing.NumberFormat.NumberGroupSeparator = value;
+
+                numberRegex = new Regex(string.Format(numberRegexPattern, Regex.Escape(optionNumberParsingDecimalSeparator), Regex.Escape(optionNumberParsingThousandSeparator)), RegexOptions.IgnoreCase);
 
-                numberRegex = new Regex(string.Format(numberRegexPattern, Regex.Escape(optionNumberParsingDecimalSeparator)), RegexOptions.IgnoreCase);
             }
         }
 
@@ -786,7 +833,7 @@ public ExpressionEvaluator()
             Assemblies.AddRange(AppDomain.CurrentDomain.GetAssemblies());
             instanceCreationWithNewKeywordRegex = new Regex(InstanceCreationWithNewKeywordRegexPattern);
             numberRegex = new Regex(string.Format(numberRegexPattern, @"\."), RegexOptions.IgnoreCase);
-            cultureInfoForNumberParsing.NumberFormat.NumberDecimalSeparator = ".";
+            CultureInfoForNumberParsing.NumberFormat.NumberDecimalSeparator = ".";
             castRegex = new Regex(CastRegexPattern);
         }
 
@@ -804,6 +851,7 @@ public ExpressionEvaluator(Dictionary<string, object> variables) : this()
         #region Main evaluate methods (Expressions and scripts ==> public)
 
         private bool inScript = false;
+        private string optionNumberParsingThousandSeparator;
 
         /// <summary>
         /// Evaluate a script (multiple expressions separated by semicolon)
@@ -1462,18 +1510,18 @@ private bool EvaluateNumber(string restOfExpression, Stack<object> stack, ref in
 
                     if (numberSuffixToParse.TryGetValue(type, out Func<string, CultureInfo, object> parseFunc))
                     {
-                        stack.Push(parseFunc(numberNoType, cultureInfoForNumberParsing));
+                        stack.Push(parseFunc(numberNoType, CultureInfoForNumberParsing));
                     }
                 }
                 else
                 {
                     if (numberMatch.Groups["hasdecimal"].Success)
                     {
-                        stack.Push(double.Parse(numberMatch.Value.Replace("_",""), NumberStyles.Any, cultureInfoForNumberParsing));
+                        stack.Push(double.Parse(numberMatch.Value.Replace("_",""), NumberStyles.Any, CultureInfoForNumberParsing));
                     }
                     else
                     {
-                        stack.Push(int.Parse(numberMatch.Value.Replace("_", ""), NumberStyles.Any, cultureInfoForNumberParsing));
+                        stack.Push(int.Parse(numberMatch.Value.Replace("_", ""), NumberStyles.Any, CultureInfoForNumberParsing));
                     }
                 }