Invalid comparison throws Incomparable_Values rather than Type_Error

enso-org · Apr 15, 2023 · eca0069 · eca0069
1 parent 8718c99
commit eca0069
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 24 deletions.
diff --git a/...main/java/org/enso/interpreter/node/expression/builtin/number/bigInteger/GreaterNode.java b/...main/java/org/enso/interpreter/node/expression/builtin/number/bigInteger/GreaterNode.java
@@ -36,7 +36,7 @@ boolean doBigInteger(EnsoBigInteger self, EnsoBigInteger that) {
   @Fallback
   DataflowError doOther(EnsoBigInteger self, Object that) {
     var builtins = EnsoContext.get(this).getBuiltins();
-    var typeError = builtins.error().makeTypeError(builtins.number().getNumber(), that, "that");
-    return DataflowError.withoutTrace(typeError, this);
+    var incomparableValsErr = builtins.error().makeIncomparableValues(self, that);
+    return DataflowError.withoutTrace(incomparableValsErr, this);
   }
 }
diff --git a/...va/org/enso/interpreter/node/expression/builtin/number/bigInteger/GreaterOrEqualNode.java b/...va/org/enso/interpreter/node/expression/builtin/number/bigInteger/GreaterOrEqualNode.java
@@ -36,7 +36,7 @@ boolean doBigInteger(EnsoBigInteger self, EnsoBigInteger that) {
   @Fallback
   DataflowError doOther(EnsoBigInteger self, Object that) {
     var builtins = EnsoContext.get(this).getBuiltins();
-    var typeError = builtins.error().makeTypeError(builtins.number().getNumber(), that, "that");
-    return DataflowError.withoutTrace(typeError, this);
+    var incomparableValsErr = builtins.error().makeIncomparableValues(self, that);
+    return DataflowError.withoutTrace(incomparableValsErr, this);
   }
 }
diff --git a/...rc/main/java/org/enso/interpreter/node/expression/builtin/number/bigInteger/LessNode.java b/...rc/main/java/org/enso/interpreter/node/expression/builtin/number/bigInteger/LessNode.java
@@ -36,7 +36,7 @@ boolean doBigInteger(EnsoBigInteger self, EnsoBigInteger that) {
   @Fallback
   DataflowError doOther(EnsoBigInteger self, Object that) {
     var builtins = EnsoContext.get(this).getBuiltins();
-    var typeError = builtins.error().makeTypeError(builtins.number().getNumber(), that, "that");
-    return DataflowError.withoutTrace(typeError, this);
+    var incomparableValsErr = builtins.error().makeIncomparableValues(self, that);
+    return DataflowError.withoutTrace(incomparableValsErr, this);
   }
 }
