Handle Type_Error

enso-org · Sep 7, 2023 · 70cd83f · 70cd83f
1 parent 627dd60
commit 70cd83f
Show file tree

Hide file tree

Showing 20 changed files with 68 additions and 101 deletions.
diff --git a/...me/src/main/java/org/enso/interpreter/node/expression/builtin/number/integer/AbsNode.java b/...me/src/main/java/org/enso/interpreter/node/expression/builtin/number/integer/AbsNode.java
@@ -1,5 +1,6 @@
 package org.enso.interpreter.node.expression.builtin.number.integer;
 
+import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.nodes.Node;
 import org.enso.interpreter.dsl.BuiltinMethod;
@@ -35,4 +36,9 @@ Object doLongOverflow(long self) {
   Object doBigInt(EnsoBigInteger self) {
     return toEnsoNumberNode.execute(BigIntegerOps.abs(self.getValue()));
   }
+
+  @Fallback
+  Object doOther(Object self) {
+    return IntegerUtils.throwTypeErrorIfNotInt(self, this);
+  }
 }
diff --git a/...me/src/main/java/org/enso/interpreter/node/expression/builtin/number/integer/AddNode.java b/...me/src/main/java/org/enso/interpreter/node/expression/builtin/number/integer/AddNode.java
@@ -7,9 +7,6 @@
 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.EnsoContext;
-import org.enso.interpreter.runtime.builtin.Builtins;
-import org.enso.interpreter.runtime.error.PanicException;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
 
 @BuiltinMethod(type = "Integer", name = "+", description = "Addition of numbers.")
@@ -60,8 +57,6 @@ Object doBigIntegerLong(EnsoBigInteger self, long that) {
 
   @Fallback
   Object doOther(Object self, Object that) {
-    Builtins builtins = EnsoContext.get(this).getBuiltins();
-    var number = builtins.number().getInteger();
-    throw new PanicException(builtins.error().makeTypeError(number, that, "that"), this);
+    return IntegerUtils.throwTypeErrorIfNotInt(self, that, this);
   }
 }
diff --git a/...src/main/java/org/enso/interpreter/node/expression/builtin/number/integer/BitAndNode.java b/...src/main/java/org/enso/interpreter/node/expression/builtin/number/integer/BitAndNode.java
@@ -6,9 +6,6 @@
 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.EnsoContext;
-import org.enso.interpreter.runtime.builtin.Builtins;
-import org.enso.interpreter.runtime.error.PanicException;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
 
 @BuiltinMethod(type = "Integer", name = "bit_and", description = "Bitwise and.")
@@ -43,8 +40,6 @@ Object doBigIntBigInt(EnsoBigInteger self, EnsoBigInteger that) {
 
   @Fallback
   Object doOther(Object self, Object that) {
-    Builtins builtins = EnsoContext.get(this).getBuiltins();
-    var integer = builtins.number().getInteger();
-    throw new PanicException(builtins.error().makeTypeError(integer, that, "that"), this);
+    return IntegerUtils.throwTypeErrorIfNotInt(self, that, this);
   }
 }
diff --git a/...src/main/java/org/enso/interpreter/node/expression/builtin/number/integer/BitNotNode.java b/...src/main/java/org/enso/interpreter/node/expression/builtin/number/integer/BitNotNode.java
@@ -5,9 +5,6 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.nodes.Node;
 import org.enso.interpreter.dsl.BuiltinMethod;
-import org.enso.interpreter.runtime.EnsoContext;
-import org.enso.interpreter.runtime.builtin.Builtins;
-import org.enso.interpreter.runtime.error.PanicException;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
 
 @BuiltinMethod(type = "Integer", name = "bit_not", description = "Bitwise negation.")
