4 files changed, 38 insertions, 5 deletions

diff --git a/subprojects/language-model/src/main/resources/model/problem.ecore b/subprojects/language-model/src/main/resources/model/problem.ecore
index 74229a89..97355516 100644
--- a/subprojects/language-model/src/main/resources/model/problem.ecore
+++ b/subprojects/language-model/src/main/resources/model/problem.ecore
@@ -6,6 +6,9 @@
         eType="#//Node" transient="true" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="statements" upperBound="-1"
         eType="#//Statement" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//ModuleKind"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="explicitKind" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        transient="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ClassDeclaration" eSuperTypes="#//Statement #//Relation">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="abstract" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
@@ -109,9 +112,10 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="node" eType="#//Node"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="AssertionArgument" abstract="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="IndividualDeclaration" eSuperTypes="#//Statement">
+  <eClassifiers xsi:type="ecore:EClass" name="NodeDeclaration" eSuperTypes="#//Statement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="nodes" upperBound="-1"
         eType="#//Node" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//NodeKind"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="WildcardAssertionArgument" eSuperTypes="#//AssertionArgument"/>
   <eClassifiers xsi:type="ecore:EClass" name="ParametricDefinition" abstract="true"
@@ -259,4 +263,17 @@
   <eClassifiers xsi:type="ecore:EClass" name="LogicConstant" eSuperTypes="#//Constant">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="logicValue" eType="#//LogicValue"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="ModuleKind">
+    <eLiterals name="PROBLEM"/>
+    <eLiterals name="MODULE" value="1"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="NodeKind">
+    <eLiterals name="NODE"/>
+    <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 b5aa81c4..23458ee5 100644
--- a/subprojects/language-model/src/main/resources/model/problem.genmodel
+++ b/subprojects/language-model/src/main/resources/model/problem.genmodel
@@ -64,9 +64,20 @@
       <genEnumLiterals ecoreEnumLiteral="problem.ecore#//PrimitiveType/REAL"/>
       <genEnumLiterals ecoreEnumLiteral="problem.ecore#//PrimitiveType/STRING"/>
     </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="problem.ecore#//ModuleKind">
+      <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ModuleKind/PROBLEM"/>
+      <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ModuleKind/MODULE"/>
+    </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="problem.ecore#//NodeKind">
+      <genEnumLiterals ecoreEnumLiteral="problem.ecore#//NodeKind/NODE"/>
+      <genEnumLiterals ecoreEnumLiteral="problem.ecore#//NodeKind/ATOM"/>
+      <genEnumLiterals ecoreEnumLiteral="problem.ecore#//NodeKind/MULTI"/>
+    </genEnums>
     <genClasses ecoreClass="problem.ecore#//Problem">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Problem/nodes"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Problem/statements"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//Problem/kind"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//Problem/explicitKind"/>
     </genClasses>
     <genClasses ecoreClass="problem.ecore#//ClassDeclaration">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//ClassDeclaration/abstract"/>
@@ -144,8 +155,9 @@
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//NodeAssertionArgument/node"/>
     </genClasses>
     <genClasses ecoreClass="problem.ecore#//AssertionArgument"/>
-    <genClasses ecoreClass="problem.ecore#//IndividualDeclaration">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//IndividualDeclaration/nodes"/>
+    <genClasses ecoreClass="problem.ecore#//NodeDeclaration">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//NodeDeclaration/nodes"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//NodeDeclaration/kind"/>
     </genClasses>
     <genClasses ecoreClass="problem.ecore#//WildcardAssertionArgument"/>
     <genClasses ecoreClass="problem.ecore#//ParametricDefinition">
@@ -227,5 +239,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