diff options
author | 2021-06-26 21:43:55 +0200 | |
---|---|---|
committer | 2021-06-26 21:43:55 +0200 | |
commit | e92ebe4a61a106ff9c0e8f5bbbc3632f1dc60009 (patch) | |
tree | 29ae119d1e17ace16115a82eef60b5b0bd886aba /org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/resources/model/problem.ecore | |
parent | Add initial prototype (diff) | |
download | refinery-e92ebe4a61a106ff9c0e8f5bbbc3632f1dc60009.tar.gz refinery-e92ebe4a61a106ff9c0e8f5bbbc3632f1dc60009.tar.zst refinery-e92ebe4a61a106ff9c0e8f5bbbc3632f1dc60009.zip |
FIx scoping, extend grammar
Diffstat (limited to 'org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/resources/model/problem.ecore')
-rw-r--r-- | org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/resources/model/problem.ecore | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/resources/model/problem.ecore b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/resources/model/problem.ecore index 9b87280d..dd52134b 100644 --- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/resources/model/problem.ecore +++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/resources/model/problem.ecore | |||
@@ -2,7 +2,7 @@ | |||
2 | <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | 2 | <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
3 | xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="problem" nsURI="http://www.eclipse.org/viatra/solver/language/model/Problem" | 3 | xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="problem" nsURI="http://www.eclipse.org/viatra/solver/language/model/Problem" |
4 | nsPrefix="problem"> | 4 | nsPrefix="problem"> |
5 | <eClassifiers xsi:type="ecore:EClass" name="Problem"> | 5 | <eClassifiers xsi:type="ecore:EClass" name="Problem" eSuperTypes="#//NamedElement"> |
6 | <eStructuralFeatures xsi:type="ecore:EReference" name="nodes" upperBound="-1" | 6 | <eStructuralFeatures xsi:type="ecore:EReference" name="nodes" upperBound="-1" |
7 | eType="#//Node" containment="true"/> | 7 | eType="#//Node" containment="true"/> |
8 | <eStructuralFeatures xsi:type="ecore:EReference" name="statements" upperBound="-1" | 8 | <eStructuralFeatures xsi:type="ecore:EReference" name="statements" upperBound="-1" |
@@ -15,6 +15,8 @@ | |||
15 | eType="#//ClassDeclaration"/> | 15 | eType="#//ClassDeclaration"/> |
16 | <eStructuralFeatures xsi:type="ecore:EReference" name="referenceDeclarations" | 16 | <eStructuralFeatures xsi:type="ecore:EReference" name="referenceDeclarations" |
17 | upperBound="-1" eType="#//ReferenceDeclaration" containment="true"/> | 17 | upperBound="-1" eType="#//ReferenceDeclaration" containment="true"/> |
18 | <eStructuralFeatures xsi:type="ecore:EReference" name="newNode" eType="#//Node" | ||
19 | containment="true"/> | ||
18 | </eClassifiers> | 20 | </eClassifiers> |
19 | <eClassifiers xsi:type="ecore:EClass" name="ReferenceDeclaration" eSuperTypes="#//Relation"> | 21 | <eClassifiers xsi:type="ecore:EClass" name="ReferenceDeclaration" eSuperTypes="#//Relation"> |
20 | <eStructuralFeatures xsi:type="ecore:EReference" name="referenceType" eType="#//ClassDeclaration"/> | 22 | <eStructuralFeatures xsi:type="ecore:EReference" name="referenceType" eType="#//ClassDeclaration"/> |
@@ -44,9 +46,9 @@ | |||
44 | <eClassifiers xsi:type="ecore:EClass" name="Literal" abstract="true"/> | 46 | <eClassifiers xsi:type="ecore:EClass" name="Literal" abstract="true"/> |
45 | <eClassifiers xsi:type="ecore:EClass" name="Atom" eSuperTypes="#//Literal"> | 47 | <eClassifiers xsi:type="ecore:EClass" name="Atom" eSuperTypes="#//Literal"> |
46 | <eStructuralFeatures xsi:type="ecore:EReference" name="relation" eType="#//Relation"/> | 48 | <eStructuralFeatures xsi:type="ecore:EReference" name="relation" eType="#//Relation"/> |
47 | <eStructuralFeatures xsi:type="ecore:EReference" name="arguments" upperBound="-1" | ||
48 | eType="#//Variable"/> | ||
49 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="transitiveClosure" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> | 49 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="transitiveClosure" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> |
50 | <eStructuralFeatures xsi:type="ecore:EReference" name="arguments" upperBound="-1" | ||
51 | eType="#//Argument" containment="true"/> | ||
50 | </eClassifiers> | 52 | </eClassifiers> |
51 | <eClassifiers xsi:type="ecore:EClass" name="ImplicitVariable" eSuperTypes="#//Variable"/> | 53 | <eClassifiers xsi:type="ecore:EClass" name="ImplicitVariable" eSuperTypes="#//Variable"/> |
52 | <eClassifiers xsi:type="ecore:EClass" name="NegativeLiteral" eSuperTypes="#//ExistentialQuantifier #//Literal"> | 54 | <eClassifiers xsi:type="ecore:EClass" name="NegativeLiteral" eSuperTypes="#//ExistentialQuantifier #//Literal"> |
@@ -91,4 +93,10 @@ | |||
91 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="exactValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" | 93 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="exactValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" |
92 | defaultValueLiteral="1"/> | 94 | defaultValueLiteral="1"/> |
93 | </eClassifiers> | 95 | </eClassifiers> |
96 | <eClassifiers xsi:type="ecore:EClass" name="UnboundedMultiplicity" eSuperTypes="#//Multiplicity"/> | ||
97 | <eClassifiers xsi:type="ecore:EClass" name="Argument"> | ||
98 | <eStructuralFeatures xsi:type="ecore:EReference" name="variable" eType="#//Variable"/> | ||
99 | <eStructuralFeatures xsi:type="ecore:EReference" name="singletonVariable" eType="#//ImplicitVariable" | ||
100 | containment="true"/> | ||
101 | </eClassifiers> | ||
94 | </ecore:EPackage> | 102 | </ecore:EPackage> |