feat(language): type inference

* Customizable operator overloads.
* Customizable aggregation operators.
* Simplify ProblemQualifiedNameProvider.

3 files changed, 18 insertions, 22 deletions

diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ModelInitializer.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ModelInitializer.java
index 203baad6..2a623cf1 100644
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ModelInitializer.java
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ModelInitializer.java
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2021-2024 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
@@ -8,10 +8,10 @@ package tools.refinery.language.semantics;
 import com.google.inject.Inject;
 import tools.refinery.language.library.BuiltinLibrary;
 import tools.refinery.language.model.problem.*;
+import tools.refinery.language.scoping.imports.ImportAdapterProvider;
 import tools.refinery.language.scoping.imports.ImportCollector;
 import tools.refinery.language.semantics.internal.MutableSeed;
 import tools.refinery.language.utils.BuiltinSymbols;
-import tools.refinery.language.utils.ProblemDesugarer;
 import tools.refinery.language.utils.ProblemUtil;
 import tools.refinery.store.dse.propagation.PropagationBuilder;
 import tools.refinery.store.model.ModelStoreBuilder;
@@ -48,9 +48,6 @@ import java.util.*;
 
 public class ModelInitializer {
         @Inject
-        private ProblemDesugarer desugarer;
-
-        @Inject
         private SemanticsUtils semanticsUtils;
 
         @Inject
@@ -59,6 +56,9 @@ public class ModelInitializer {
         @Inject
         private ImportCollector importCollector;
 
+        @Inject
+        private ImportAdapterProvider importAdapterProvider;
+
         private Problem problem;
 
         private final Set<Problem> importedProblems = new HashSet<>();
@@ -96,8 +96,7 @@ public class ModelInitializer {
                 importedProblems.add(problem);
                 problemTrace.setProblem(problem);
                 try {
-                        builtinSymbols = desugarer.getBuiltinSymbols(problem).orElseThrow(() -> new IllegalArgumentException(
-                                        "Problem has no builtin library"));
+                        builtinSymbols = importAdapterProvider.getBuiltinSymbols(problem);
                         var nodeInfo = collectPartialRelation(builtinSymbols.node(), 1, TruthValue.TRUE, TruthValue.TRUE);
                         nodeRelation = nodeInfo.partialRelation();
                         metamodelBuilder.type(nodeRelation);
@@ -681,8 +680,8 @@ public class ModelInitializer {
                         var argumentList = toArgumentList(List.of(comparisonExpr.getLeft(), comparisonExpr.getRight()),
                                         localScope, literals);
                         boolean positive = switch (comparisonExpr.getOp()) {
-                                case EQ -> true;
-                                case NOT_EQ -> false;
+                                case NODE_EQ -> true;
+                                case NODE_NOT_EQ -> false;
                                 default -> throw new TracedException(
                                                 comparisonExpr, "Unsupported operator");
                         };
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/SemanticsUtils.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/SemanticsUtils.java
index 9c40e6df..5e0526bc 100644
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/SemanticsUtils.java
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/SemanticsUtils.java
@@ -7,7 +7,6 @@ package tools.refinery.language.semantics;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
-import com.google.inject.name.Named;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -20,7 +19,6 @@ import org.eclipse.xtext.scoping.IScope;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import tools.refinery.language.model.problem.Problem;
-import tools.refinery.language.naming.ProblemQualifiedNameProvider;
 
 import java.util.Optional;
 
@@ -30,17 +28,13 @@ public class SemanticsUtils {
         private IQualifiedNameProvider qualifiedNameProvider;
 
         @Inject
-        @Named(ProblemQualifiedNameProvider.NAMED_DELEGATE)
-        private IQualifiedNameProvider delegateQualifiedNameProvider;
-
-        @Inject
         private IQualifiedNameConverter qualifiedNameConverter;
 
         @Inject
         private IResourceDescriptionsProvider resourceDescriptionsProvider;
 
         public Optional<String> getNameWithoutRootPrefix(EObject eObject) {
-                var qualifiedName = delegateQualifiedNameProvider.getFullyQualifiedName(eObject);
+                var qualifiedName = qualifiedNameProvider.getFullyQualifiedName(eObject);
                 if (qualifiedName == null) {
                         return Optional.empty();
                 }
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/SolutionSerializer.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/SolutionSerializer.java
index 377a66f3..61e70bcd 100644
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/SolutionSerializer.java
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/SolutionSerializer.java
@@ -21,7 +21,8 @@ import org.eclipse.xtext.resource.XtextResourceSet;
 import org.eclipse.xtext.scoping.IScopeProvider;
 import tools.refinery.language.model.problem.*;
 import tools.refinery.language.naming.NamingUtil;
-import tools.refinery.language.utils.ProblemDesugarer;
+import tools.refinery.language.scoping.imports.ImportAdapterProvider;
+import tools.refinery.language.typesystem.SignatureProvider;
 import tools.refinery.language.utils.ProblemUtil;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.reasoning.ReasoningAdapter;
@@ -57,10 +58,13 @@ public class SolutionSerializer {
         private IScopeProvider scopeProvider;
 
         @Inject
-        private ProblemDesugarer desugarer;
+        private NodeNameProvider nameProvider;
 
         @Inject
-        private NodeNameProvider nameProvider;
+        private ImportAdapterProvider importAdapterProvider;
+
+        @Inject
+        private SignatureProvider signatureProvider;
 
         private ProblemTrace trace;
         private Model model;
@@ -223,8 +227,7 @@ public class SolutionSerializer {
         }
 
         private void addExistsAssertions() {
-                var builtinSymbols = desugarer.getBuiltinSymbols(problem).orElseThrow(() -> new IllegalStateException("No " +
-                                "builtin library in copied problem"));
+                var builtinSymbols = importAdapterProvider.getBuiltinSymbols(problem);
                 // Make sure to output exists assertions in a deterministic order.
                 var sortedNewNodes = new TreeMap<Integer, Node>();
                 for (var pair : trace.getNodeTrace().keyValuesView()) {
@@ -336,7 +339,7 @@ public class SolutionSerializer {
                 var assertion = ProblemFactory.eINSTANCE.createAssertion();
                 assertion.setDefault(true);
                 assertion.setRelation(relation);
-                int arity = ProblemUtil.getArity(relation);
+                int arity = signatureProvider.getArity(relation);
                 for (int i = 0; i < arity; i++) {
                         var argument = ProblemFactory.eINSTANCE.createWildcardAssertionArgument();
                         assertion.getArguments().add(argument);