.NET: Fix compilation

epam · Sep 20, 2023 · 89b1444 · 89b1444
1 parent e5e77e0
commit 89b1444
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 13 deletions.
diff --git a/csharp/EPAM.Deltix.DFP.Test/Decimal64Test.cs b/csharp/EPAM.Deltix.DFP.Test/Decimal64Test.cs
@@ -706,7 +706,7 @@ public void TestParseReImpl()
 			{
 				var testStr = "000";
 				uint fpsf;
-				var value = Decimal64.FromUnderlying(DotNetReImpl.bid64_from_string(testStr, out fpsf, roundMode));
+				var value = Decimal64.FromUnderlying(DotNetReImpl.bid64_from_string(testStr, Decimal64.DecimalMarkAny, out fpsf, roundMode));
 				double doubleValue;
 				var doubleParseOk = Double.TryParse(testStr, NumberStyles.Float, CultureInfo.InvariantCulture, out doubleValue);
 				Assert.AreEqual(Decimal64.Zero, value);
@@ -716,7 +716,7 @@ public void TestParseReImpl()
 			{
 				var testStr = "00..";
 				uint fpsf;
-				var value = Decimal64.FromUnderlying(DotNetReImpl.bid64_from_string(testStr, out fpsf, roundMode));
+				var value = Decimal64.FromUnderlying(DotNetReImpl.bid64_from_string(testStr, Decimal64.DecimalMarkAny, out fpsf, roundMode));
 				double doubleValue;
 				var doubleParseOk = Double.TryParse(testStr, NumberStyles.Float, CultureInfo.InvariantCulture, out doubleValue);
 				Assert.AreEqual(Decimal64.NaN, value);
@@ -726,7 +726,7 @@ public void TestParseReImpl()
 			{
 				var testStr = "000235";
 				uint fpsf;
-				var value = Decimal64.FromUnderlying(DotNetReImpl.bid64_from_string(testStr, out fpsf, roundMode));
+				var value = Decimal64.FromUnderlying(DotNetReImpl.bid64_from_string(testStr, Decimal64.DecimalMarkAny, out fpsf, roundMode));
 				double doubleValue;
 				var doubleParseOk = Double.TryParse(testStr, NumberStyles.Float, CultureInfo.InvariantCulture, out doubleValue);
 				Assert.AreEqual(Decimal64.FromInt(235), value);
@@ -736,7 +736,7 @@ public void TestParseReImpl()
 			{
 				var testStr = "00.0000235";
 				uint fpsf;
-				var value = Decimal64.FromUnderlying(DotNetReImpl.bid64_from_string(testStr, out fpsf, roundMode));
+				var value = Decimal64.FromUnderlying(DotNetReImpl.bid64_from_string(testStr, Decimal64.DecimalMarkAny, out fpsf, roundMode));
 				double doubleValue;
 				var doubleParseOk = Double.TryParse(testStr, NumberStyles.Float, CultureInfo.InvariantCulture, out doubleValue);
 				Assert.AreEqual(Decimal64.FromFixedPoint(235, 7), value);
@@ -746,7 +746,7 @@ public void TestParseReImpl()
 			{
 				var testStr = "1234512345123451234500000";
 				uint fpsf;
-				var value = Decimal64.FromUnderlying(DotNetReImpl.bid64_from_string(testStr, out fpsf, roundMode));
+				var value = Decimal64.FromUnderlying(DotNetReImpl.bid64_from_string(testStr, Decimal64.DecimalMarkAny, out fpsf, roundMode));
 				double doubleValue;
 				var doubleParseOk = Double.TryParse(testStr, NumberStyles.Float, CultureInfo.InvariantCulture, out doubleValue);
 				Assert.AreEqual(Decimal64.FromFixedPoint(1234512345123451, -9), value);
@@ -756,7 +756,7 @@ public void TestParseReImpl()
 			{
 				var testStr = "1234512345123451234500000e+12345123451234512345";
 				uint fpsf;
-				var value = Decimal64.FromUnderlying(DotNetReImpl.bid64_from_string(testStr, out fpsf, roundMode));
+				var value = Decimal64.FromUnderlying(DotNetReImpl.bid64_from_string(testStr, Decimal64.DecimalMarkAny, out fpsf, roundMode));
 				double doubleValue;
 				var doubleParseOk = Double.TryParse(testStr, NumberStyles.Float, CultureInfo.InvariantCulture, out doubleValue);
 				Assert.AreEqual(Decimal64.PositiveInfinity, value);
@@ -766,7 +766,7 @@ public void TestParseReImpl()
 			{
 				var testStr = "-5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000";
 				uint fpsf;
-				var value = Decimal64.FromUnderlying(DotNetReImpl.bid64_from_string(testStr, out fpsf, roundMode));
+				var value = Decimal64.FromUnderlying(DotNetReImpl.bid64_from_string(testStr, Decimal64.DecimalMarkAny, out fpsf, roundMode));
 				double doubleValue;
 				var doubleParseOk = Double.TryParse(testStr, NumberStyles.Float, CultureInfo.InvariantCulture, out doubleValue);
 				Assert.AreEqual(Decimal64.NegativeInfinity, value);
@@ -776,7 +776,7 @@ public void TestParseReImpl()
 			{
 				var testStr = "0.00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005";
 				uint fpsf;
-				var value = Decimal64.FromUnderlying(DotNetReImpl.bid64_from_string(testStr, out fpsf, roundMode));
+				var value = Decimal64.FromUnderlying(DotNetReImpl.bid64_from_string(testStr, Decimal64.DecimalMarkAny, out fpsf, roundMode));
 				double doubleValue;
 				var doubleParseOk = Double.TryParse(testStr, NumberStyles.Float, CultureInfo.InvariantCulture, out doubleValue);
 				Assert.AreEqual(Decimal64.Zero, value);
@@ -786,7 +786,7 @@ public void TestParseReImpl()
 			{
 				var testStr = "123 x99";
 				uint fpsf;
-				var value = Decimal64.FromUnderlying(DotNetReImpl.bid64_from_string(testStr, out fpsf, roundMode));
+				var value = Decimal64.FromUnderlying(DotNetReImpl.bid64_from_string(testStr, Decimal64.DecimalMarkAny, out fpsf, roundMode));
 				double doubleValue;
 				var doubleParseOk = Double.TryParse(testStr, NumberStyles.Float, CultureInfo.InvariantCulture, out doubleValue);
 				Assert.AreEqual(Decimal64.NaN, value);

diff --git a/csharp/EPAM.Deltix.DFP/Decimal64.cs b/csharp/EPAM.Deltix.DFP/Decimal64.cs
@@ -952,7 +952,18 @@ public Decimal64 Canonize()
 		public static Decimal64 Parse(String text)
 		{
 			uint fpsf;
-			var ret = DotNetReImpl.bid64_from_string(text, out fpsf);
+			var ret = DotNetReImpl.bid64_from_string(text, DecimalMarkAny, out fpsf);
+			if ((fpsf & DotNetReImpl.BID_INVALID_FORMAT) != 0)
+				throw new FormatException("Input string is not in a correct format.");
+			//else if ((fpsf & DotNetReImpl.BID_INEXACT_EXCEPTION) != 0)
+			//	throw new FormatException("Can't convert input string to value without precision loss.");
+			return FromUnderlying(ret);
+		}
+
+		public static Decimal64 Parse(String text, String decimalMarks)
+		{
+			uint fpsf;
+			var ret = DotNetReImpl.bid64_from_string(text, decimalMarks, out fpsf);
 			if ((fpsf & DotNetReImpl.BID_INVALID_FORMAT) != 0)
 				throw new FormatException("Input string is not in a correct format.");
 			//else if ((fpsf & DotNetReImpl.BID_INEXACT_EXCEPTION) != 0)
@@ -976,15 +987,36 @@ public enum StatusValue
 		public static Boolean TryParse(String text, out Decimal64 result, out StatusValue status)
 		{
 			uint fpsf;
-			result = FromUnderlying(DotNetReImpl.bid64_from_string(text, out fpsf));
+			result = FromUnderlying(DotNetReImpl.bid64_from_string(text, DecimalMarkAny, out fpsf));
+			status = (StatusValue)fpsf;
+			return status == StatusValue.Exact;
+		}
+
+		public static Boolean TryParse(String text, String decimalMarks, out Decimal64 result, out StatusValue status)
+		{
+			uint fpsf;
+			result = FromUnderlying(DotNetReImpl.bid64_from_string(text, decimalMarks, out fpsf));
 			status = (StatusValue)fpsf;
 			return status == StatusValue.Exact;
 		}
 
 		public static Boolean TryParse(String text, out Decimal64 result)
 		{
 			uint fpsf;
-			var ret = DotNetReImpl.bid64_from_string(text, out fpsf);
+			var ret = DotNetReImpl.bid64_from_string(text, DecimalMarkAny, out fpsf);
+			if ((fpsf & DotNetReImpl.BID_INVALID_FORMAT) != 0)
+			{
+				result = NaN;
+				return false;
+			}
+			result = FromUnderlying(ret);
+			return true;
+		}
+
+		public static Boolean TryParse(String text, String decimalMarks, out Decimal64 result)
+		{
+			uint fpsf;
+			var ret = DotNetReImpl.bid64_from_string(text, decimalMarks, out fpsf);
 			if ((fpsf & DotNetReImpl.BID_INVALID_FORMAT) != 0)
 			{
 				result = NaN;

diff --git a/csharp/EPAM.Deltix.DFP/DotNetReImpl.cs b/csharp/EPAM.Deltix.DFP/DotNetReImpl.cs
@@ -76,7 +76,7 @@ private unsafe static bool IsStrEq(char* ptr, string str)
 			}
 		}
 
-		public unsafe static BID_UINT64 bid64_from_string(string s, out _IDEC_flags pfpsf, string decimalMarks, int rnd_mode = BID_ROUNDING_TO_NEAREST/*, _EXC_MASKS_PARAM _EXC_INFO_PARAM*/)
+		public unsafe static BID_UINT64 bid64_from_string(string s, string decimalMarks, out _IDEC_flags pfpsf, int rnd_mode = BID_ROUNDING_TO_NEAREST/*, _EXC_MASKS_PARAM _EXC_INFO_PARAM*/)
 		{
 
 			BID_UINT64 coefficient_x = 0, rounded = 0;