Support foreign number argument in double arithmetic nodes

enso-org · Sep 14, 2023 · 634b25c · 634b25c
1 parent 3d5b014
commit 634b25c
Show file tree

Hide file tree

Showing 13 changed files with 212 additions and 18 deletions.
diff --git a/...me/src/main/java/org/enso/interpreter/node/expression/builtin/number/decimal/AddNode.java b/...me/src/main/java/org/enso/interpreter/node/expression/builtin/number/decimal/AddNode.java
@@ -1,12 +1,14 @@
 package org.enso.interpreter.node.expression.builtin.number.decimal;
 
+import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.interop.TruffleObject;
+import com.oracle.truffle.api.library.CachedLibrary;
 import org.enso.interpreter.dsl.BuiltinMethod;
 import org.enso.interpreter.node.expression.builtin.number.utils.BigIntegerOps;
-import org.enso.interpreter.runtime.EnsoContext;
-import org.enso.interpreter.runtime.builtin.Builtins;
-import org.enso.interpreter.runtime.error.PanicException;
+import org.enso.interpreter.node.expression.builtin.number.utils.ToEnsoNumberNode;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
 
 @BuiltinMethod(type = "Decimal", name = "+", description = "Addition of numbers.")
@@ -32,10 +34,18 @@ static AddNode build() {
     return self + BigIntegerOps.toDouble(that.getValue());
   }
 
+  @Specialization(guards = "isForeignNumber(iop, that)")
+  double doInterop(
+      double self,
+      TruffleObject that,
+      @CachedLibrary(limit = INTEROP_LIMIT) InteropLibrary iop,
+      @Cached ToEnsoNumberNode toEnsoNumberNode,
+      @Cached AddNode delegate) {
+    return delegate.execute(self, handleInterop(false, self, that, iop, toEnsoNumberNode));
+  }
+
   @Fallback
   double doOther(double self, Object that) {
-    Builtins builtins = EnsoContext.get(this).getBuiltins();
-    var number = builtins.number().getNumber();
-    throw new PanicException(builtins.error().makeTypeError(number, that, "that"), this);
+    throw panicOtherwise(self, that);
   }
 }
diff --git a/...src/main/java/org/enso/interpreter/node/expression/builtin/number/decimal/DivideNode.java b/...src/main/java/org/enso/interpreter/node/expression/builtin/number/decimal/DivideNode.java
@@ -1,9 +1,14 @@
 package org.enso.interpreter.node.expression.builtin.number.decimal;
 
+import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.interop.TruffleObject;
+import com.oracle.truffle.api.library.CachedLibrary;
 import org.enso.interpreter.dsl.BuiltinMethod;
 import org.enso.interpreter.node.expression.builtin.number.utils.BigIntegerOps;
+import org.enso.interpreter.node.expression.builtin.number.utils.ToEnsoNumberNode;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
 
 @BuiltinMethod(type = "Decimal", name = "/", description = "Division of numbers.")
@@ -29,8 +34,18 @@ static DivideNode build() {
     return self / BigIntegerOps.toDouble(that.getValue());
   }
 
+  @Specialization(guards = "isForeignNumber(iop, that)")
+  double doInterop(
+      double self,
+      TruffleObject that,
+      @CachedLibrary(limit = INTEROP_LIMIT) InteropLibrary iop,
+      @Cached ToEnsoNumberNode toEnsoNumberNode,
+      @Cached DivideNode delegate) {
+    return delegate.execute(self, handleInterop(false, self, that, iop, toEnsoNumberNode));
+  }
+
   @Fallback
   double doOther(double self, Object that) {
-    return handleOther(self, that);
+    throw panicOtherwise(self, that);
   }
 }
diff --git a/.../src/main/java/org/enso/interpreter/node/expression/builtin/number/decimal/FloatNode.java b/.../src/main/java/org/enso/interpreter/node/expression/builtin/number/decimal/FloatNode.java
@@ -1,12 +1,45 @@
 package org.enso.interpreter.node.expression.builtin.number.decimal;
 
+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.nodes.Node;
+import org.enso.interpreter.node.expression.builtin.number.utils.ToEnsoNumberNode;
 import org.enso.interpreter.runtime.EnsoContext;
 import org.enso.interpreter.runtime.error.DataflowError;
 import org.enso.interpreter.runtime.error.PanicException;