@@ -31,8 +28,6 @@ EnsoBigInteger doBigInteger(EnsoBigInteger self) {
 
   @Fallback
   Object doOther(Object self) {
-    Builtins builtins = EnsoContext.get(this).getBuiltins();
-    var integer = builtins.number().getInteger();
-    throw new PanicException(builtins.error().makeTypeError(integer, self, "self"), this);
+    return IntegerUtils.throwTypeErrorIfNotInt(self, this);
   }
 }
diff --git a/.../src/main/java/org/enso/interpreter/node/expression/builtin/number/integer/BitOrNode.java b/.../src/main/java/org/enso/interpreter/node/expression/builtin/number/integer/BitOrNode.java
@@ -6,9 +6,6 @@
 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.EnsoContext;
-import org.enso.interpreter.runtime.builtin.Builtins;
-import org.enso.interpreter.runtime.error.PanicException;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
 
 @BuiltinMethod(type = "Integer", name = "bit_or", description = "Bitwise or.")
@@ -43,8 +40,6 @@ Object doBigInteger(EnsoBigInteger self, EnsoBigInteger that) {
 
   @Fallback
   Object doOther(Object self, Object that) {
-    Builtins builtins = EnsoContext.get(this).getBuiltins();
-    var integer = builtins.number().getInteger();
-    throw new PanicException(builtins.error().makeTypeError(integer, that, "that"), this);
+    return IntegerUtils.throwTypeErrorIfNotInt(self, that, this);
   }
 }
diff --git a/...c/main/java/org/enso/interpreter/node/expression/builtin/number/integer/BitShiftNode.java b/...c/main/java/org/enso/interpreter/node/expression/builtin/number/integer/BitShiftNode.java
@@ -12,9 +12,7 @@
 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.EnsoContext;
-import org.enso.interpreter.runtime.builtin.Builtins;
 import org.enso.interpreter.runtime.error.DataflowError;
-import org.enso.interpreter.runtime.error.PanicException;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
 
 @ImportStatic(BigIntegerOps.class)
