From 68e8c8ea4091482c43d810fdaa2fd6ddd6316d07 Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <kristof@marussy.com>
Date: Sat, 6 Nov 2021 16:02:37 +0100
Subject: fix(lang): mark transient references

Xtext fails to serialize non-transient references that have no
corresponding assignment in the grammar. Therefore, we mark

* Problem.nodes
* ClassDeclaration.newNode
* ExistentialQualifier.implicitVariables
* VariableOrNodeArgument.singletonVariable

as transient.

This will allow serializing Problem instances using the textual concrete
syntax for display.
---
 .../java/tools/refinery/language/model/GenerateProblemModel.mwe2  | 6 +++---
 language-model/src/main/resources/model/problem.ecore             | 8 ++++----
 language-model/src/main/resources/model/problem.genmodel          | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'language-model/src/main')

diff --git a/language-model/src/main/java/tools/refinery/language/model/GenerateProblemModel.mwe2 b/language-model/src/main/java/tools/refinery/language/model/GenerateProblemModel.mwe2
index 7f998448..c1518b4d 100644
--- a/language-model/src/main/java/tools/refinery/language/model/GenerateProblemModel.mwe2
+++ b/language-model/src/main/java/tools/refinery/language/model/GenerateProblemModel.mwe2
@@ -3,7 +3,7 @@ module tools.refinery.language.model.GenerateProblemModel
 Workflow {
 	bean = org.eclipse.emf.mwe.utils.StandaloneSetup {
 		projectMapping = {
-			projectName = "language-model"
+			projectName = "refinery-language-model"
 			path = "."
 		}
 	}
@@ -14,7 +14,7 @@ Workflow {
 
 	component = org.eclipse.emf.mwe2.ecore.EcoreGenerator {
 		generateCustomClasses = false
-		genModel = "platform:/resource/language-model/src/main/resources/model/problem.genmodel"
-		srcPath = "platform:/resource/language-model/src/main/emf-gen"
+		genModel = "platform:/resource/refinery-language-model/src/main/resources/model/problem.genmodel"
+		srcPath = "platform:/resource/refinery-language-model/src/main/emf-gen"
 	}
 }
diff --git a/language-model/src/main/resources/model/problem.ecore b/language-model/src/main/resources/model/problem.ecore
index 77211b66..582f67c8 100644
--- a/language-model/src/main/resources/model/problem.ecore
+++ b/language-model/src/main/resources/model/problem.ecore
@@ -3,7 +3,7 @@
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="problem" nsURI="https://refinery.tools/emf/2021/Problem" nsPrefix="problem">
   <eClassifiers xsi:type="ecore:EClass" name="Problem" eSuperTypes="#//NamedElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="nodes" upperBound="-1"
-        eType="#//Node" containment="true"/>
+        eType="#//Node" transient="true" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="statements" upperBound="-1"
         eType="#//Statement" containment="true"/>
   </eClassifiers>
@@ -15,7 +15,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="referenceDeclarations"
         upperBound="-1" eType="#//ReferenceDeclaration" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="newNode" eType="#//Node"
-        containment="true"/>
+        transient="true" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ReferenceDeclaration" eSuperTypes="#//Relation">
     <eStructuralFeatures xsi:type="ecore:EReference" name="referenceType" eType="#//Relation"/>
@@ -52,7 +52,7 @@
   <eClassifiers xsi:type="ecore:EClass" name="ExistentialQuantifier" abstract="true"
       interface="true">
     <eStructuralFeatures xsi:type="ecore:EReference" name="implicitVariables" upperBound="-1"
-        eType="#//ImplicitVariable" containment="true"/>
+        eType="#//ImplicitVariable" transient="true" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Assertion" eSuperTypes="#//Statement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="relation" eType="#//Relation"/>
@@ -95,7 +95,7 @@
   <eClassifiers xsi:type="ecore:EClass" name="VariableOrNodeArgument" eSuperTypes="#//Argument">
     <eStructuralFeatures xsi:type="ecore:EReference" name="variableOrNode" eType="#//VariableOrNode"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="singletonVariable" eType="#//ImplicitVariable"
-        containment="true"/>
+        transient="true" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="EnumDeclaration" eSuperTypes="#//Relation #//Statement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="literals" upperBound="-1"
diff --git a/language-model/src/main/resources/model/problem.genmodel b/language-model/src/main/resources/model/problem.genmodel
index 094533e7..3e0ee35e 100644
--- a/language-model/src/main/resources/model/problem.genmodel
+++ b/language-model/src/main/resources/model/problem.genmodel
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
-    modelDirectory="/language-model/src/main/emf-gen" creationIcons="false"
+    modelDirectory="/refinery-language-model/src/main/emf-gen" creationIcons="false"
     editDirectory="/language-edit/src/main/emf-gen" editorDirectory="/org.eclipse.viatra.solver.language.model.editor/src-gen"
     modelPluginID="language-model" modelName="Problem" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     codeFormatting="true" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
-- 
cgit v1.2.3-70-g09d2