refactor(language): name disambiguation

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

4 files changed, 10 insertions, 2 deletions

diff --git a/subprojects/language-model/src/main/resources/model/problem.ecore b/subprojects/language-model/src/main/resources/model/problem.ecore
index aa05a2fe..f7c85290 100644
--- a/subprojects/language-model/src/main/resources/model/problem.ecore
+++ b/subprojects/language-model/src/main/resources/model/problem.ecore
@@ -270,4 +270,8 @@
     <eLiterals name="ATOM" value="1"/>
     <eLiterals name="MULTI" value="2"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ImportStatement" eSuperTypes="#//Statement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="importedModule" eType="#//Problem"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alias" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
 </ecore:EPackage>
diff --git a/subprojects/language-model/src/main/resources/model/problem.ecore.license b/subprojects/language-model/src/main/resources/model/problem.ecore.license
index e5db6ccd..a73a3364 100644
--- a/subprojects/language-model/src/main/resources/model/problem.ecore.license
+++ b/subprojects/language-model/src/main/resources/model/problem.ecore.license
@@ -1,3 +1,3 @@
-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
diff --git a/subprojects/language-model/src/main/resources/model/problem.genmodel b/subprojects/language-model/src/main/resources/model/problem.genmodel
index be8b62eb..85cd802b 100644
--- a/subprojects/language-model/src/main/resources/model/problem.genmodel
+++ b/subprojects/language-model/src/main/resources/model/problem.genmodel
@@ -238,5 +238,9 @@
     <genClasses ecoreClass="problem.ecore#//LogicConstant">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//LogicConstant/logicValue"/>
     </genClasses>
+    <genClasses ecoreClass="problem.ecore#//ImportStatement">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//ImportStatement/importedModule"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//ImportStatement/alias"/>
+    </genClasses>
   </genPackages>
 </genmodel:GenModel>
diff --git a/subprojects/language-model/src/main/resources/model/problem.genmodel.license b/subprojects/language-model/src/main/resources/model/problem.genmodel.license
index e5db6ccd..a73a3364 100644
--- a/subprojects/language-model/src/main/resources/model/problem.genmodel.license
+++ b/subprojects/language-model/src/main/resources/model/problem.genmodel.license
@@ -1,3 +1,3 @@
-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