refactor(language): name disambiguation

* Use fully qualified names starting with :: (as in C++) to unambiguously refer
  to an element.
* Name shadowing within modules.

3 files changed, 12 insertions, 6 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 b462fd70..7c649232 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
@@ -247,7 +247,7 @@ public class ModelInitializer {
         }
 
         private String getName(Relation relation) {
-                return semanticsUtils.getName(relation).orElseGet(() -> "::" + relationInfoMap.size());
+                return semanticsUtils.getNameWithoutRootPrefix(relation).orElseGet(() -> "::" + relationInfoMap.size());
         }
 
         private void collectMetamodel() {
@@ -659,7 +659,7 @@ public class ModelInitializer {
                         var variableOrNode = variableOrNodeExpr.getVariableOrNode();
                         if (variableOrNode instanceof Node node) {
                                 int nodeId = getNodeId(node);
-                                var tempVariable = Variable.of(semanticsUtils.getName(node).orElse("_" + nodeId));
+                                var tempVariable = Variable.of(semanticsUtils.getNameWithoutRootPrefix(node).orElse("_" + nodeId));
                                 literals.add(new ConstantLiteral(tempVariable, nodeId));
                                 argumentList.add(tempVariable);
                         } else if (variableOrNode instanceof tools.refinery.language.model.problem.Variable problemVariable) {
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ProblemTraceImpl.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ProblemTraceImpl.java
index f686e980..aef0fd89 100644
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ProblemTraceImpl.java
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ProblemTraceImpl.java
@@ -79,7 +79,7 @@ class ProblemTraceImpl implements ProblemTrace {
                 try {
                         return nodeTrace.getOrThrow(node);
                 } catch (IllegalStateException e) {
-                        var qualifiedName = semanticsUtils.getName(node);
+                        var qualifiedName = semanticsUtils.getNameWithoutRootPrefix(node);
                         throw new TracedException(node, "No node ID for " + qualifiedName, e);
                 }
         }
@@ -144,7 +144,7 @@ class ProblemTraceImpl implements ProblemTrace {
         public PartialRelation getPartialRelation(Relation relation) {
                 var partialRelation = mutableRelationTrace.get(relation);
                 if (partialRelation == null) {
-                        var qualifiedName = semanticsUtils.getName(relation);
+                        var qualifiedName = semanticsUtils.getNameWithoutRootPrefix(relation);
                         throw new TracedException(relation, "No partial relation for " + qualifiedName);
                 }
                 return partialRelation;
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 b72ba697..110295b2 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,6 +7,7 @@ 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.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.xtext.naming.IQualifiedNameConverter;
@@ -16,6 +17,7 @@ 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;
 
@@ -25,10 +27,14 @@ public class SemanticsUtils {
         private IQualifiedNameProvider qualifiedNameProvider;
 
         @Inject
+        @Named(ProblemQualifiedNameProvider.NAMED_DELEGATE)
+        private IQualifiedNameProvider delegateQualifiedNameProvider;
+
+        @Inject
         private IQualifiedNameConverter qualifiedNameConverter;
 
-        public Optional<String> getName(EObject eObject) {
-                var qualifiedName = qualifiedNameProvider.getFullyQualifiedName(eObject);
+        public Optional<String> getNameWithoutRootPrefix(EObject eObject) {
+                var qualifiedName = delegateQualifiedNameProvider.getFullyQualifiedName(eObject);
                 if (qualifiedName == null) {
                         return Optional.empty();
                 }