diff --git a/.../java/org/enso/interpreter/node/expression/builtin/number/bigInteger/LessOrEqualNode.java b/.../java/org/enso/interpreter/node/expression/builtin/number/bigInteger/LessOrEqualNode.java
@@ -36,7 +36,7 @@ boolean doBigInteger(EnsoBigInteger self, EnsoBigInteger that) {
   @Fallback
   DataflowError doOther(EnsoBigInteger self, Object that) {
     var builtins = EnsoContext.get(this).getBuiltins();
-    var typeError = builtins.error().makeTypeError(builtins.number().getNumber(), that, "that");
-    return DataflowError.withoutTrace(typeError, this);
+    var incomparableValsErr = builtins.error().makeIncomparableValues(self, that);
+    return DataflowError.withoutTrace(incomparableValsErr, 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
@@ -36,7 +36,7 @@ boolean doBigInteger(double self, EnsoBigInteger that) {
   @Fallback
   DataflowError doOther(double self, Object that) {
     var builtins = EnsoContext.get(this).getBuiltins();
-    var typeError = builtins.error().makeTypeError(builtins.number().getNumber(), that, "that");
-    return DataflowError.withoutTrace(typeError, this);
+    var incomparableValsErr = builtins.error().makeIncomparableValues(self, that);
+    return DataflowError.withoutTrace(incomparableValsErr, this);
   }
 }
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
@@ -36,7 +36,7 @@ boolean doBigInteger(double self, EnsoBigInteger that) {
   @Fallback
   DataflowError doOther(double self, Object that) {
     var builtins = EnsoContext.get(this).getBuiltins();
-    var typeError = builtins.error().makeTypeError(builtins.number().getNumber(), that, "that");
-    return DataflowError.withoutTrace(typeError, this);
+    var incomparableValsErr = builtins.error().makeIncomparableValues(self, that);
+    return DataflowError.withoutTrace(incomparableValsErr, this);
   }
 }
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
@@ -36,7 +36,7 @@ boolean doBigInteger(double self, EnsoBigInteger that) {
   @Fallback
   DataflowError doOther(double self, Object that) {
     var builtins = EnsoContext.get(this).getBuiltins();
-    var typeError = builtins.error().makeTypeError(builtins.number().getNumber(), that, "that");
-    return DataflowError.withoutTrace(typeError, this);
+    var incomparableValsErr = builtins.error().makeIncomparableValues(self, that);
+    return DataflowError.withoutTrace(incomparableValsErr, this);
   }
 }
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
@@ -36,7 +36,7 @@ boolean doBigInteger(double self, EnsoBigInteger that) {
   @Fallback
   DataflowError doOther(double self, Object that) {
     var builtins = EnsoContext.get(this).getBuiltins();
-    var typeError = builtins.error().makeTypeError(builtins.number().getNumber(), that, "that");
-    return DataflowError.withoutTrace(typeError, this);
+    var incomparableValsErr = builtins.error().makeIncomparableValues(self, that);
+    return DataflowError.withoutTrace(incomparableValsErr, this);
   }
 }
diff --git a/...in/java/org/enso/interpreter/node/expression/builtin/number/smallInteger/GreaterNode.java b/...in/java/org/enso/interpreter/node/expression/builtin/number/smallInteger/GreaterNode.java
@@ -7,6 +7,7 @@
 import org.enso.interpreter.runtime.EnsoContext;
 import org.enso.interpreter.runtime.error.DataflowError;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
+import org.enso.interpreter.runtime.util.Utils;
 
 @BuiltinMethod(type = "Small_Integer", name = ">", description = "Comparison of numbers.")
 public abstract class GreaterNode extends Node {
@@ -35,7 +36,7 @@ boolean doBigInteger(long self, EnsoBigInteger that) {
   @Fallback
   DataflowError doOther(long self, Object that) {
     var builtins = EnsoContext.get(this).getBuiltins();
-    var typeError = builtins.error().makeTypeError(builtins.number().getNumber(), that, "that");
-    return DataflowError.withoutTrace(typeError, this);
+    var incomparableValsErr = builtins.error().makeIncomparableValues(self, that);
+    return DataflowError.withoutTrace(incomparableValsErr, this);
   }
 }
diff --git a/.../org/enso/interpreter/node/expression/builtin/number/smallInteger/GreaterOrEqualNode.java b/.../org/enso/interpreter/node/expression/builtin/number/smallInteger/GreaterOrEqualNode.java
@@ -35,7 +35,7 @@ boolean doBigInteger(long self, EnsoBigInteger that) {
   @Fallback
   DataflowError doOther(long self, Object that) {
     var builtins = EnsoContext.get(this).getBuiltins();
-    var typeError = builtins.error().makeTypeError(builtins.number().getNumber(), that, "that");
-    return DataflowError.withoutTrace(typeError, this);
+    var incomparableValsErr = builtins.error().makeIncomparableValues(self, that);
+    return DataflowError.withoutTrace(incomparableValsErr, this);
   }
 }
diff --git a/.../main/java/org/enso/interpreter/node/expression/builtin/number/smallInteger/LessNode.java b/.../main/java/org/enso/interpreter/node/expression/builtin/number/smallInteger/LessNode.java
@@ -7,6 +7,7 @@
 import org.enso.interpreter.runtime.EnsoContext;
 import org.enso.interpreter.runtime.error.DataflowError;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
+import org.enso.interpreter.runtime.util.Utils;
 
 @BuiltinMethod(type = "Small_Integer", name = "<", description = "Comparison of numbers.")
 public abstract class LessNode extends Node {
@@ -35,7 +36,7 @@ boolean doBigInteger(long self, EnsoBigInteger that) {
   @Fallback
   DataflowError doOther(long self, Object that) {
     var builtins = EnsoContext.get(this).getBuiltins();
-    var typeError = builtins.error().makeTypeError(builtins.number().getNumber(), that, "that");
-    return DataflowError.withoutTrace(typeError, this);
+    var incomparableValsErr = builtins.error().makeIncomparableValues(self, that);
+    return DataflowError.withoutTrace(incomparableValsErr, this);
   }
 }
diff --git a/...ava/org/enso/interpreter/node/expression/builtin/number/smallInteger/LessOrEqualNode.java b/...ava/org/enso/interpreter/node/expression/builtin/number/smallInteger/LessOrEqualNode.java
@@ -7,6 +7,7 @@
 import org.enso.interpreter.runtime.EnsoContext;
 import org.enso.interpreter.runtime.error.DataflowError;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
+import org.enso.interpreter.runtime.util.Utils;
 
 @BuiltinMethod(type = "Small_Integer", name = "<=", description = "Comparison of numbers.")
 public abstract class LessOrEqualNode extends Node {
@@ -35,7 +36,7 @@ boolean doBigInteger(long self, EnsoBigInteger that) {
   @Fallback
   DataflowError doOther(long self, Object that) {
     var builtins = EnsoContext.get(this).getBuiltins();
-    var typeError = builtins.error().makeTypeError(builtins.number().getNumber(), that, "that");
-    return DataflowError.withoutTrace(typeError, this);
+    var incomparableValsErr = builtins.error().makeIncomparableValues(self, that);
+    return DataflowError.withoutTrace(incomparableValsErr, this);
   }
 }