2 files changed, 6 insertions, 14 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 9b26faa3..c18e4184 100644
--- a/Application/org.eclipse.viatra.solver.language/model/generated/SolverLanguage.ecore
+++ b/Application/org.eclipse.viatra.solver.language/model/generated/SolverLanguage.ecore
@@ -32,7 +32,7 @@
   <eClassifiers xsi:type="ecore:EClass" name="StringSymbol" eSuperTypes="#//DataSymbol"/>

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

   <eClassifiers xsi:type="ecore:EClass" name="Object" eSuperTypes="#//ComplexObject"/>

-  <eClassifiers xsi:type="ecore:EClass" name="NamedObject" eSuperTypes="#//Object">

+  <eClassifiers xsi:type="ecore:EClass" name="NamedObject" eSuperTypes="#//Object #//Literal">

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

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="UnnamedObject" eSuperTypes="#//Object">

@@ -53,18 +53,14 @@
     <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="Predicate" eSuperTypes="#//Statement">

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

+    <eStructuralFeatures xsi:type="ecore:EReference" name="symbol" eType="#//ModelSymbol"

+        containment="true"/>

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

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

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

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

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="PredicateSymbol" eSuperTypes="#//Predicate">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="symbol" eType="#//ModelSymbol"

-        containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ErrorPredicate" eSuperTypes="#//Predicate">

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

-  </eClassifiers>

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

     <eStructuralFeatures xsi:type="ecore:EReference" name="variable" eType="#//Variable"

         containment="true"/>

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 c593e886..1da7a172 100644
--- a/Application/org.eclipse.viatra.solver.language/model/generated/SolverLanguage.genmodel
+++ b/Application/org.eclipse.viatra.solver.language/model/generated/SolverLanguage.genmodel
@@ -52,15 +52,11 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//StringObject/value"/>

     </genClasses>

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

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

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

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

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

     </genClasses>

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

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

-    </genClasses>

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

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

-    </genClasses>

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

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

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