From a238a2cc59008b71efa5bda4c1fc0d775467e504 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 4 Nov 2024 07:48:54 +0100 Subject: [PATCH 1/5] mbeddr.mpsutil: add a new language com.mbeddr.mpsutil.collections that provides nset --- CHANGELOG.md | 8 + .../com.mbeddr.platform.tests.build.mps | 125 +- .../models/com/mbeddr/platform/build.mps | 286 ++ .../com.mbeddr.mpsutil/.mps/modules.xml | 3 + .../com.mbeddr.mpsutil.collections.mpl | 160 + ...lections.generator.templates@generator.mps | 209 + ...om.mbeddr.mpsutil.collections.behavior.mps | 532 +++ ...mbeddr.mpsutil.collections.constraints.mps | 19 + .../com.mbeddr.mpsutil.collections.editor.mps | 170 + ...m.mbeddr.mpsutil.collections.structure.mps | 76 + ....mbeddr.mpsutil.collections.typesystem.mps | 688 +++ ...com.mbeddr.mpsutil.collections.runtime.msd | 52 + ...com.mbeddr.mpsutil.collections.runtime.mps | 1440 ++++++ ...com.mbeddr.mpsutil.collections.runtime.mps | 3968 +++++++++++++++++ ...com.mbeddr.mpsutil.collections.runtime.msd | 59 + 15 files changed, 7780 insertions(+), 15 deletions(-) create mode 100644 code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/com.mbeddr.mpsutil.collections.mpl create mode 100644 code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/generator/templates/com.mbeddr.mpsutil.collections.generator.templates@generator.mps create mode 100644 code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.behavior.mps create mode 100644 code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.constraints.mps create mode 100644 code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.editor.mps create mode 100644 code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.structure.mps create mode 100644 code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.typesystem.mps create mode 100644 code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.collections.runtime/com.mbeddr.mpsutil.collections.runtime.msd create mode 100644 code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.collections.runtime/models/com.mbeddr.mpsutil.collections.runtime.mps create mode 100644 code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.collections.runtime/models/test.com.mbeddr.mpsutil.collections.runtime.mps create mode 100644 code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.collections.runtime/test.com.mbeddr.mpsutil.collections.runtime.msd diff --git a/CHANGELOG.md b/CHANGELOG.md index 1332cd27151..ca5f58e0266 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file. The format is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). The project does _not_ follow Semantic Versioning and the changes are simply documented in reverse chronological order, grouped by calendar month. +# November 2024 + +## com.mbeddr.mpsutil + +### Feature + +- A new language `com.mbeddr.mpsutil.collections` was added that adds support for a set type `nset` that use nodes as the values of the set. Equivalence of nodes is checked structurally. The hash code calculation is done for all properties and children and the first level of references. The runtime solution also contains a more general class `EquivalenceHashSet` to implement hashsets with arbitrary `equals` and `hashcode` methods. + # October 2024 ## com.mbeddr.mpsutil diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps index 0c365eb2b5f..82029e811ed 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps @@ -1533,6 +1533,21 @@ + + + + + + + + + + + + + + + @@ -1583,21 +1598,6 @@ - - - - - - - - - - - - - - - @@ -2884,6 +2884,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps index e2ee7654303..c37d0cc78c8 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps @@ -19924,6 +19924,10 @@ + + + + @@ -20345,6 +20349,288 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/.mps/modules.xml b/code/languages/com.mbeddr.mpsutil/.mps/modules.xml index 33ed59ba987..f623dca2282 100644 --- a/code/languages/com.mbeddr.mpsutil/.mps/modules.xml +++ b/code/languages/com.mbeddr.mpsutil/.mps/modules.xml @@ -15,6 +15,7 @@ + @@ -112,6 +113,7 @@ + @@ -186,6 +188,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/com.mbeddr.mpsutil.collections.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/com.mbeddr.mpsutil.collections.mpl new file mode 100644 index 00000000000..aee2b3a12ad --- /dev/null +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/com.mbeddr.mpsutil.collections.mpl @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) + 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) + 2bdcefec-ba49-4b32-ab50-ebc7a41d5090(jetbrains.mps.lang.smodel#1139186730696) + f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure) + f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) + ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) + 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) + 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) + 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) + 83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections) + 7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3f2dbc2e-ad41-470f-b5f1-2869513d2b58(com.mbeddr.mpsutil.collections.runtime) + + + f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) + + + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/generator/templates/com.mbeddr.mpsutil.collections.generator.templates@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/generator/templates/com.mbeddr.mpsutil.collections.generator.templates@generator.mps new file mode 100644 index 00000000000..da5c9c9735d --- /dev/null +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/generator/templates/com.mbeddr.mpsutil.collections.generator.templates@generator.mps @@ -0,0 +1,209 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.behavior.mps new file mode 100644 index 00000000000..0d9ecf11492 --- /dev/null +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.behavior.mps @@ -0,0 +1,532 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.constraints.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.constraints.mps new file mode 100644 index 00000000000..3c1dd970c1c --- /dev/null +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.constraints.mps @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.editor.mps new file mode 100644 index 00000000000..0ce5dda7360 --- /dev/null +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.editor.mps @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.structure.mps new file mode 100644 index 00000000000..db79e937d24 --- /dev/null +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.structure.mps @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.typesystem.mps new file mode 100644 index 00000000000..ec81675a8e4 --- /dev/null +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.typesystem.mps @@ -0,0 +1,688 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.collections.runtime/com.mbeddr.mpsutil.collections.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.collections.runtime/com.mbeddr.mpsutil.collections.runtime.msd new file mode 100644 index 00000000000..d32841e6fa3 --- /dev/null +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.collections.runtime/com.mbeddr.mpsutil.collections.runtime.msd @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) + 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) + 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) + ecfb9949-7433-4db5-85de-0f84d172e4ce(de.q60.mps.collections.libs) + 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) + c6420b75-4569-420d-aaf7-9bc590ad7b2a(com.mbeddr.mpsutil.comparator) + 9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime) + f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.collections.runtime/models/com.mbeddr.mpsutil.collections.runtime.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.collections.runtime/models/com.mbeddr.mpsutil.collections.runtime.mps new file mode 100644 index 00000000000..657df38a187 --- /dev/null +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.collections.runtime/models/com.mbeddr.mpsutil.collections.runtime.mps @@ -0,0 +1,1440 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.collections.runtime/models/test.com.mbeddr.mpsutil.collections.runtime.mps b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.collections.runtime/models/test.com.mbeddr.mpsutil.collections.runtime.mps new file mode 100644 index 00000000000..7e5086cc54f --- /dev/null +++ b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.collections.runtime/models/test.com.mbeddr.mpsutil.collections.runtime.mps @@ -0,0 +1,3968 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.collections.runtime/test.com.mbeddr.mpsutil.collections.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.collections.runtime/test.com.mbeddr.mpsutil.collections.runtime.msd new file mode 100644 index 00000000000..a9b27af7bd1 --- /dev/null +++ b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.collections.runtime/test.com.mbeddr.mpsutil.collections.runtime.msd @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) + ecfb9949-7433-4db5-85de-0f84d172e4ce(de.q60.mps.collections.libs) + ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) + f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) + 3f2dbc2e-ad41-470f-b5f1-2869513d2b58(com.mbeddr.mpsutil.collections.runtime) + 8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test) + 83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections) + e89e1550-b8fe-4f0d-a7fd-487968b42405(com.mbeddr.mpsutil.collections) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 9034a131e4dc76e27c2aa6c4803ce973cf38c5b6 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Sun, 10 Nov 2024 18:07:50 +0100 Subject: [PATCH 2/5] add some tests to show thatNodeEquivalence.equals(a,b) -> NodeEquivalence.hash (a) == NodeEquivalence.hash (b) --- ...com.mbeddr.mpsutil.collections.runtime.mps | 106 ++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.collections.runtime/models/test.com.mbeddr.mpsutil.collections.runtime.mps b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.collections.runtime/models/test.com.mbeddr.mpsutil.collections.runtime.mps index 7e5086cc54f..046180dfa5f 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.collections.runtime/models/test.com.mbeddr.mpsutil.collections.runtime.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.collections.runtime/models/test.com.mbeddr.mpsutil.collections.runtime.mps @@ -333,6 +333,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -424,6 +449,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -499,6 +549,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -590,6 +669,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + From e3be3e750520d8da7a9f33a721238c570ff532b4 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Sun, 10 Nov 2024 18:08:39 +0100 Subject: [PATCH 3/5] improve tests --- ...com.mbeddr.mpsutil.collections.runtime.mps | 145 +++--------------- 1 file changed, 18 insertions(+), 127 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.collections.runtime/models/test.com.mbeddr.mpsutil.collections.runtime.mps b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.collections.runtime/models/test.com.mbeddr.mpsutil.collections.runtime.mps index 046180dfa5f..80fb8e76b08 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.collections.runtime/models/test.com.mbeddr.mpsutil.collections.runtime.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.collections.runtime/models/test.com.mbeddr.mpsutil.collections.runtime.mps @@ -92,7 +92,6 @@ - @@ -101,6 +100,7 @@ + @@ -669,33 +669,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -837,89 +810,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1102,30 +992,31 @@ - - - + + + + + + + + + + + + + - - - - - - - - - - - - + + + @@ -1874,7 +1765,7 @@ - + From 37e7a0b9b5c34f1d7f7418b687d529f0e125f062 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 11 Nov 2024 18:07:23 +0100 Subject: [PATCH 4/5] mpsutil.collections: make the nset parameter look like a copy constructor --- .../models/com.mbeddr.mpsutil.collections.editor.mps | 12 ++++++++++-- .../com.mbeddr.mpsutil.collections.runtime.mps | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.editor.mps index 0ce5dda7360..75de723eaaf 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.editor.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.editor.mps @@ -145,8 +145,12 @@ - - + + + + + + @@ -164,6 +168,10 @@ + + + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.collections.runtime/models/com.mbeddr.mpsutil.collections.runtime.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.collections.runtime/models/com.mbeddr.mpsutil.collections.runtime.mps index 657df38a187..6a906aa6d10 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.collections.runtime/models/com.mbeddr.mpsutil.collections.runtime.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.collections.runtime/models/com.mbeddr.mpsutil.collections.runtime.mps @@ -1413,7 +1413,7 @@ - + @@ -1422,7 +1422,7 @@ - + From 53ddb1c6665c28defbfb842b065e193c520b0b36 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 12 Nov 2024 08:25:08 +0100 Subject: [PATCH 5/5] execute pending migrations --- .../com.mbeddr.mpsutil.collections.mpl | 5 ++--- ...l.collections.generator.templates@generator.mps | 6 +++--- .../com.mbeddr.mpsutil.collections.behavior.mps | 6 +++--- .../com.mbeddr.mpsutil.collections.editor.mps | 8 ++++---- .../com.mbeddr.mpsutil.collections.structure.mps | 2 +- .../com.mbeddr.mpsutil.collections.typesystem.mps | 6 +++--- .../com.mbeddr.mpsutil.collections.runtime.msd | 5 ++--- .../com.mbeddr.mpsutil.collections.runtime.mps | 14 +++++++------- ...test.com.mbeddr.mpsutil.collections.runtime.mps | 14 +++++++------- ...test.com.mbeddr.mpsutil.collections.runtime.msd | 5 ++--- 10 files changed, 34 insertions(+), 37 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/com.mbeddr.mpsutil.collections.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/com.mbeddr.mpsutil.collections.mpl index aee2b3a12ad..f52a4495bc7 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/com.mbeddr.mpsutil.collections.mpl +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/com.mbeddr.mpsutil.collections.mpl @@ -33,7 +33,7 @@ - + @@ -82,7 +82,6 @@ - c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) @@ -100,7 +99,7 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/generator/templates/com.mbeddr.mpsutil.collections.generator.templates@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/generator/templates/com.mbeddr.mpsutil.collections.generator.templates@generator.mps index da5c9c9735d..a27be5bb9b9 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/generator/templates/com.mbeddr.mpsutil.collections.generator.templates@generator.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/generator/templates/com.mbeddr.mpsutil.collections.generator.templates@generator.mps @@ -25,7 +25,7 @@ - + @@ -34,7 +34,7 @@ - + @@ -93,7 +93,7 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.behavior.mps index 0d9ecf11492..30ccff27d03 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.behavior.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.behavior.mps @@ -94,7 +94,7 @@ - + @@ -106,7 +106,7 @@ - + @@ -151,7 +151,7 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.editor.mps index 75de723eaaf..c86d2a0b086 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.editor.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.editor.mps @@ -27,7 +27,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -76,12 +76,12 @@ - + - + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.structure.mps index db79e937d24..8c195abc9f7 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.structure.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.structure.mps @@ -32,7 +32,7 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.typesystem.mps index ec81675a8e4..22e7ab8967c 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.typesystem.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.collections/models/com.mbeddr.mpsutil.collections.typesystem.mps @@ -64,7 +64,7 @@ - + @@ -94,7 +94,7 @@ - + @@ -179,7 +179,7 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.collections.runtime/com.mbeddr.mpsutil.collections.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.collections.runtime/com.mbeddr.mpsutil.collections.runtime.msd index d32841e6fa3..4e596bd6e27 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.collections.runtime/com.mbeddr.mpsutil.collections.runtime.msd +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.collections.runtime/com.mbeddr.mpsutil.collections.runtime.msd @@ -1,5 +1,5 @@ - + @@ -10,7 +10,6 @@ - 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) @@ -25,7 +24,7 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.collections.runtime/models/com.mbeddr.mpsutil.collections.runtime.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.collections.runtime/models/com.mbeddr.mpsutil.collections.runtime.mps index 6a906aa6d10..0f22675cb52 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.collections.runtime/models/com.mbeddr.mpsutil.collections.runtime.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.collections.runtime/models/com.mbeddr.mpsutil.collections.runtime.mps @@ -5,7 +5,7 @@ - + @@ -35,7 +35,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -143,7 +143,7 @@ - + @@ -166,7 +166,7 @@ - + @@ -191,7 +191,7 @@ - + @@ -200,7 +200,7 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.collections.runtime/models/test.com.mbeddr.mpsutil.collections.runtime.mps b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.collections.runtime/models/test.com.mbeddr.mpsutil.collections.runtime.mps index 80fb8e76b08..d08a6ac5495 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.collections.runtime/models/test.com.mbeddr.mpsutil.collections.runtime.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.collections.runtime/models/test.com.mbeddr.mpsutil.collections.runtime.mps @@ -4,7 +4,7 @@ - + @@ -33,7 +33,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -117,7 +117,7 @@ - + @@ -153,7 +153,7 @@ - + @@ -198,7 +198,7 @@ - + @@ -225,7 +225,7 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.collections.runtime/test.com.mbeddr.mpsutil.collections.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.collections.runtime/test.com.mbeddr.mpsutil.collections.runtime.msd index a9b27af7bd1..a48cae490ef 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.collections.runtime/test.com.mbeddr.mpsutil.collections.runtime.msd +++ b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.collections.runtime/test.com.mbeddr.mpsutil.collections.runtime.msd @@ -1,5 +1,5 @@ - + @@ -10,7 +10,6 @@ - 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) ecfb9949-7433-4db5-85de-0f84d172e4ce(de.q60.mps.collections.libs) @@ -26,7 +25,7 @@ - +