Add support for numeric finite types

ballerina-platform · Nov 28, 2024 · d774c7a · d774c7a
1 parent 2641446
commit d774c7a
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 1 deletion.
diff --git a/ballerina/tests/test_finite_types.bal b/ballerina/tests/test_finite_types.bal
@@ -167,3 +167,33 @@ function testRecordFieldWithSingleFiniteType() returns error? {
     |} r = check parseAsType(xml `<Root><a>A</a><b>A</b><nested><c>100.0</c><d>B</d></nested></Root>`);
     test:assertEquals(r, {a: "A", b: "A", nested: {c: 100f, d: "B"}});
 }
+
+@test:Config
+function testRecordFieldWithSingleFiniteType2() returns error? {
+    record {| 
+        100f a;
+        200.1d b;
+        100d c;
+        200.1f d;
+        100f e;
+        200.1d f;
+        100d g;
+        200.1f h;
+    |} r = check parseAsType(xml `<Root><a>100</a><b>200.1</b><c>100</c><d>200.1</d><e>100.0</e><f>200.1</f><g>100.0</g><h>200.1</h></Root>`);
+    test:assertEquals(r, {a: 100f, b: 200.1d, c: 100d, d: 200.1f, e: 100f, f: 200.1d, g: 100d, h: 200.1f});
+}
+
+@test:Config
+function testRecordFieldWithSingleFiniteType3() returns error? {
+    record {| 
+        100f a;
+    |}|Error r = parseAsType(xml `<Root><a>100.01</a></Root>`);
+    test:assertTrue(r is Error);
+    test:assertEquals((<Error>r).message(), "'string' value '100.01' cannot be converted to '100.0f'");
+
+    record {| 
+        100d a;
+    |}|Error r2 = parseAsType(xml `<Root><a>100.01</a></Root>`);
+    test:assertTrue(r2 is Error);
+    test:assertEquals((<Error>r2).message(), "'string' value '100.01' cannot be converted to '100d'");
+}
diff --git a/native/src/main/java/io/ballerina/lib/data/xmldata/FromString.java b/native/src/main/java/io/ballerina/lib/data/xmldata/FromString.java
@@ -35,6 +35,7 @@
 import io.ballerina.runtime.api.values.BString;
 import io.ballerina.runtime.api.values.BTypedesc;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
@@ -117,8 +118,25 @@ private static Object stringToFiniteType(String value, FiniteType finiteType) {
 
     private static Object convertToSingletonValue(String str, Object singletonValue) {
         String singletonStr = String.valueOf(singletonValue);
+        Type type = TypeUtils.getType(singletonValue);
+
+        if (singletonValue instanceof BDecimal decimalValue) {
+            BigDecimal bigDecimal = decimalValue.decimalValue();
+            if (bigDecimal.compareTo(new BigDecimal(str)) == 0) {
+                return fromStringWithType(StringUtils.fromString(str), type);
+            }
+            return returnError(str, singletonStr);
+        }
+
+        if (singletonValue instanceof Double doubleValue) {
+            if (doubleValue.compareTo(Double.valueOf(str)) == 0) {
+                return fromStringWithType(StringUtils.fromString(str), type);
+            }
+            return returnError(str, singletonStr);
+        }
+
         if (str.equals(singletonStr)) {
-            return fromStringWithType(StringUtils.fromString(str), TypeUtils.getType(singletonValue));
+            return fromStringWithType(StringUtils.fromString(str), type);
         }
         return returnError(str, singletonStr);
     }