Adopting GraalVM's support for BigInteger

engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/EqualsNode.java

@@ -113,7 +113,7 @@ boolean equalsDoubleBool(double self, boolean other) {
   @Specialization
   @TruffleBoundary
   boolean equalsDoubleBigInt(double self, EnsoBigInteger other) {
-    return self == other.doubleValue();
+    return self == other.asDouble();
   }
 
   @Specialization
@@ -130,7 +130,7 @@ boolean equalsBigIntBigInt(EnsoBigInteger self, EnsoBigInteger otherBigInt) {
   @Specialization
   @TruffleBoundary
   boolean equalsBitIntDouble(EnsoBigInteger self, double other) {
-    return self.doubleValue() == other;
+    return self.asDouble() == other;
   }
 
   @Specialization

engine/runtime/src/main/java/org/enso/interpreter/runtime/number/EnsoBigInteger.java

@@ -1,23 +1,24 @@
 package org.enso.interpreter.runtime.number;
 
+import java.math.BigInteger;
+
+import org.enso.interpreter.runtime.EnsoContext;
+import org.enso.interpreter.runtime.data.Type;
+import org.enso.interpreter.runtime.library.dispatch.TypesLibrary;
+
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.TruffleObject;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
-import org.enso.interpreter.runtime.EnsoContext;
-import org.enso.interpreter.runtime.data.Type;
-import org.enso.interpreter.runtime.library.dispatch.TypesLibrary;
-
-import java.math.BigInteger;
 
 /** Internal wrapper for a {@link BigInteger}. */
 @ExportLibrary(InteropLibrary.class)
 @ExportLibrary(TypesLibrary.class)
 @SuppressWarnings("truffle-abstract-export")
-public final class EnsoBigInteger extends Number implements TruffleObject {
+public final class EnsoBigInteger implements TruffleObject {
   private final BigInteger value;
 
   /**
@@ -82,40 +83,50 @@ final boolean fitsInDouble() {
     return false;
   }
 
+  @ExportMessage
+  final boolean fitsInBigInteger() {
+    return true;
+  }
+
   @ExportMessage
   @CompilerDirectives.TruffleBoundary
   final byte asByte() throws UnsupportedMessageException {
-    return byteValue();
+    return value.byteValue();
   }
 
   @ExportMessage
   @CompilerDirectives.TruffleBoundary
   final short asShort() throws UnsupportedMessageException {
-    return shortValue();
+    return value.shortValue();
   }
 
   @ExportMessage
   @CompilerDirectives.TruffleBoundary
   final int asInt() throws UnsupportedMessageException {
-    return intValue();
+    return value.intValue();
   }
 
   @ExportMessage
   @CompilerDirectives.TruffleBoundary
   final long asLong() throws UnsupportedMessageException {
-    return longValue();
+    return value.longValue();
   }
 
   @ExportMessage
   @CompilerDirectives.TruffleBoundary
-  final float asFloat() throws UnsupportedMessageException {
-    return floatValue();
+  final float asFloat() {
+    return value.floatValue();
   }
 
   @ExportMessage
   @CompilerDirectives.TruffleBoundary
-  final double asDouble() throws UnsupportedMessageException {
-    return doubleValue();
+  public final double asDouble() {
+    return value.doubleValue();
+  }
+
+  @ExportMessage
+  public final BigInteger asBigInteger() {
+    return value;
   }
 
   @ExportMessage
@@ -138,26 +149,6 @@ Type getType(@CachedLibrary("this") TypesLibrary thisLib) {
     return EnsoContext.get(thisLib).getBuiltins().number().getBigInteger();
   }
 
-  @Override
-  public int intValue() {
-    return value.intValue();
-  }
-
-  @Override
-  public long longValue() {
-    return value.longValue();
-  }
-
-  @Override
-  public float floatValue() {
-    return value.floatValue();
-  }
-
-  @Override
-  public double doubleValue() {
-    return value.doubleValue();
-  }
-
   @Override
   public boolean equals(Object obj) {
     if (obj instanceof EnsoBigInteger otherBigInt) {

engine/runtime/src/test/java/org/enso/example/TestClass.java

@@ -36,12 +36,10 @@ public static double numberArrayAverage(Number[] arr) {
     return sum / arr.length;
   }
 
-  public static String exactArrayAverage(Number[] arr) {
+  public static String exactArrayAverage(BigInteger[] arr) {
     var sum = BigInteger.ZERO;
     for (int i = 0; i < arr.length; i++) {
-      var n = arr[i] instanceof Long l ? BigInteger.valueOf(l) :
-          new BigInteger(arr[i].toString());
-      sum = sum.add(n);
+      sum = sum.add(arr[i]);
     }
     return sum.divide(BigInteger.valueOf(arr.length)).toString();
   }

engine/runtime/src/test/java/org/enso/interpreter/test/BigNumberTest.java

@@ -4,15 +4,15 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
+
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Source;
 import org.graalvm.polyglot.Value;
+import org.junit.AfterClass;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-
-import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -38,7 +38,7 @@ public void evaluation() throws Exception {
     powers n =
         go x v b = if x > n then b.to_vector else
             b.append v
-            @Tail_Call go x+1 v*2 b
+            @Tail_Call go x+1 v*3 b
         go 1 1 Vector.new_builder
     """;
     var powers = evalCode(code, "powers");
@@ -59,33 +59,20 @@ public void evaluation() throws Exception {
       if (e.fitsInDouble()) {
         doubles++;
       }
-      boolean assertsOn = false;
-      // Explanation at
-      // https://github.com/enso-org/enso/pull/4074#discussion_r1086222800
-      // rewrite when proper support for BigInteger is available
-      // https://github.com/oracle/graal/pull/5490
-      assert assertsOn = true;
-      String s;
-      if (!assertsOn) {
-        var n = e.as(Number.class);
-        assertNotNull("All numbers can be seen as java.lang.Number", n);
-        s = n.toString();
-      } else {
-        s = e.toString();
-      }
-      var b = new BigInteger(s);
+      var s = e.toString();
+      var b = e.asBigInteger();
       assertNotNull("Each Enso number can be parsed as big integer", b);
       assertEquals("Textual values are the same", s, b.toString());
       values.add(b);
     }
-    assertEquals("There are few long values and rest of doubles", 63, longs);
-    assertEquals("There are few double values and rest of Numbers", 63, doubles);
+    assertEquals("There are few long values and rest of doubles", 40, longs);
+    assertEquals("There are few double values and rest of Numbers", 34, doubles);
     assertEquals("Two hundred numbers collected", 200, values.size());
     for (int i = 1; i < values.size(); i++) {
       var prev = values.get(i - 1);
       var next = values.get(i);
 
-      assertEquals("Each value is accurate", prev.multiply(BigInteger.valueOf(2)), next);
+      assertEquals("Each value is accurate", prev.multiply(BigInteger.valueOf(3)), next);
     }
   }