+import org.enso.interpreter.runtime.number.EnsoBigInteger;
 
 abstract class FloatNode extends Node {
-  final double handleOther(double self, Object that) {
+  static final String INTEROP_LIMIT = "3";
+
+  final boolean isForeignNumber(InteropLibrary iop, TruffleObject obj) {
+    if (obj instanceof EnsoBigInteger) {
+      return false;
+    }
+    return iop.isNumber(obj);
+  }
+
+  final Object handleInterop(
+      boolean incomparableError,
+      double self,
+      TruffleObject that,
+      InteropLibrary iop,
+      ToEnsoNumberNode toEnsoNumberNode) {
+    try {
+      if (iop.fitsInLong(that)) {
+        return iop.asLong(that);
+      } else if (iop.fitsInDouble(that)) {
+        return iop.asDouble(that);
+      } else if (iop.fitsInBigInteger(that)) {
+        return toEnsoNumberNode.execute(iop.asBigInteger(that));
+      }
+    } catch (UnsupportedMessageException ex) {
+    }
+    return incomparableError ? incomparableError(self, that) : panicOtherwise(self, that);
+  }
+
+  final PanicException panicOtherwise(double self, Object that) {
     var builtins = EnsoContext.get(this).getBuiltins();
     var number = builtins.number().getNumber();
     throw new PanicException(builtins.error().makeTypeError(number, that, "that"), this);

diff --git a/...rc/main/java/org/enso/interpreter/node/expression/builtin/number/decimal/GreaterNode.java b/...rc/main/java/org/enso/interpreter/node/expression/builtin/number/decimal/GreaterNode.java
@@ -1,9 +1,14 @@
 package org.enso.interpreter.node.expression.builtin.number.decimal;
 
+import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.interop.TruffleObject;
+import com.oracle.truffle.api.library.CachedLibrary;
 import org.enso.interpreter.dsl.BuiltinMethod;
 import org.enso.interpreter.node.expression.builtin.number.utils.BigIntegerOps;
+import org.enso.interpreter.node.expression.builtin.number.utils.ToEnsoNumberNode;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
 
 @BuiltinMethod(type = "Decimal", name = ">", description = "Comparison of numbers.")
@@ -42,6 +47,16 @@ Object doBigInteger(double self, EnsoBigInteger that) {
     }
   }
 
+  @Specialization(guards = "isForeignNumber(iop, that)")
+  Object doInterop(
+      double self,
+      TruffleObject that,
+      @CachedLibrary(limit = INTEROP_LIMIT) InteropLibrary iop,
+      @Cached ToEnsoNumberNode toEnsoNumberNode,
+      @Cached GreaterNode delegate) {
+    return delegate.execute(self, handleInterop(true, self, that, iop, toEnsoNumberNode));
+  }
+
   @Fallback
   Object doOther(double self, Object that) {
     return incomparableError(self, that);

diff --git a/.../java/org/enso/interpreter/node/expression/builtin/number/decimal/GreaterOrEqualNode.java b/.../java/org/enso/interpreter/node/expression/builtin/number/decimal/GreaterOrEqualNode.java
@@ -1,9 +1,14 @@
 package org.enso.interpreter.node.expression.builtin.number.decimal;
 
+import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.interop.TruffleObject;
+import com.oracle.truffle.api.library.CachedLibrary;
 import org.enso.interpreter.dsl.BuiltinMethod;
 import org.enso.interpreter.node.expression.builtin.number.utils.BigIntegerOps;
+import org.enso.interpreter.node.expression.builtin.number.utils.ToEnsoNumberNode;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
 
 @BuiltinMethod(type = "Decimal", name = ">=", description = "Comparison of numbers.")
@@ -42,6 +47,16 @@ Object doBigInteger(double self, EnsoBigInteger that) {
     }
   }
 
+  @Specialization(guards = "isForeignNumber(iop, that)")
+  Object doInterop(
+      double self,
+      TruffleObject that,
+      @CachedLibrary(limit = INTEROP_LIMIT) InteropLibrary iop,
+      @Cached ToEnsoNumberNode toEnsoNumberNode,
+      @Cached GreaterOrEqualNode delegate) {
+    return delegate.execute(self, handleInterop(true, self, that, iop, toEnsoNumberNode));
+  }
+
   @Fallback
   Object doOther(double self, Object that) {
     return incomparableError(self, that);

diff --git a/...e/src/main/java/org/enso/interpreter/node/expression/builtin/number/decimal/LessNode.java b/...e/src/main/java/org/enso/interpreter/node/expression/builtin/number/decimal/LessNode.java
@@ -1,9 +1,14 @@
 package org.enso.interpreter.node.expression.builtin.number.decimal;
 
+import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.interop.TruffleObject;
+import com.oracle.truffle.api.library.CachedLibrary;
 import org.enso.interpreter.dsl.BuiltinMethod;
 import org.enso.interpreter.node.expression.builtin.number.utils.BigIntegerOps;
+import org.enso.interpreter.node.expression.builtin.number.utils.ToEnsoNumberNode;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
 
 @BuiltinMethod(type = "Decimal", name = "<", description = "Comparison of numbers.")
@@ -42,6 +47,16 @@ Object doBigInteger(double self, EnsoBigInteger that) {
     }
   }
 
+  @Specialization(guards = "isForeignNumber(iop, that)")
+  Object doInterop(
+      double self,
+      TruffleObject that,
+      @CachedLibrary(limit = INTEROP_LIMIT) InteropLibrary iop,
+      @Cached ToEnsoNumberNode toEnsoNumberNode,
+      @Cached LessNode delegate) {
+    return delegate.execute(self, handleInterop(true, self, that, iop, toEnsoNumberNode));
+  }
+
   @Fallback
   Object doOther(double self, Object that) {
     return incomparableError(self, that);

diff --git a/...ain/java/org/enso/interpreter/node/expression/builtin/number/decimal/LessOrEqualNode.java b/...ain/java/org/enso/interpreter/node/expression/builtin/number/decimal/LessOrEqualNode.java
@@ -1,9 +1,14 @@
 package org.enso.interpreter.node.expression.builtin.number.decimal;
 
+import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.interop.TruffleObject;
+import com.oracle.truffle.api.library.CachedLibrary;
 import org.enso.interpreter.dsl.BuiltinMethod;
 import org.enso.interpreter.node.expression.builtin.number.utils.BigIntegerOps;
+import org.enso.interpreter.node.expression.builtin.number.utils.ToEnsoNumberNode;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
 
 @BuiltinMethod(type = "Decimal", name = "<=", description = "Comparison of numbers.")
@@ -42,6 +47,16 @@ Object doBigInteger(double self, EnsoBigInteger that) {
     }
   }
 
+  @Specialization(guards = "isForeignNumber(iop, that)")
+  Object doInterop(
+      double self,
+      TruffleObject that,
+      @CachedLibrary(limit = INTEROP_LIMIT) InteropLibrary iop,
+      @Cached ToEnsoNumberNode toEnsoNumberNode,
+      @Cached LessOrEqualNode delegate) {
+    return delegate.execute(self, handleInterop(true, self, that, iop, toEnsoNumberNode));
+  }
+
   @Fallback
   Object doOther(double self, Object that) {
     return incomparableError(self, that);

diff --git a/...me/src/main/java/org/enso/interpreter/node/expression/builtin/number/decimal/ModNode.java b/...me/src/main/java/org/enso/interpreter/node/expression/builtin/number/decimal/ModNode.java
@@ -1,9 +1,14 @@
 package org.enso.interpreter.node.expression.builtin.number.decimal;
 
+import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.interop.TruffleObject;
+import com.oracle.truffle.api.library.CachedLibrary;
 import org.enso.interpreter.dsl.BuiltinMethod;
 import org.enso.interpreter.node.expression.builtin.number.utils.BigIntegerOps;
+import org.enso.interpreter.node.expression.builtin.number.utils.ToEnsoNumberNode;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
 
 @BuiltinMethod(type = "Decimal", name = "%", description = "Modulo division of numbers.")
@@ -29,8 +34,18 @@ static ModNode build() {
     return self % BigIntegerOps.toDouble(that.getValue());
   }
 
+  @Specialization(guards = "isForeignNumber(iop, that)")
+  double doInterop(
+      double self,
+      TruffleObject that,
+      @CachedLibrary(limit = INTEROP_LIMIT) InteropLibrary iop,
+      @Cached ToEnsoNumberNode toEnsoNumberNode,
+      @Cached ModNode delegate) {
+    return delegate.execute(self, handleInterop(false, self, that, iop, toEnsoNumberNode));
+  }
+
   @Fallback
   double doOther(double self, Object that) {
-    return handleOther(self, that);
+    throw panicOtherwise(self, that);
   }
 }
diff --git a/...c/main/java/org/enso/interpreter/node/expression/builtin/number/decimal/MultiplyNode.java b/...c/main/java/org/enso/interpreter/node/expression/builtin/number/decimal/MultiplyNode.java
@@ -1,12 +1,14 @@
 package org.enso.interpreter.node.expression.builtin.number.decimal;
 
+import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.interop.TruffleObject;
+import com.oracle.truffle.api.library.CachedLibrary;
 import org.enso.interpreter.dsl.BuiltinMethod;
 import org.enso.interpreter.node.expression.builtin.number.utils.BigIntegerOps;
-import org.enso.interpreter.runtime.EnsoContext;
-import org.enso.interpreter.runtime.builtin.Builtins;
-import org.enso.interpreter.runtime.error.PanicException;
+import org.enso.interpreter.node.expression.builtin.number.utils.ToEnsoNumberNode;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
 
 @BuiltinMethod(type = "Decimal", name = "*", description = "Multiplication of numbers.")
@@ -32,10 +34,18 @@ static MultiplyNode build() {
     return self * BigIntegerOps.toDouble(that.getValue());
   }
 
+  @Specialization(guards = "isForeignNumber(iop, that)")
+  double doInterop(
+      double self,
+      TruffleObject that,
+      @CachedLibrary(limit = INTEROP_LIMIT) InteropLibrary iop,
+      @Cached ToEnsoNumberNode toEnsoNumberNode,
+      @Cached MultiplyNode delegate) {
+    return delegate.execute(self, handleInterop(false, self, that, iop, toEnsoNumberNode));
+  }
+
   @Fallback
   double doOther(double self, Object that) {
-    Builtins builtins = EnsoContext.get(this).getBuiltins();
-    var number = builtins.number().getNumber();
-    throw new PanicException(builtins.error().makeTypeError(number, that, "that"), this);
+    throw panicOtherwise(self, that);
   }
 }
diff --git a/...me/src/main/java/org/enso/interpreter/node/expression/builtin/number/decimal/PowNode.java b/...me/src/main/java/org/enso/interpreter/node/expression/builtin/number/decimal/PowNode.java
@@ -1,9 +1,14 @@
 package org.enso.interpreter.node.expression.builtin.number.decimal;
 
+import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.interop.TruffleObject;
+import com.oracle.truffle.api.library.CachedLibrary;
 import org.enso.interpreter.dsl.BuiltinMethod;
 import org.enso.interpreter.node.expression.builtin.number.utils.BigIntegerOps;
+import org.enso.interpreter.node.expression.builtin.number.utils.ToEnsoNumberNode;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
 
 @BuiltinMethod(type = "Decimal", name = "^", description = "Exponentiation of numbers.")
@@ -29,8 +34,18 @@ static PowNode build() {
     return Math.pow(self, BigIntegerOps.toDouble(that.getValue()));
   }
 
+  @Specialization(guards = "isForeignNumber(iop, that)")
+  double doInterop(
+      double self,
+      TruffleObject that,
+      @CachedLibrary(limit = INTEROP_LIMIT) InteropLibrary iop,
+      @Cached ToEnsoNumberNode toEnsoNumberNode,
+      @Cached PowNode delegate) {
+    return delegate.execute(self, handleInterop(false, self, that, iop, toEnsoNumberNode));
+  }
+
   @Fallback
   double doOther(double self, Object that) {
-    return handleOther(self, that);
+    throw panicOtherwise(self, that);
   }
 }
