apply Jaroslav fix

enso-org · Feb 29, 2024 · e04fcf1 · e04fcf1
1 parent 28fd13b
commit e04fcf1
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 95 deletions.
diff --git a/engine/polyglot-api/src/main/java/org/enso/polyglot/HostAccessFactory.java b/engine/polyglot-api/src/main/java/org/enso/polyglot/HostAccessFactory.java
@@ -21,11 +21,6 @@ public HostAccess allWithTypeMapping() {
         .allowIteratorAccess(true)
         .allowMapAccess(true)
         .allowAccessInheritance(true)
-        .targetTypeMapping(
-            Long.class,
-            Double.class,
-            (v) -> v != null && !longInSafeDoubleRange(v, LONG_MAX_SAFE_DOUBLE),
-            (v) -> Double.longBitsToDouble(v))
         .build();
   }
 

diff --git a/std-bits/base/src/main/java/org/enso/base/numeric/Decimal_Utils.java b/std-bits/base/src/main/java/org/enso/base/numeric/Decimal_Utils.java
diff --git a/std-bits/base/src/main/java/org/enso/base/numeric/Number_Utils.java b/std-bits/base/src/main/java/org/enso/base/numeric/Number_Utils.java
@@ -0,0 +1,8 @@
+package org.enso.base.numeric;
+
+public class Number_Utils {
+  // For testing only.
+  public static Double floatId(Double d) {
+    return d;
+  }
+}
diff --git a/test/Base_Tests/src/Data/Decimal_Spec.enso b/test/Base_Tests/src/Data/Decimal_Spec.enso
diff --git a/test/Base_Tests/src/Data/Numbers_Spec.enso b/test/Base_Tests/src/Data/Numbers_Spec.enso
@@ -12,6 +12,7 @@ import project.Data.Round_Spec
 
 polyglot java import java.math.BigInteger
 polyglot java import java.math.BigDecimal
+polyglot java import org.enso.base.numeric.Number_Utils
 
 Integer.is_even self = self % 2 == 0
 
@@ -39,6 +40,10 @@ type Complex_Comparator
 Comparable.from (_:Complex) = Complex_Comparator
 Comparable.from (_:Number) = Complex_Comparator
 
+float_id : Float -> Float
+float_id f =
+    Number_Utils.floatId f
+
 
 add_specs suite_builder =
     eps = 0.000001
@@ -701,6 +706,66 @@ add_specs suite_builder =
                 [x, y, z, w].each b->
                     a+b . should_equal 20
 
+    suite_builder.group "arithmetic" group_builder->
+        group_builder.specify "should be able to pass a Float to Java" <|
+            vs = []
+                + [92233720368547758080.0]
+                + [9223372036854777000.0]
+                + [9223372036854776001.0]
+                + [9223372036854776000.0]
+                + [9223372036854775808.0]
+                + [9223372036854775000.0]
+                + [9223372036854774000.0]
+                + [9223372036854700000.0]
+                + [9223372036854000000.0]
+                + [9223372000000000000.0]
+                + [922337203685470000.0]
+                + [92233720368547000.0]
+                + [9223372036854700.0]
+                + [922337203685470.0]
+                + [92233720368547.0]
+                + [9223372036854.0]
+                + [922337203685.0]
+                + [92233720368.0]
+                + [9223372036.0]
+                + [922337203.0]
+                + [92233720.0]
+                + [9223372.0]
+                + [922337.0]
+                + [92233.0]
+                + [9223.0]
+                + [922.0]
+                + [-92233720368547758080.0]
+                + [-9223372036854777000.0]
+                + [-9223372036854776001.0]
+                + [-9223372036854776000.0]
+                + [-9223372036854775808.0]
+                + [-9223372036854775000.0]
+                + [-9223372036854774000.0]
+                + [-9223372036854700000.0]
+                + [-9223372036854000000.0]
+                + [-9223372000000000000.0]
+                + [-922337203685470000.0]
+                + [-92233720368547000.0]
+                + [-9223372036854700.0]
+                + [-922337203685470.0]
+                + [-92233720368547.0]
+                + [-9223372036854.0]
+                + [-922337203685.0]
+                + [-92233720368.0]
+                + [-9223372036.0]
+                + [-922337203.0]
+                + [-92233720.0]
+                + [-9223372.0]
+                + [-922337.0]
+                + [-92233.0]
+                + [-9223.0]
+                + [-922.0]
+
+            vs.map v->
+                r = float_id v
+                r . should_equal v
+
 main filter=Nothing =
     suite = Test.build suite_builder->
         add_specs suite_builder