Search constructors when resolving UnresolvedSymbol

enso-org · Dec 29, 2023 · 23bc507 · 23bc507
1 parent 27431c1
commit 23bc507
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/...time/src/main/java/org/enso/interpreter/node/callable/argument/ReadArgumentCheckNode.java b/...time/src/main/java/org/enso/interpreter/node/callable/argument/ReadArgumentCheckNode.java
@@ -33,6 +33,7 @@
 import org.enso.interpreter.runtime.EnsoContext;
 import org.enso.interpreter.runtime.callable.Annotation;
 import org.enso.interpreter.runtime.callable.UnresolvedConversion;
+import org.enso.interpreter.runtime.callable.UnresolvedSymbol;
 import org.enso.interpreter.runtime.callable.argument.ArgumentDefinition;
 import org.enso.interpreter.runtime.callable.argument.ArgumentDefinition.ExecutionMode;
 import org.enso.interpreter.runtime.callable.argument.CallArgument;
@@ -238,7 +239,7 @@ String expectedTypeMessage() {
   }
 
   abstract static class TypeCheckNode extends ReadArgumentCheckNode {
-    private final Type expectedType;
+    final Type expectedType;
     @Child IsValueOfTypeNode checkType;
     @CompilerDirectives.CompilationFinal private String expectedTypeMessage;
     @CompilerDirectives.CompilationFinal private LazyCheckRootNode lazyCheck;
@@ -254,6 +255,19 @@ Object doPanicSentinel(VirtualFrame frame, PanicSentinel panicSentinel) {
       throw panicSentinel;
     }
 
+    @Specialization(guards = "found != null")
+    Object doUnresolvedSymbol(
+        VirtualFrame frame,
+        UnresolvedSymbol symbol,
+        @Cached(neverDefault = false, value = "symbol.resolveFor(this, expectedType)")
+            Pair<Function, Type> found) {
+      if (found.getLeft().isFullyApplied()) {
+        return found.getLeft();
+      } else {
+        throw panicAtTheEnd(found.getLeft());
+      }
+    }
+
     @Specialization(rewriteOn = InvalidAssumptionException.class)
     Object doCheckNoConversionNeeded(VirtualFrame frame, Object v)
         throws InvalidAssumptionException {

diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/scope/ModuleScope.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/scope/ModuleScope.java
@@ -243,6 +243,11 @@ public Function lookupMethodDefinition(Type type, String name) {
       return definedHere.get();
     }
 
+    var constructedHere = type.getConstructors().get(name);
+    if (constructedHere != null) {
+      return constructedHere.getConstructorFunction();
+    }
+
     return imports.stream()
         .map(scope -> scope.getExportedMethod(type, name))
         .filter(Objects::nonNull)