fix .Parse culture dependency (fixes #1178)

Andrin Meier · Andrin Meier · commit bfcaad00c685 · 2016-03-09T20:11:14.000+01:00
diff --git a/Rubberduck.Parsing/Preprocessing/DateLiteralExpression.cs b/Rubberduck.Parsing/Preprocessing/DateLiteralExpression.cs
@@ -82,8 +82,8 @@ public override IValue Evaluate()
                 // "If L and M are numbers and R is not present:"
                 if (L.dateValueNumber() != null && M.dateValueNumber() != null && R == null)
                 {
-                    var LNumber = int.Parse(L.GetText());
-                    var MNumber = int.Parse(M.GetText());
+                    var LNumber = int.Parse(L.GetText(), CultureInfo.InvariantCulture);
+                    var MNumber = int.Parse(M.GetText(), CultureInfo.InvariantCulture);
                     if (legalMonth(LNumber) && legalDay(LNumber, MNumber, CY))
                     {
                         month = LNumber;
@@ -116,9 +116,9 @@ public override IValue Evaluate()
                 // "If L, M, and R are numbers:"
                 else if (L.dateValueNumber() != null && M.dateValueNumber() != null && R != null && R.dateValueNumber() != null)
                 {
-                    var LNumber = int.Parse(L.GetText());
-                    var MNumber = int.Parse(M.GetText());
-                    var RNumber = int.Parse(R.GetText());
+                    var LNumber = int.Parse(L.GetText(), CultureInfo.InvariantCulture);
+                    var MNumber = int.Parse(M.GetText(), CultureInfo.InvariantCulture);
+                    var RNumber = int.Parse(R.GetText(), CultureInfo.InvariantCulture);
                     if (legalMonth(LNumber) && legalDay(LNumber, MNumber, yearFunc(RNumber)))
                     {
                         month = LNumber;
@@ -149,12 +149,12 @@ public override IValue Evaluate()
                     string monthName;
                     if (L.dateValueNumber() != null)
                     {
-                        N = int.Parse(L.GetText());
+                        N = int.Parse(L.GetText(), CultureInfo.InvariantCulture);
                         monthName = M.GetText();
                     }
                     else
                     {
-                        N = int.Parse(M.GetText());
+                        N = int.Parse(M.GetText(), CultureInfo.InvariantCulture);
                         monthName = L.GetText();
                     }
                     int monthNameNumber;
@@ -188,20 +188,20 @@ public override IValue Evaluate()
                     if (L.dateValueNumber() == null)
                     {
                         monthName = L.GetText();
-                        N1 = int.Parse(M.GetText());
-                        N2 = int.Parse(R.GetText());
+                        N1 = int.Parse(M.GetText(), CultureInfo.InvariantCulture);
+                        N2 = int.Parse(R.GetText(), CultureInfo.InvariantCulture);
                     }
                     else if (M.dateValueNumber() == null)
                     {
                         monthName = M.GetText();
-                        N1 = int.Parse(L.GetText());
-                        N2 = int.Parse(R.GetText());
+                        N1 = int.Parse(L.GetText(), CultureInfo.InvariantCulture);
+                        N2 = int.Parse(R.GetText(), CultureInfo.InvariantCulture);
                     }
                     else
                     {
                         monthName = R.GetText();
-                        N1 = int.Parse(L.GetText());
-                        N2 = int.Parse(M.GetText());
+                        N1 = int.Parse(L.GetText(), CultureInfo.InvariantCulture);
+                        N2 = int.Parse(M.GetText(), CultureInfo.InvariantCulture);
                     }
                     int monthNameNumber;
                     if (monthName.Length == 3)
@@ -240,22 +240,22 @@ public override IValue Evaluate()
             else
             {
                 var timeValue = dateOrTime.timeValue();
-                hours = int.Parse(timeValue.timeValuePart()[0].GetText());
+                hours = int.Parse(timeValue.timeValuePart()[0].GetText(), CultureInfo.InvariantCulture);
                 if (timeValue.timeValuePart().Count == 1)
                 {
                     mins = 0;
                 }
                 else
                 {
-                    mins = int.Parse(timeValue.timeValuePart()[1].GetText());
+                    mins = int.Parse(timeValue.timeValuePart()[1].GetText(), CultureInfo.InvariantCulture);
                 }
                 if (timeValue.timeValuePart().Count < 3)
                 {
                     seconds = 0;
                 }
                 else
                 {
-                    seconds = int.Parse(timeValue.timeValuePart()[2].GetText());
+                    seconds = int.Parse(timeValue.timeValuePart()[2].GetText(), CultureInfo.InvariantCulture);
                 }
                 var amPm = timeValue.AMPM();
                 if (amPm != null && (amPm.GetText().ToUpper() == "P" || amPm.GetText().ToUpper() == "PM") && hours >= 0 && hours <= 11)
diff --git a/Rubberduck.Parsing/Preprocessing/NumberLiteralExpression.cs b/Rubberduck.Parsing/Preprocessing/NumberLiteralExpression.cs
@@ -14,7 +14,7 @@ public NumberLiteralExpression(IExpression tokenText)
         public override IValue Evaluate()
         {
             string literal = _tokenText.Evaluate().AsString;
-            var number = decimal.Parse(literal.Replace("#", "").Replace("&", "").Replace("@", ""), NumberStyles.Float);
+            var number = decimal.Parse(literal.Replace("#", "").Replace("&", "").Replace("@", ""), NumberStyles.Float, CultureInfo.InvariantCulture);
             return new DecimalValue(number);
         }
     }
diff --git a/Rubberduck.Parsing/VBA/RubberduckParser.cs b/Rubberduck.Parsing/VBA/RubberduckParser.cs
@@ -17,6 +17,7 @@
 using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.Extensions;
 using Rubberduck.Parsing.Preprocessing;
+using System.Globalization;
 
 namespace Rubberduck.Parsing.VBA
 {
@@ -224,8 +225,8 @@ private void ParseInternal(VBComponent vbComponent, string code, CancellationTok
             };
 
             token.ThrowIfCancellationRequested();
-            
-            var preprocessor = new VBAPreprocessor(double.Parse(_vbe.Version));
+
+            var preprocessor = new VBAPreprocessor(double.Parse(_vbe.Version, CultureInfo.InvariantCulture));
             string preprocessedModuleBody;
             try
             {
diff --git a/RubberduckTests/Preprocessing/VBAPreprocessorVisitorTests.cs b/RubberduckTests/Preprocessing/VBAPreprocessorVisitorTests.cs
@@ -1088,7 +1088,7 @@ public void TestOperatorPrecedence()
         }
 
         [TestMethod]
-        public void TestLocale()
+        public void TestLocaleJapanese()
         {
             string code = @"
 #Const a = CDate(""2016/03/02"")
@@ -1104,6 +1104,17 @@ public void TestLocale()
             Assert.AreEqual(true, result.Item1.Get("d").AsBool);
         }
 
+        [TestMethod]
+        public void TestLocaleGerman()
+        {
+            string code = @"
+#Const a = 82.5235
+";
+            System.Threading.Thread.CurrentThread.CurrentCulture = new CultureInfo("de-de");
+            var result = Preprocess(code);
+            Assert.AreEqual(82.5235m, result.Item1.Get("a").AsDecimal);
+        }
+
         [TestMethod]
         public void TestPreprocessingLiveDeadCode()
         {

Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,8 @@ public override IValue Evaluate()`
`82`	`82`	`// "If L and M are numbers and R is not present:"`
`83`	`83`	`if (L.dateValueNumber() != null && M.dateValueNumber() != null && R == null)`
`84`	`84`	`{`
`85`		`- var LNumber = int.Parse(L.GetText());`
`86`		`- var MNumber = int.Parse(M.GetText());`
	`85`	`+ var LNumber = int.Parse(L.GetText(), CultureInfo.InvariantCulture);`
	`86`	`+ var MNumber = int.Parse(M.GetText(), CultureInfo.InvariantCulture);`
`87`	`87`	`if (legalMonth(LNumber) && legalDay(LNumber, MNumber, CY))`
`88`	`88`	`{`
`89`	`89`	`month = LNumber;`
`@@ -116,9 +116,9 @@ public override IValue Evaluate()`
`116`	`116`	`// "If L, M, and R are numbers:"`
`117`	`117`	`else if (L.dateValueNumber() != null && M.dateValueNumber() != null && R != null && R.dateValueNumber() != null)`
`118`	`118`	`{`
`119`		`- var LNumber = int.Parse(L.GetText());`
`120`		`- var MNumber = int.Parse(M.GetText());`
`121`		`- var RNumber = int.Parse(R.GetText());`
	`119`	`+ var LNumber = int.Parse(L.GetText(), CultureInfo.InvariantCulture);`
	`120`	`+ var MNumber = int.Parse(M.GetText(), CultureInfo.InvariantCulture);`
	`121`	`+ var RNumber = int.Parse(R.GetText(), CultureInfo.InvariantCulture);`
`122`	`122`	`if (legalMonth(LNumber) && legalDay(LNumber, MNumber, yearFunc(RNumber)))`
`123`	`123`	`{`
`124`	`124`	`month = LNumber;`
`@@ -149,12 +149,12 @@ public override IValue Evaluate()`
`149`	`149`	`string monthName;`
`150`	`150`	`if (L.dateValueNumber() != null)`
`151`	`151`	`{`
`152`		`- N = int.Parse(L.GetText());`
	`152`	`+ N = int.Parse(L.GetText(), CultureInfo.InvariantCulture);`
`153`	`153`	`monthName = M.GetText();`
`154`	`154`	`}`
`155`	`155`	`else`
`156`	`156`	`{`
`157`		`- N = int.Parse(M.GetText());`
	`157`	`+ N = int.Parse(M.GetText(), CultureInfo.InvariantCulture);`
`158`	`158`	`monthName = L.GetText();`
`159`	`159`	`}`
`160`	`160`	`int monthNameNumber;`
`@@ -188,20 +188,20 @@ public override IValue Evaluate()`
`188`	`188`	`if (L.dateValueNumber() == null)`
`189`	`189`	`{`
`190`	`190`	`monthName = L.GetText();`
`191`		`- N1 = int.Parse(M.GetText());`
`192`		`- N2 = int.Parse(R.GetText());`
	`191`	`+ N1 = int.Parse(M.GetText(), CultureInfo.InvariantCulture);`
	`192`	`+ N2 = int.Parse(R.GetText(), CultureInfo.InvariantCulture);`
`193`	`193`	`}`
`194`	`194`	`else if (M.dateValueNumber() == null)`
`195`	`195`	`{`
`196`	`196`	`monthName = M.GetText();`
`197`		`- N1 = int.Parse(L.GetText());`
`198`		`- N2 = int.Parse(R.GetText());`
	`197`	`+ N1 = int.Parse(L.GetText(), CultureInfo.InvariantCulture);`
	`198`	`+ N2 = int.Parse(R.GetText(), CultureInfo.InvariantCulture);`
`199`	`199`	`}`
`200`	`200`	`else`
`201`	`201`	`{`
`202`	`202`	`monthName = R.GetText();`
`203`		`- N1 = int.Parse(L.GetText());`
`204`		`- N2 = int.Parse(M.GetText());`
	`203`	`+ N1 = int.Parse(L.GetText(), CultureInfo.InvariantCulture);`
	`204`	`+ N2 = int.Parse(M.GetText(), CultureInfo.InvariantCulture);`
`205`	`205`	`}`
`206`	`206`	`int monthNameNumber;`
`207`	`207`	`if (monthName.Length == 3)`
`@@ -240,22 +240,22 @@ public override IValue Evaluate()`
`240`	`240`	`else`
`241`	`241`	`{`
`242`	`242`	`var timeValue = dateOrTime.timeValue();`
`243`		`- hours = int.Parse(timeValue.timeValuePart()[0].GetText());`
	`243`	`+ hours = int.Parse(timeValue.timeValuePart()[0].GetText(), CultureInfo.InvariantCulture);`
`244`	`244`	`if (timeValue.timeValuePart().Count == 1)`
`245`	`245`	`{`
`246`	`246`	`mins = 0;`
`247`	`247`	`}`
`248`	`248`	`else`
`249`	`249`	`{`
`250`		`- mins = int.Parse(timeValue.timeValuePart()[1].GetText());`
	`250`	`+ mins = int.Parse(timeValue.timeValuePart()[1].GetText(), CultureInfo.InvariantCulture);`
`251`	`251`	`}`
`252`	`252`	`if (timeValue.timeValuePart().Count < 3)`
`253`	`253`	`{`
`254`	`254`	`seconds = 0;`
`255`	`255`	`}`
`256`	`256`	`else`
`257`	`257`	`{`
`258`		`- seconds = int.Parse(timeValue.timeValuePart()[2].GetText());`
	`258`	`+ seconds = int.Parse(timeValue.timeValuePart()[2].GetText(), CultureInfo.InvariantCulture);`
`259`	`259`	`}`
`260`	`260`	`var amPm = timeValue.AMPM();`
`261`	`261`	`if (amPm != null && (amPm.GetText().ToUpper() == "P" \|\| amPm.GetText().ToUpper() == "PM") && hours >= 0 && hours <= 11)`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public NumberLiteralExpression(IExpression tokenText)`
`14`	`14`	`public override IValue Evaluate()`
`15`	`15`	`{`
`16`	`16`	`string literal = _tokenText.Evaluate().AsString;`
`17`		`- var number = decimal.Parse(literal.Replace("#", "").Replace("&", "").Replace("@", ""), NumberStyles.Float);`
	`17`	`+ var number = decimal.Parse(literal.Replace("#", "").Replace("&", "").Replace("@", ""), NumberStyles.Float, CultureInfo.InvariantCulture);`
`18`	`18`	`return new DecimalValue(number);`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1088,7 +1088,7 @@ public void TestOperatorPrecedence()`
`1088`	`1088`	`}`
`1089`	`1089`
`1090`	`1090`	`[TestMethod]`
`1091`		`- public void TestLocale()`
	`1091`	`+ public void TestLocaleJapanese()`
`1092`	`1092`	`{`
`1093`	`1093`	`string code = @"`
`1094`	`1094`	`#Const a = CDate(""2016/03/02"")`
`@@ -1104,6 +1104,17 @@ public void TestLocale()`
`1104`	`1104`	`Assert.AreEqual(true, result.Item1.Get("d").AsBool);`
`1105`	`1105`	`}`
`1106`	`1106`
	`1107`	`+ [TestMethod]`
	`1108`	`+ public void TestLocaleGerman()`
	`1109`	`+ {`
	`1110`	`+ string code = @"`
	`1111`	`+#Const a = 82.5235`
	`1112`	`+";`
	`1113`	`+ System.Threading.Thread.CurrentThread.CurrentCulture = new CultureInfo("de-de");`
	`1114`	`+ var result = Preprocess(code);`
	`1115`	`+ Assert.AreEqual(82.5235m, result.Item1.Get("a").AsDecimal);`
	`1116`	`+ }`
	`1117`	`+`
`1107`	`1118`	`[TestMethod]`
`1108`	`1119`	`public void TestPreprocessingLiveDeadCode()`
`1109`	`1120`	`{`