diff options
author | Kristóf Marussy <marussy@mit.bme.hu> | 2020-05-08 21:02:33 +0200 |
---|---|---|
committer | Kristóf Marussy <marussy@mit.bme.hu> | 2020-05-08 21:02:33 +0200 |
commit | 771e3773bb7ebbf6712724cb2b248467c9cc2e3c (patch) | |
tree | b1724af24b9c583b2780c7a2fe76e76fd174359d /Application/org.eclipse.viatra.solver.language/model | |
parent | Update solver language grammar (diff) | |
download | VIATRA-Generator-771e3773bb7ebbf6712724cb2b248467c9cc2e3c.tar.gz VIATRA-Generator-771e3773bb7ebbf6712724cb2b248467c9cc2e3c.tar.zst VIATRA-Generator-771e3773bb7ebbf6712724cb2b248467c9cc2e3c.zip |
Synthetic tokens for solver language
Diffstat (limited to 'Application/org.eclipse.viatra.solver.language/model')
-rw-r--r-- | Application/org.eclipse.viatra.solver.language/model/generated/SolverLanguage.ecore | 21 | ||||
-rw-r--r-- | Application/org.eclipse.viatra.solver.language/model/generated/SolverLanguage.genmodel | 15 |
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 @@ | |||
6 | <eStructuralFeatures xsi:type="ecore:EReference" name="statements" upperBound="-1" | 6 | <eStructuralFeatures xsi:type="ecore:EReference" name="statements" upperBound="-1" |
7 | eType="#//Statement" containment="true"/> | 7 | eType="#//Statement" containment="true"/> |
8 | </eClassifiers> | 8 | </eClassifiers> |
9 | <eClassifiers xsi:type="ecore:EClass" name="Statement"> | 9 | <eClassifiers xsi:type="ecore:EClass" name="Statement"/> |
10 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="abstract" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> | ||
11 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> | ||
12 | <eStructuralFeatures xsi:type="ecore:EReference" name="superclasses" unique="false" | ||
13 | upperBound="-1" eType="#//NamedElement"/> | ||
14 | <eStructuralFeatures xsi:type="ecore:EReference" name="members" upperBound="-1" | ||
15 | eType="#//MemberDefinition" containment="true"/> | ||
16 | </eClassifiers> | ||
17 | <eClassifiers xsi:type="ecore:EClass" name="PredicateDefinition" eSuperTypes="#//Statement"> | 10 | <eClassifiers xsi:type="ecore:EClass" name="PredicateDefinition" eSuperTypes="#//Statement"> |
18 | <eStructuralFeatures xsi:type="ecore:EReference" name="head" eType="#//Expression" | 11 | <eStructuralFeatures xsi:type="ecore:EReference" name="head" eType="#//Expression" |
19 | containment="true"/> | 12 | containment="true"/> |
@@ -110,11 +103,11 @@ | |||
110 | <eClassifiers xsi:type="ecore:EClass" name="Call" eSuperTypes="#//Expression"> | 103 | <eClassifiers xsi:type="ecore:EClass" name="Call" eSuperTypes="#//Expression"> |
111 | <eStructuralFeatures xsi:type="ecore:EReference" name="functor" eType="#//Reference" | 104 | <eStructuralFeatures xsi:type="ecore:EReference" name="functor" eType="#//Reference" |
112 | containment="true"/> | 105 | containment="true"/> |
113 | <eStructuralFeatures xsi:type="ecore:EReference" name="argumentList" eType="#//ArgumentList" | ||
114 | containment="true"/> | ||
115 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="transitiveClosure" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> | 106 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="transitiveClosure" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> |
116 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="reflexiveTransitiveClosure" | 107 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="reflexiveTransitiveClosure" |
117 | eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> | 108 | eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> |
109 | <eStructuralFeatures xsi:type="ecore:EReference" name="argumentList" eType="#//ArgumentList" | ||
110 | containment="true"/> | ||
118 | </eClassifiers> | 111 | </eClassifiers> |
119 | <eClassifiers xsi:type="ecore:EClass" name="ArgumentList"> | 112 | <eClassifiers xsi:type="ecore:EClass" name="ArgumentList"> |
120 | <eStructuralFeatures xsi:type="ecore:EReference" name="arguments" upperBound="-1" | 113 | <eStructuralFeatures xsi:type="ecore:EReference" name="arguments" upperBound="-1" |
@@ -160,6 +153,14 @@ | |||
160 | <eClassifiers xsi:type="ecore:EClass" name="StringLiteral" eSuperTypes="#//Literal"> | 153 | <eClassifiers xsi:type="ecore:EClass" name="StringLiteral" eSuperTypes="#//Literal"> |
161 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> | 154 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> |
162 | </eClassifiers> | 155 | </eClassifiers> |
156 | <eClassifiers xsi:type="ecore:EClass" name="ClassDefinition" eSuperTypes="#//Statement"> | ||
157 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="abstract" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> | ||
158 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> | ||
159 | <eStructuralFeatures xsi:type="ecore:EReference" name="superclasses" unique="false" | ||
160 | upperBound="-1" eType="#//NamedElement"/> | ||
161 | <eStructuralFeatures xsi:type="ecore:EReference" name="members" upperBound="-1" | ||
162 | eType="#//MemberDefinition" containment="true"/> | ||
163 | </eClassifiers> | ||
163 | <eClassifiers xsi:type="ecore:EClass" name="MemberDefinition"> | 164 | <eClassifiers xsi:type="ecore:EClass" name="MemberDefinition"> |
164 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="containment" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> | 165 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="containment" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> |
165 | <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="#//NamedElement"/> | 166 | <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 @@ | |||
53 | <genClasses ecoreClass="SolverLanguage.ecore#//Problem"> | 53 | <genClasses ecoreClass="SolverLanguage.ecore#//Problem"> |
54 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Problem/statements"/> | 54 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Problem/statements"/> |
55 | </genClasses> | 55 | </genClasses> |
56 | <genClasses ecoreClass="SolverLanguage.ecore#//Statement"> | 56 | <genClasses ecoreClass="SolverLanguage.ecore#//Statement"/> |
57 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//Statement/abstract"/> | ||
58 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//Statement/name"/> | ||
59 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Statement/superclasses"/> | ||
60 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Statement/members"/> | ||
61 | </genClasses> | ||
62 | <genClasses ecoreClass="SolverLanguage.ecore#//PredicateDefinition"> | 57 | <genClasses ecoreClass="SolverLanguage.ecore#//PredicateDefinition"> |
63 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//PredicateDefinition/head"/> | 58 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//PredicateDefinition/head"/> |
64 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//PredicateDefinition/body"/> | 59 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//PredicateDefinition/body"/> |
@@ -105,9 +100,9 @@ | |||
105 | </genClasses> | 100 | </genClasses> |
106 | <genClasses ecoreClass="SolverLanguage.ecore#//Call"> | 101 | <genClasses ecoreClass="SolverLanguage.ecore#//Call"> |
107 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Call/functor"/> | 102 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Call/functor"/> |
108 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Call/argumentList"/> | ||
109 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//Call/transitiveClosure"/> | 103 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//Call/transitiveClosure"/> |
110 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//Call/reflexiveTransitiveClosure"/> | 104 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//Call/reflexiveTransitiveClosure"/> |
105 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//Call/argumentList"/> | ||
111 | </genClasses> | 106 | </genClasses> |
112 | <genClasses ecoreClass="SolverLanguage.ecore#//ArgumentList"> | 107 | <genClasses ecoreClass="SolverLanguage.ecore#//ArgumentList"> |
113 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//ArgumentList/arguments"/> | 108 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//ArgumentList/arguments"/> |
@@ -143,6 +138,12 @@ | |||
143 | <genClasses ecoreClass="SolverLanguage.ecore#//StringLiteral"> | 138 | <genClasses ecoreClass="SolverLanguage.ecore#//StringLiteral"> |
144 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//StringLiteral/value"/> | 139 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//StringLiteral/value"/> |
145 | </genClasses> | 140 | </genClasses> |
141 | <genClasses ecoreClass="SolverLanguage.ecore#//ClassDefinition"> | ||
142 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//ClassDefinition/abstract"/> | ||
143 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//ClassDefinition/name"/> | ||
144 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//ClassDefinition/superclasses"/> | ||
145 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//ClassDefinition/members"/> | ||
146 | </genClasses> | ||
146 | <genClasses ecoreClass="SolverLanguage.ecore#//MemberDefinition"> | 147 | <genClasses ecoreClass="SolverLanguage.ecore#//MemberDefinition"> |
147 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//MemberDefinition/containment"/> | 148 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SolverLanguage.ecore#//MemberDefinition/containment"/> |
148 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//MemberDefinition/type"/> | 149 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SolverLanguage.ecore#//MemberDefinition/type"/> |