Fix the type of Type_Error's name field (#1504)

enso-org · Feb 24, 2021 · 299c598 · 299c598
1 parent 7aba8ff
commit 299c598
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 7 deletions.
diff --git a/...rpreter/node/expression/builtin/error/displaytext/NotInvokableErrorToDisplayTextNode.java b/...rpreter/node/expression/builtin/error/displaytext/NotInvokableErrorToDisplayTextNode.java
@@ -22,7 +22,8 @@ static NotInvokableErrorToDisplayTextNode build() {
   @Specialization
   Text doAtom(Atom _this, @Cached TypeToDisplayTextNode displayTypeNode) {
     return Text.create("Type error: expected a function, but got ")
-        .add(displayTypeNode.execute(_this.getFields()[0]));
+        .add(displayTypeNode.execute(_this.getFields()[0]))
+        .add(".");
   }
 
   @Specialization

diff --git a/...nso/interpreter/node/expression/builtin/error/displaytext/TypeErrorToDisplayTextNode.java b/...nso/interpreter/node/expression/builtin/error/displaytext/TypeErrorToDisplayTextNode.java
@@ -22,9 +22,9 @@ static TypeErrorToDisplayTextNode build() {
   @Specialization
   Text doAtom(Atom _this, @Cached TypeToDisplayTextNode displayTypeNode) {
     try {
-      return Text.create("Type error: expected ")
+      return Text.create("Type error: expected `")
           .add(TypesGen.expectText(_this.getFields()[2]))
-          .add(" to be ")
+          .add("` to be ")
           .add(displayTypeNode.execute(_this.getFields()[0]))
           .add(", but got ")
           .add(displayTypeNode.execute(_this.getFields()[1]))

diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/builtin/Error.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/builtin/Error.java
@@ -99,7 +99,7 @@ public Error(Language language, ModuleScope scope) {
             .initializeFields(
                 new ArgumentDefinition(0, "name", ArgumentDefinition.ExecutionMode.EXECUTE));
     notInvokableError =
-        new AtomConstructor("Not_Invokable", scope)
+        new AtomConstructor("Not_Invokable_Error", scope)
             .initializeFields(
                 new ArgumentDefinition(0, "target", ArgumentDefinition.ExecutionMode.EXECUTE));
 
@@ -155,6 +155,11 @@ public Error(Language language, ModuleScope scope) {
         unsupportedArgumentsError,
         "to_display_text",
         UnsupportedArgumentTypesToDisplayTextMethodGen.makeFunction(language));
+    scope.registerConstructor(notInvokableError);
+    scope.registerMethod(
+        notInvokableError,
+        "to_display_text",
+        NotInvokableErrorToDisplayTextMethodGen.makeFunction(language));
   }
 
   /** @return the builtin {@code Syntax_Error} atom constructor. */
@@ -207,7 +212,7 @@ public Atom makeNoSuchMethodError(Object target, UnresolvedSymbol symbol) {
    * @return a runtime representation of the error.
    */
   public Atom makeTypeError(Object expected, Object actual, String name) {
-    return typeError.newInstance(expected, actual, name);
+    return typeError.newInstance(expected, actual, Text.create(name));
   }
 
   /**

diff --git a/engine/runtime/src/main/resources/Builtins.enso b/engine/runtime/src/main/resources/Builtins.enso
@@ -318,6 +318,14 @@ type Arithmetic_Error message
 @Builtin_Type
 type Invalid_Array_Index_Error array index
 
+## An error that occurs when an object is used as a function in a function
+   call, but it cannot be called.
+
+   Arguments:
+     - target: The called object.
+@Builtin_Type
+type Not_Invokable_Error target
+
 ## Panics.
 type Panic
 

diff --git a/engine/runtime/src/test/scala/org/enso/interpreter/test/instrument/RuntimeServerTest.scala b/engine/runtime/src/test/scala/org/enso/interpreter/test/instrument/RuntimeServerTest.scala
@@ -3001,7 +3001,7 @@ class RuntimeServerTest
           contextId,
           Seq(
             Api.ExecutionResult.Diagnostic.error(
-              "Not_Invokable 42",
+              "Not_Invokable_Error 42",
               Some(mainFile),
               Some(model.Range(model.Position(0, 7), model.Position(0, 24))),
               None,

diff --git a/engine/runtime/src/test/scala/org/enso/interpreter/test/semantic/TextTest.scala b/engine/runtime/src/test/scala/org/enso/interpreter/test/semantic/TextTest.scala
@@ -114,16 +114,20 @@ class TextTest extends InterpreterTest {
           |    IO.println (Compile_Error "error :(").to_display_text
           |    IO.println (Inexhaustive_Pattern_Match_Error 32).to_display_text
           |    IO.println (Arithmetic_Error "cannot frobnicate quaternions").to_display_text
+          |    IO.println ((Panic.recover (1 + "foo")).catch_primitive .to_display_text)
+          |    IO.println ((Panic.recover (7 1)).catch_primitive .to_display_text)
           |    IO.println (Arity_Error 10 20).to_display_text
           |""".stripMargin
       eval(code)
       consumeOut shouldEqual List(
         "Cons",
         "Syntax error: foo",
-        "Type error: expected myvar to be Nothing, but got Text.",
+        "Type error: expected `myvar` to be Nothing, but got Text.",
         "Compile error: error :(",
         "Inexhaustive pattern match: no branch matches 32 (Integer).",
         "Arithmetic error: cannot frobnicate quaternions",
+        "Type error: expected `that` to be Number, but got Text.",
+        "Type error: expected a function, but got 7 (Integer).",
         "Wrong number of arguments. Expected 10, but got 20."
       )
     }