diff options
author | Kristóf Marussy <kristof@marussy.com> | 2024-02-02 16:28:19 +0100 |
---|---|---|
committer | Kristóf Marussy <kristof@marussy.com> | 2024-02-02 17:36:24 +0100 |
commit | 2dfcb286216419976368ad926f8ac7f018aa2bf9 (patch) | |
tree | b9d235ebf2049e42e58126e743c782333d64681a /subprojects/language-model/src/main | |
parent | refactor: serialize solutions as modules (diff) | |
download | refinery-2dfcb286216419976368ad926f8ac7f018aa2bf9.tar.gz refinery-2dfcb286216419976368ad926f8ac7f018aa2bf9.tar.zst refinery-2dfcb286216419976368ad926f8ac7f018aa2bf9.zip |
refactor(language): name disambiguation
* Use fully qualified names starting with :: (as in C++) to unambiguously refer
to an element.
* Name shadowing within modules.
Diffstat (limited to 'subprojects/language-model/src/main')
4 files changed, 10 insertions, 2 deletions
diff --git a/subprojects/language-model/src/main/resources/model/problem.ecore b/subprojects/language-model/src/main/resources/model/problem.ecore index aa05a2fe..f7c85290 100644 --- a/subprojects/language-model/src/main/resources/model/problem.ecore +++ b/subprojects/language-model/src/main/resources/model/problem.ecore | |||
@@ -270,4 +270,8 @@ | |||
270 | <eLiterals name="ATOM" value="1"/> | 270 | <eLiterals name="ATOM" value="1"/> |
271 | <eLiterals name="MULTI" value="2"/> | 271 | <eLiterals name="MULTI" value="2"/> |
272 | </eClassifiers> | 272 | </eClassifiers> |
273 | <eClassifiers xsi:type="ecore:EClass" name="ImportStatement" eSuperTypes="#//Statement"> | ||
274 | <eStructuralFeatures xsi:type="ecore:EReference" name="importedModule" eType="#//Problem"/> | ||
275 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="alias" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> | ||
276 | </eClassifiers> | ||
273 | </ecore:EPackage> | 277 | </ecore:EPackage> |
diff --git a/subprojects/language-model/src/main/resources/model/problem.ecore.license b/subprojects/language-model/src/main/resources/model/problem.ecore.license index e5db6ccd..a73a3364 100644 --- a/subprojects/language-model/src/main/resources/model/problem.ecore.license +++ b/subprojects/language-model/src/main/resources/model/problem.ecore.license | |||
@@ -1,3 +1,3 @@ | |||
1 | SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/> | 1 | SPDX-FileCopyrightText: 2021-2024 The Refinery Authors <https://refinery.tools/> |
2 | 2 | ||
3 | SPDX-License-Identifier: EPL-2.0 | 3 | SPDX-License-Identifier: EPL-2.0 |
diff --git a/subprojects/language-model/src/main/resources/model/problem.genmodel b/subprojects/language-model/src/main/resources/model/problem.genmodel index be8b62eb..85cd802b 100644 --- a/subprojects/language-model/src/main/resources/model/problem.genmodel +++ b/subprojects/language-model/src/main/resources/model/problem.genmodel | |||
@@ -238,5 +238,9 @@ | |||
238 | <genClasses ecoreClass="problem.ecore#//LogicConstant"> | 238 | <genClasses ecoreClass="problem.ecore#//LogicConstant"> |
239 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//LogicConstant/logicValue"/> | 239 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//LogicConstant/logicValue"/> |
240 | </genClasses> | 240 | </genClasses> |
241 | <genClasses ecoreClass="problem.ecore#//ImportStatement"> | ||
242 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//ImportStatement/importedModule"/> | ||
243 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//ImportStatement/alias"/> | ||
244 | </genClasses> | ||
241 | </genPackages> | 245 | </genPackages> |
242 | </genmodel:GenModel> | 246 | </genmodel:GenModel> |
diff --git a/subprojects/language-model/src/main/resources/model/problem.genmodel.license b/subprojects/language-model/src/main/resources/model/problem.genmodel.license index e5db6ccd..a73a3364 100644 --- a/subprojects/language-model/src/main/resources/model/problem.genmodel.license +++ b/subprojects/language-model/src/main/resources/model/problem.genmodel.license | |||
@@ -1,3 +1,3 @@ | |||
1 | SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/> | 1 | SPDX-FileCopyrightText: 2021-2024 The Refinery Authors <https://refinery.tools/> |
2 | 2 | ||
3 | SPDX-License-Identifier: EPL-2.0 | 3 | SPDX-License-Identifier: EPL-2.0 |