diff --git a/...c/main/java/org/enso/interpreter/node/expression/builtin/number/decimal/SubtractNode.java b/...c/main/java/org/enso/interpreter/node/expression/builtin/number/decimal/SubtractNode.java
@@ -1,9 +1,14 @@
 package org.enso.interpreter.node.expression.builtin.number.decimal;
 
+import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.interop.TruffleObject;
+import com.oracle.truffle.api.library.CachedLibrary;
 import org.enso.interpreter.dsl.BuiltinMethod;
 import org.enso.interpreter.node.expression.builtin.number.utils.BigIntegerOps;
+import org.enso.interpreter.node.expression.builtin.number.utils.ToEnsoNumberNode;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
 
 @BuiltinMethod(type = "Decimal", name = "-", description = "Subtraction of numbers.")
@@ -29,8 +34,18 @@ static SubtractNode build() {
     return self - BigIntegerOps.toDouble(that.getValue());
   }
 
+  @Specialization(guards = "isForeignNumber(iop, that)")
+  double doInterop(
+      double self,
+      TruffleObject that,
+      @CachedLibrary(limit = INTEROP_LIMIT) InteropLibrary iop,
+      @Cached ToEnsoNumberNode toEnsoNumberNode,
+      @Cached SubtractNode delegate) {
+    return delegate.execute(self, handleInterop(false, self, that, iop, toEnsoNumberNode));
+  }
+
   @Fallback
   double doOther(double self, Object that) {
-    return handleOther(self, that);
+    throw panicOtherwise(self, that);
   }
 }