diff options
author | 2021-08-20 18:36:01 +0200 | |
---|---|---|
committer | 2021-08-20 18:36:01 +0200 | |
commit | f0214f17a31d31609e45dbe0dc7dd6ceb98b21fe (patch) | |
tree | b23261e1b58355b706a776639c01fc7cb9a586d7 /language-model/src/main | |
parent | renamed TupleRelationView -> KeyOnlyView (diff) | |
download | refinery-f0214f17a31d31609e45dbe0dc7dd6ceb98b21fe.tar.gz refinery-f0214f17a31d31609e45dbe0dc7dd6ceb98b21fe.tar.zst refinery-f0214f17a31d31609e45dbe0dc7dd6ceb98b21fe.zip |
Simplify node naming
Diffstat (limited to 'language-model/src/main')
-rw-r--r-- | language-model/src/main/resources/model/problem.ecore | 8 | ||||
-rw-r--r-- | language-model/src/main/resources/model/problem.genmodel | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/language-model/src/main/resources/model/problem.ecore b/language-model/src/main/resources/model/problem.ecore index 43d69a86..95653ca4 100644 --- a/language-model/src/main/resources/model/problem.ecore +++ b/language-model/src/main/resources/model/problem.ecore | |||
@@ -64,12 +64,15 @@ | |||
64 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="#//LogicValue"/> | 64 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="#//LogicValue"/> |
65 | <eStructuralFeatures xsi:type="ecore:EReference" name="arguments" upperBound="-1" | 65 | <eStructuralFeatures xsi:type="ecore:EReference" name="arguments" upperBound="-1" |
66 | eType="#//AssertionArgument" containment="true"/> | 66 | eType="#//AssertionArgument" containment="true"/> |
67 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="default" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" | ||
68 | defaultValueLiteral="false"/> | ||
67 | </eClassifiers> | 69 | </eClassifiers> |
68 | <eClassifiers xsi:type="ecore:EClass" name="Node" eSuperTypes="#//VariableOrNode"/> | 70 | <eClassifiers xsi:type="ecore:EClass" name="Node" eSuperTypes="#//VariableOrNode"/> |
69 | <eClassifiers xsi:type="ecore:EEnum" name="LogicValue"> | 71 | <eClassifiers xsi:type="ecore:EEnum" name="LogicValue"> |
70 | <eLiterals name="TRUE" literal="TRUE"/> | 72 | <eLiterals name="TRUE" literal="TRUE"/> |
71 | <eLiterals name="FALSE" value="1"/> | 73 | <eLiterals name="FALSE" value="1"/> |
72 | <eLiterals name="UNKNOWN" value="2"/> | 74 | <eLiterals name="UNKNOWN" value="2"/> |
75 | <eLiterals name="ERROR" value="3"/> | ||
73 | </eClassifiers> | 76 | </eClassifiers> |
74 | <eClassifiers xsi:type="ecore:EClass" name="ScopeDeclaration" eSuperTypes="#//Statement"> | 77 | <eClassifiers xsi:type="ecore:EClass" name="ScopeDeclaration" eSuperTypes="#//Statement"> |
75 | <eStructuralFeatures xsi:type="ecore:EReference" name="typeScopes" upperBound="-1" | 78 | <eStructuralFeatures xsi:type="ecore:EReference" name="typeScopes" upperBound="-1" |
@@ -134,4 +137,9 @@ | |||
134 | <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="#//Constant" | 137 | <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="#//Constant" |
135 | containment="true"/> | 138 | containment="true"/> |
136 | </eClassifiers> | 139 | </eClassifiers> |
140 | <eClassifiers xsi:type="ecore:EClass" name="UniqueDeclaration" eSuperTypes="#//Statement"> | ||
141 | <eStructuralFeatures xsi:type="ecore:EReference" name="nodes" upperBound="-1" | ||
142 | eType="#//Node" containment="true"/> | ||
143 | </eClassifiers> | ||
144 | <eClassifiers xsi:type="ecore:EClass" name="WildcardAssertionArgument" eSuperTypes="#//AssertionArgument"/> | ||
137 | </ecore:EPackage> | 145 | </ecore:EPackage> |
diff --git a/language-model/src/main/resources/model/problem.genmodel b/language-model/src/main/resources/model/problem.genmodel index fb93d60e..baadd435 100644 --- a/language-model/src/main/resources/model/problem.genmodel +++ b/language-model/src/main/resources/model/problem.genmodel | |||
@@ -14,6 +14,7 @@ | |||
14 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//LogicValue/TRUE"/> | 14 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//LogicValue/TRUE"/> |
15 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//LogicValue/FALSE"/> | 15 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//LogicValue/FALSE"/> |
16 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//LogicValue/UNKNOWN"/> | 16 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//LogicValue/UNKNOWN"/> |
17 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//LogicValue/ERROR"/> | ||
17 | </genEnums> | 18 | </genEnums> |
18 | <genClasses ecoreClass="problem.ecore#//Problem"> | 19 | <genClasses ecoreClass="problem.ecore#//Problem"> |
19 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Problem/nodes"/> | 20 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Problem/nodes"/> |
@@ -64,6 +65,7 @@ | |||
64 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//Assertion/relation"/> | 65 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//Assertion/relation"/> |
65 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//Assertion/value"/> | 66 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//Assertion/value"/> |
66 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Assertion/arguments"/> | 67 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Assertion/arguments"/> |
68 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//Assertion/default"/> | ||
67 | </genClasses> | 69 | </genClasses> |
68 | <genClasses ecoreClass="problem.ecore#//Node"/> | 70 | <genClasses ecoreClass="problem.ecore#//Node"/> |
69 | <genClasses ecoreClass="problem.ecore#//ScopeDeclaration"> | 71 | <genClasses ecoreClass="problem.ecore#//ScopeDeclaration"> |
@@ -117,5 +119,9 @@ | |||
117 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//NodeValueAssertion/node"/> | 119 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//NodeValueAssertion/node"/> |
118 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//NodeValueAssertion/value"/> | 120 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//NodeValueAssertion/value"/> |
119 | </genClasses> | 121 | </genClasses> |
122 | <genClasses ecoreClass="problem.ecore#//UniqueDeclaration"> | ||
123 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//UniqueDeclaration/nodes"/> | ||
124 | </genClasses> | ||
125 | <genClasses ecoreClass="problem.ecore#//WildcardAssertionArgument"/> | ||
120 | </genPackages> | 126 | </genPackages> |
121 | </genmodel:GenModel> | 127 | </genmodel:GenModel> |