@@ -128,9 +126,7 @@ Object doBigIntThat(EnsoBigInteger self, EnsoBigInteger that) {
 
   @Fallback
   Object doOther(Object self, Object that) {
-    Builtins builtins = EnsoContext.get(this).getBuiltins();
-    var integer = builtins.number().getInteger();
-    throw new PanicException(builtins.error().makeTypeError(integer, that, "that"), this);
+    return IntegerUtils.throwTypeErrorIfNotInt(self, that, this);
   }
 
   boolean hasFreeBitsLeftShift(long number, long shift) {

diff --git a/...n/java/org/enso/interpreter/node/expression/builtin/number/integer/BitShiftRightNode.java b/...n/java/org/enso/interpreter/node/expression/builtin/number/integer/BitShiftRightNode.java
@@ -7,9 +7,6 @@
 import com.oracle.truffle.api.nodes.Node;
 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.runtime.number.EnsoBigInteger;
 
 @BuiltinMethod(type = "Integer", name = "bit_shift_r", description = "Bitwise right-shift.")
@@ -52,8 +49,6 @@ Object doBigInteger(
 
   @Fallback
   Object doOther(Object self, Object that) {
-    Builtins builtins = EnsoContext.get(this).getBuiltins();
-    var integer = builtins.number().getInteger();
-    throw new PanicException(builtins.error().makeTypeError(integer, that, "that"), this);
+    return IntegerUtils.throwTypeErrorIfNotInt(self, that, this);
   }
 }
diff --git a/...src/main/java/org/enso/interpreter/node/expression/builtin/number/integer/BitXorNode.java b/...src/main/java/org/enso/interpreter/node/expression/builtin/number/integer/BitXorNode.java
@@ -6,9 +6,6 @@
 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.EnsoContext;
-import org.enso.interpreter.runtime.builtin.Builtins;
-import org.enso.interpreter.runtime.error.PanicException;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
 
 @BuiltinMethod(type = "Integer", name = "bit_xor", description = "Bitwise exclusive or.")
@@ -43,8 +40,6 @@ Object doBigInteger(EnsoBigInteger self, EnsoBigInteger that) {
 
   @Fallback
   Object doOther(Object self, Object that) {
-    Builtins builtins = EnsoContext.get(this).getBuiltins();
-    var integer = builtins.number().getInteger();
-    throw new PanicException(builtins.error().makeTypeError(integer, that, "that"), this);
+    return IntegerUtils.throwTypeErrorIfNotInt(self, that, this);
   }
 }
diff --git a/...e/src/main/java/org/enso/interpreter/node/expression/builtin/number/integer/CeilNode.java b/...e/src/main/java/org/enso/interpreter/node/expression/builtin/number/integer/CeilNode.java
@@ -4,9 +4,6 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.nodes.Node;
 import org.enso.interpreter.dsl.BuiltinMethod;
-import org.enso.interpreter.runtime.EnsoContext;
-import org.enso.interpreter.runtime.builtin.Builtins;
-import org.enso.interpreter.runtime.error.PanicException;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
 
 @BuiltinMethod(type = "Integer", name = "ceil", description = "Small integer ceiling.")
@@ -29,8 +26,6 @@ EnsoBigInteger doBigInt(EnsoBigInteger self) {
 
   @Fallback
   Object doOther(Object self) {
-    Builtins builtins = EnsoContext.get(this).getBuiltins();
-    var integer = builtins.number().getInteger();
-    throw new PanicException(builtins.error().makeTypeError(integer, self, "self"), this);
+    return IntegerUtils.throwTypeErrorIfNotInt(self, this);
   }
 }
diff --git a/...me/src/main/java/org/enso/interpreter/node/expression/builtin/number/integer/DivNode.java b/...me/src/main/java/org/enso/interpreter/node/expression/builtin/number/integer/DivNode.java
@@ -7,9 +7,7 @@
 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.EnsoContext;
-import org.enso.interpreter.runtime.builtin.Builtins;
 import org.enso.interpreter.runtime.error.DataflowError;
-import org.enso.interpreter.runtime.error.PanicException;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
 
 @BuiltinMethod(type = "Integer", name = "div", description = "Division of numbers.")
@@ -57,8 +55,6 @@ Object doBigInteger(EnsoBigInteger self, EnsoBigInteger that) {
 
   @Fallback
   Object doOther(Object self, Object that) {
-    Builtins builtins = EnsoContext.get(this).getBuiltins();
-    var integer = builtins.number().getInteger();
-    throw new PanicException(builtins.error().makeTypeError(integer, self, "self"), this);
+    return IntegerUtils.throwTypeErrorIfNotInt(self, that, this);
   }
 }
diff --git a/...src/main/java/org/enso/interpreter/node/expression/builtin/number/integer/DivideNode.java b/...src/main/java/org/enso/interpreter/node/expression/builtin/number/integer/DivideNode.java
@@ -5,9 +5,6 @@
 import com.oracle.truffle.api.nodes.Node;
 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.runtime.number.EnsoBigInteger;
 
 @BuiltinMethod(type = "Integer", name = "/", description = "Division of numbers.")
@@ -49,9 +46,7 @@ static DivideNode build() {
   }
 
   @Fallback
-  double doOther(Object self, Object that) {
-    Builtins builtins = EnsoContext.get(this).getBuiltins();
-    var number = builtins.number().getNumber();
-    throw new PanicException(builtins.error().makeTypeError(number, self, "self"), this);
+  Object doOther(Object self, Object that) {
+    return IntegerUtils.throwTypeErrorIfNotInt(self, that, this);
   }
 }
diff --git a/.../src/main/java/org/enso/interpreter/node/expression/builtin/number/integer/FloorNode.java b/.../src/main/java/org/enso/interpreter/node/expression/builtin/number/integer/FloorNode.java
@@ -4,9 +4,6 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.nodes.Node;
 import org.enso.interpreter.dsl.BuiltinMethod;
-import org.enso.interpreter.runtime.EnsoContext;
-import org.enso.interpreter.runtime.builtin.Builtins;
-import org.enso.interpreter.runtime.error.PanicException;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
 
 @BuiltinMethod(type = "Integer", name = "floor", description = "Small integer floor.")
@@ -30,8 +27,6 @@ EnsoBigInteger doBigInt(EnsoBigInteger self) {
 
   @Fallback
   Object doOther(Object self) {
-    Builtins builtins = EnsoContext.get(this).getBuiltins();
-    var integer = builtins.number().getInteger();
-    throw new PanicException(builtins.error().makeTypeError(integer, self, "self"), this);
+    return IntegerUtils.throwTypeErrorIfNotInt(self, this);
   }
 }
diff --git a/...c/main/java/org/enso/interpreter/node/expression/builtin/number/integer/IntegerUtils.java b/...c/main/java/org/enso/interpreter/node/expression/builtin/number/integer/IntegerUtils.java
@@ -0,0 +1,30 @@
+package org.enso.interpreter.node.expression.builtin.number.integer;
+
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.nodes.Node;
+import org.enso.interpreter.runtime.EnsoContext;
+import org.enso.interpreter.runtime.error.PanicException;
+import org.enso.interpreter.runtime.library.dispatch.TypesLibrary;
+
+public final class IntegerUtils {
+  private IntegerUtils() {}
+
+  @TruffleBoundary
+  static PanicException throwTypeErrorIfNotInt(Object self, Object that, Node node) {
+    var builtins = EnsoContext.get(node).getBuiltins();
+    var intType = builtins.number().getInteger();
+    var selfType = TypesLibrary.getUncached().getType(self);
+    if (selfType != intType) {
+      return new PanicException(builtins.error().makeTypeError(intType, self, "self"), node);
+    } else {
+      return new PanicException(builtins.error().makeTypeError(intType, that, "that"), node);
+    }
+  }
+
+  @TruffleBoundary
+  static PanicException throwTypeErrorIfNotInt(Object self, Node node) {
+    var builtins = EnsoContext.get(node).getBuiltins();
+    var intType = builtins.number().getInteger();
+    return new PanicException(builtins.error().makeTypeError(intType, self, "self"), node);
+  }
+}
diff --git a/...me/src/main/java/org/enso/interpreter/node/expression/builtin/number/integer/ModNode.java b/...me/src/main/java/org/enso/interpreter/node/expression/builtin/number/integer/ModNode.java
@@ -7,9 +7,7 @@
 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.EnsoContext;
-import org.enso.interpreter.runtime.builtin.Builtins;
 import org.enso.interpreter.runtime.error.DataflowError;
-import org.enso.interpreter.runtime.error.PanicException;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
 
 @BuiltinMethod(type = "Integer", name = "%", description = "Modulo division of numbers.")
@@ -70,8 +68,6 @@ Object doBigInteger(EnsoBigInteger self, EnsoBigInteger that) {
 
   @Fallback
   Object doOther(Object self, Object that) {
-    Builtins builtins = EnsoContext.get(this).getBuiltins();
-    var number = builtins.number().getNumber();
-    throw new PanicException(builtins.error().makeTypeError(number, that, "that"), this);
+    return IntegerUtils.throwTypeErrorIfNotInt(self, that, this);
   }
 }
diff --git a/...c/main/java/org/enso/interpreter/node/expression/builtin/number/integer/MultiplyNode.java b/...c/main/java/org/enso/interpreter/node/expression/builtin/number/integer/MultiplyNode.java
@@ -6,9 +6,6 @@
 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.EnsoContext;
-import org.enso.interpreter.runtime.builtin.Builtins;
-import org.enso.interpreter.runtime.error.PanicException;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
 
 @BuiltinMethod(type = "Integer", name = "*", description = "Multiplication of numbers.")
@@ -58,8 +55,6 @@ Object doBigInteger(EnsoBigInteger self, EnsoBigInteger that) {
 
   @Fallback
   Object doOther(Object self, Object that) {
-    Builtins builtins = EnsoContext.get(this).getBuiltins();
-    var number = builtins.number().getNumber();
-    throw new PanicException(builtins.error().makeTypeError(number, that, "that"), this);
+    return IntegerUtils.throwTypeErrorIfNotInt(self, that, this);
   }
 }
diff --git a/...src/main/java/org/enso/interpreter/node/expression/builtin/number/integer/NegateNode.java b/...src/main/java/org/enso/interpreter/node/expression/builtin/number/integer/NegateNode.java
@@ -1,5 +1,6 @@
 package org.enso.interpreter.node.expression.builtin.number.integer;
 
+import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.nodes.Node;
 import org.enso.interpreter.dsl.BuiltinMethod;
@@ -31,4 +32,9 @@ Object doBigInt(EnsoBigInteger self) {
   Object doOverflow(long self) {
     return toEnsoNumberNode.execute(BigIntegerOps.negate(self));
   }
+
+  @Fallback
+  Object doOther(Object self) {
+    return IntegerUtils.throwTypeErrorIfNotInt(self, this);
+  }
 }
diff --git a/...me/src/main/java/org/enso/interpreter/node/expression/builtin/number/integer/PowNode.java b/...me/src/main/java/org/enso/interpreter/node/expression/builtin/number/integer/PowNode.java
@@ -8,9 +8,6 @@
 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.EnsoContext;
-import org.enso.interpreter.runtime.builtin.Builtins;
-import org.enso.interpreter.runtime.error.PanicException;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
 
 @BuiltinMethod(type = "Integer", name = "^", description = "Exponentiation of numbers.")
@@ -91,8 +88,6 @@ private static EnsoBigInteger toBigInteger(long self) {
 
   @Fallback
   Object doOther(Object self, Object that) {
-    Builtins builtins = EnsoContext.get(this).getBuiltins();
-    var number = builtins.number().getNumber();
-    throw new PanicException(builtins.error().makeTypeError(number, that, "that"), this);
+    return IntegerUtils.throwTypeErrorIfNotInt(self, that, this);
   }
 }
diff --git a/...c/main/java/org/enso/interpreter/node/expression/builtin/number/integer/SubtractNode.java b/...c/main/java/org/enso/interpreter/node/expression/builtin/number/integer/SubtractNode.java
@@ -6,9 +6,6 @@
 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.EnsoContext;
-import org.enso.interpreter.runtime.builtin.Builtins;
-import org.enso.interpreter.runtime.error.PanicException;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
 
 @BuiltinMethod(type = "Integer", name = "-", description = "Subtraction of numbers.")
@@ -58,8 +55,6 @@ Object doBigInteger(EnsoBigInteger self, EnsoBigInteger that) {
 
   @Fallback
   Object doOther(Object self, Object that) {
-    Builtins builtins = EnsoContext.get(this).getBuiltins();
-    var number = builtins.number().getNumber();
-    throw new PanicException(builtins.error().makeTypeError(number, that, "that"), this);
+    return IntegerUtils.throwTypeErrorIfNotInt(self, that, this);
   }
 }
diff --git a/.../main/java/org/enso/interpreter/node/expression/builtin/number/integer/ToDecimalNode.java b/.../main/java/org/enso/interpreter/node/expression/builtin/number/integer/ToDecimalNode.java
@@ -1,5 +1,6 @@
 package org.enso.interpreter.node.expression.builtin.number.integer;
 
+import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.nodes.Node;
 import org.enso.interpreter.dsl.BuiltinMethod;
@@ -26,4 +27,9 @@ public static ToDecimalNode build() {
   double doBigInt(EnsoBigInteger self) {
     return BigIntegerOps.toDouble(self.getValue());
   }
+
+  @Fallback
+  Object doOther(Object self) {
+    return IntegerUtils.throwTypeErrorIfNotInt(self, this);
+  }
 }