Synthetic tokens for solver language

2 files changed, 19 insertions, 17 deletions

diff --git a/Application/org.eclipse.viatra.solver.language/model/generated/SolverLanguage.ecore b/Application/org.eclipse.viatra.solver.language/model/generated/SolverLanguage.ecore
index aa1c579f..bd516038 100644
--- a/Application/org.eclipse.viatra.solver.language/model/generated/SolverLanguage.ecore
+++ b/Application/org.eclipse.viatra.solver.language/model/generated/SolverLanguage.ecore
@@ -6,14 +6,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="statements" upperBound="-1"

         eType="#//Statement" containment="true"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Statement">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="abstract" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="superclasses" unique="false"

-        upperBound="-1" eType="#//NamedElement"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="members" upperBound="-1"

-        eType="#//MemberDefinition" containment="true"/>

-  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Statement"/>

   <eClassifiers xsi:type="ecore:EClass" name="PredicateDefinition" eSuperTypes="#//Statement">

     <eStructuralFeatures xsi:type="ecore:EReference" name="head" eType="#//Expression"

         containment="true"/>

@@ -110,11 +103,11 @@
   <eClassifiers xsi:type="ecore:EClass" name="Call" eSuperTypes="#//Expression">

     <eStructuralFeatures xsi:type="ecore:EReference" name="functor" eType="#//Reference"

         containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="argumentList" eType="#//ArgumentList"

-        containment="true"/>

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="transitiveClosure" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="reflexiveTransitiveClosure"

         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="argumentList" eType="#//ArgumentList"

+        containment="true"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="ArgumentList">

     <eStructuralFeatures xsi:type="ecore:EReference" name="arguments" upperBound="-1"

@@ -160,6 +153,14 @@
   <eClassifiers xsi:type="ecore:EClass" name="StringLiteral" eSuperTypes="#//Literal">

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

   </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ClassDefinition" eSuperTypes="#//Statement">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="abstract" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="superclasses" unique="false"

+        upperBound="-1" eType="#//NamedElement"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="members" upperBound="-1"

+        eType="#//MemberDefinition" containment="true"/>

+  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="MemberDefinition">

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="containment" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="#//NamedElement"/>

diff --git a/Application/org.eclipse.viatra.solver.language/model/generated/SolverLanguage.genmodel b/Application/org.eclipse.viatra.solver.language/model/generated/SolverLanguage.genmodel
index 4c88d381..53c17e2a 100644
--- a/Application/org.eclipse.viatra.solver.language/model/generated/SolverLanguage.genmodel
+++ b/Application/org.eclipse.viatra.solver.language/model/generated/SolverLanguage.genmodel
@@ -53,12 +53,7 @@
     <genClasses ecoreClass="SolverLanguage.ecore#//Problem">

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Problem/statements"/>

     </genClasses>

-    <genClasses ecoreClass="SolverLanguage.ecore#//Statement">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//Statement/abstract"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//Statement/name"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Statement/superclasses"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Statement/members"/>

-    </genClasses>

+    <genClasses ecoreClass="SolverLanguage.ecore#//Statement"/>

     <genClasses ecoreClass="SolverLanguage.ecore#//PredicateDefinition">

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//PredicateDefinition/head"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//PredicateDefinition/body"/>

@@ -105,9 +100,9 @@
     </genClasses>

     <genClasses ecoreClass="SolverLanguage.ecore#//Call">

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Call/functor"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Call/argumentList"/>

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//Call/transitiveClosure"/>

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//Call/reflexiveTransitiveClosure"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Call/argumentList"/>

     </genClasses>

     <genClasses ecoreClass="SolverLanguage.ecore#//ArgumentList">

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//ArgumentList/arguments"/>

@@ -143,6 +138,12 @@
     <genClasses ecoreClass="SolverLanguage.ecore#//StringLiteral">

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//StringLiteral/value"/>

     </genClasses>

+    <genClasses ecoreClass="SolverLanguage.ecore#//ClassDefinition">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//ClassDefinition/abstract"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//ClassDefinition/name"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//ClassDefinition/superclasses"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//ClassDefinition/members"/>

+    </genClasses>

     <genClasses ecoreClass="SolverLanguage.ecore#//MemberDefinition">

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//MemberDefinition/containment"/>

       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//MemberDefinition/type"/>