diff --git a/CHANGELOG.md b/CHANGELOG.md index acf2d62ddf3..992595acaef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,15 +9,25 @@ Semantic Versioning and the changes are simply documented in reverse chronologic ## com.mbeddr.mpsutil -### Feature +### Added - 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. +### Changes + +- The language `com.mbeddr.spreadsheat` was renamed to `com.mbeddr.spreadsheet`. + +### Removed + +- The language `com.mbeddr.mpsutil.projectview.favourites` was removed. Please use the MPS bookmarks manager instead: https://www.jetbrains.com/help/mps/navigating-through-the-source-code.html#use_bookmarks +- The stub solution `org.apache.batik` were removed. Please use `de.itemis.stubs.batik` from MPS-Extensions instead. +- The stub solution `org.xml` were removed. Please use `de.itemis.stubs.xml` from MPS-Extensions instead. + # October 2024 ## com.mbeddr.mpsutil -### Feature +### Added - Adds a caching mechanism for caching the retrieval of 'ILogicalChild' by 'ILogicalChildOwner' @@ -37,7 +47,7 @@ Semantic Versioning and the changes are simply documented in reverse chronologic ## com.mbeddr.mpsutil.interpreter -### Feature +### Added - Added user defineable call back function when trace node is added to the trace tree @@ -55,7 +65,7 @@ Semantic Versioning and the changes are simply documented in reverse chronologic ## com.mbeddr.mpsutil.checkinHandler -### Feature +### Added - A new kind of Checkin handlers (background handler) now support the interface `CommitCheck` which allows more options like running the code after the commit or in the background. diff --git a/README.md b/README.md index faca49395a8..6989e0e7a73 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ For more details please visit the [mbeddr landing page](https://github.com/mbedd ### Maven Dependencies -To use mbeddr or the mbeddr platform in your own project, you one of the following dependencies in your maven or gradle build script. The latest support MPS version is 2023.2: +To use mbeddr or the mbeddr platform in your own project, you one of the following dependencies in your maven or gradle build script. The latest support MPS version is 2024.1: [![mbeddr](https://img.shields.io/badge/Github%20pages-mbeddr-success)](https://github.com/orgs/mbeddr/packages?tab=packages&q=com.mbeddr.mbeddr) [![mbeddr platform](https://img.shields.io/badge/Github%20pages-mbeddr.platform-success)](https://github.com/orgs/mbeddr/packages?tab=packages&q=com.mbeddr.platform) @@ -37,7 +37,8 @@ To use mbeddr or the mbeddr platform in your own project, you one of the followi | MPS version | nexus status | | --------------- | --------------- | -| 2023.2 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/com/mbeddr/mbeddr/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/latest)](https://artifacts.itemis.cloud/#browse/browse:maven-mps:com%2Fmbeddr%2Fmbeddr) | +| 2024.1 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/com/mbeddr/mbeddr/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/latest)](https://artifacts.itemis.cloud/#browse/browse:maven-mps:com%2Fmbeddr%2Fmbeddr) | +| 2023.2 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/com/mbeddr/mbeddr/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2023.2')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:com%2Fmbeddr%2Fmbeddr) | | 2022.3 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/com/mbeddr/mbeddr/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2022.3')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:com%2Fmbeddr%2Fmbeddr) | | 2022.2 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/com/mbeddr/mbeddr/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2022.2')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:com%2Fmbeddr%2Fmbeddr) | | 2021.3 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/com/mbeddr/mbeddr/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2021.3')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:com%2Fmbeddr%2Fmbeddr) | @@ -54,7 +55,9 @@ To use mbeddr or the mbeddr platform in your own project, you one of the followi | MPS version | nexus status | | --------------- | --------------- | -| 2022.3 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/com/mbeddr/platform/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/latest)](https://artifacts.itemis.cloud/#browse/browse:maven-mps:com%2Fmbeddr%2Fplatform) | +| 2024.1 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/com/mbeddr/platform/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/latest)](https://artifacts.itemis.cloud/#browse/browse:maven-mps:com%2Fmbeddr%2Fplatform) | +| 2023.2 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/com/mbeddr/platform/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2023.2')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:com%2Fmbeddr%2Fplatform) | +| 2022.3 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/com/mbeddr/platform/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2022.3')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:com%2Fmbeddr%2Fplatform) | | 2022.2 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/com/mbeddr/platform/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2022.2')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:com%2Fmbeddr%2Fplatform) | | 2021.3 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/com/mbeddr/platform/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2021.3')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:com%2Fmbeddr%2Fplatform) | | 2021.2 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/com/mbeddr/platform/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2021.2')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:com%2Fmbeddr%2Fplatform) | diff --git a/build-allScripts.xml b/build-allScripts.xml index 4902427223e..8a1408b9d85 100644 --- a/build-allScripts.xml +++ b/build-allScripts.xml @@ -19,6 +19,7 @@ + @@ -44,25 +45,6 @@ - - - - com.mbeddr.allScripts - com.mbeddr.allScripts - ${mbeddr.version} - jetbrains.mps.core - jetbrains.mps.build - jetbrains.mps.debugger.api - jetbrains.mps.execution.api - jetbrains.mps.execution.languages - jetbrains.mps.execution.configurations - de.itemis.mps.extensions.build - - - - - - @@ -71,6 +53,7 @@ com.mbeddr.allScripts com.mbeddr.allScripts ${mbeddr.version} + com.intellij.modules.platform jetbrains.mps.core jetbrains.mps.build jetbrains.mps.debugger.api @@ -95,7 +78,6 @@ - @@ -137,7 +119,6 @@ - @@ -177,7 +158,6 @@ - @@ -217,7 +197,6 @@ - @@ -257,7 +236,6 @@ - @@ -290,48 +268,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -340,7 +276,6 @@ - @@ -380,7 +315,6 @@ - @@ -420,7 +354,6 @@ - @@ -461,7 +394,6 @@ - @@ -497,7 +429,7 @@ - com.mbeddr.allScripts.build.major.version=${major.version}${line.separator}com.mbeddr.allScripts.build.minor.version=${minor.version}${line.separator}com.mbeddr.allScripts.build.build=${build}${line.separator}com.mbeddr.allScripts.build.mbeddr.version=${mbeddr.version}${line.separator}mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}de.itemis.mps.extensions.versionNumber=${de.itemis.mps.extensions.versionNumber} + com.mbeddr.allScripts.build.major.version=${major.version}${line.separator}com.mbeddr.allScripts.build.minor.version=${minor.version}${line.separator}com.mbeddr.allScripts.build.build=${build}${line.separator}com.mbeddr.allScripts.build.mbeddr.version=${mbeddr.version}${line.separator}mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mps.runtimeBuild=${mps.runtimeBuild}${line.separator}mpsBootstrapCore.version.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}de.itemis.mps.extensions.versionNumber=${de.itemis.mps.extensions.versionNumber} @@ -511,7 +443,7 @@ - + @@ -525,110 +457,19 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - @@ -638,7 +479,6 @@ - @@ -673,6 +513,7 @@ + @@ -833,27 +674,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -863,6 +683,5 @@ - \ No newline at end of file diff --git a/build.gradle b/build.gradle index 5f70f198c7e..2e96f4ca28c 100644 --- a/build.gradle +++ b/build.gradle @@ -12,12 +12,12 @@ repositories { } downloadJbr { - jbrVersion = '17.0.8.1-b1000.32' + jbrVersion = '17.0.11-b1207.30' } //MPS version -ext.mpsMajor = "2023.2" -ext.mpsBuild = "2023.2.2" +ext.mpsMajor = "2024.1" +ext.mpsBuild = "2024.1.1" //MPS-extensions version ext.mpsExtensionsVersion = findNonEmptyProperty('mpsExtensionsVersion') ?: "$mpsMajor.+" diff --git a/code/applications/HeartBleed/.mps/migration.xml b/code/applications/HeartBleed/.mps/migration.xml index 81b873e7043..400c43bb13e 100644 --- a/code/applications/HeartBleed/.mps/migration.xml +++ b/code/applications/HeartBleed/.mps/migration.xml @@ -19,7 +19,8 @@ + - + \ No newline at end of file diff --git a/code/applications/HeartBleed/_spreferences/CodeReviewPreferences/module.msd b/code/applications/HeartBleed/_spreferences/CodeReviewPreferences/module.msd index 51ee3be0876..98bb12edfd2 100644 --- a/code/applications/HeartBleed/_spreferences/CodeReviewPreferences/module.msd +++ b/code/applications/HeartBleed/_spreferences/CodeReviewPreferences/module.msd @@ -21,6 +21,7 @@ + diff --git a/code/applications/HeartBleed/_spreferences/PlatformTemplates/module.msd b/code/applications/HeartBleed/_spreferences/PlatformTemplates/module.msd index f22d64e2f03..5b606c90792 100644 --- a/code/applications/HeartBleed/_spreferences/PlatformTemplates/module.msd +++ b/code/applications/HeartBleed/_spreferences/PlatformTemplates/module.msd @@ -28,6 +28,7 @@ + diff --git a/code/applications/HeartBleed/_spreferences/TypeSizeConfiguration/models/HeartBleed/__spreferences/TypeSizeConfiguration.mps b/code/applications/HeartBleed/_spreferences/TypeSizeConfiguration/models/HeartBleed/__spreferences/TypeSizeConfiguration.mps index 49a2de38f0e..0e2b3d08a75 100644 --- a/code/applications/HeartBleed/_spreferences/TypeSizeConfiguration/models/HeartBleed/__spreferences/TypeSizeConfiguration.mps +++ b/code/applications/HeartBleed/_spreferences/TypeSizeConfiguration/models/HeartBleed/__spreferences/TypeSizeConfiguration.mps @@ -1,6 +1,7 @@ + diff --git a/code/applications/HeartBleed/_spreferences/TypeSizeConfiguration/module.msd b/code/applications/HeartBleed/_spreferences/TypeSizeConfiguration/module.msd index deddbec2359..728c9a0bfe9 100644 --- a/code/applications/HeartBleed/_spreferences/TypeSizeConfiguration/module.msd +++ b/code/applications/HeartBleed/_spreferences/TypeSizeConfiguration/module.msd @@ -22,6 +22,7 @@ + diff --git a/code/applications/HeartBleed/solutions/NewSolution.msd b/code/applications/HeartBleed/solutions/NewSolution.msd index cc153e14046..9ff9ee5c9e2 100644 --- a/code/applications/HeartBleed/solutions/NewSolution.msd +++ b/code/applications/HeartBleed/solutions/NewSolution.msd @@ -44,6 +44,7 @@ + diff --git a/code/applications/IntegratedCExample/.mps/migration.xml b/code/applications/IntegratedCExample/.mps/migration.xml index 65858d6beb2..9599011bc99 100644 --- a/code/applications/IntegratedCExample/.mps/migration.xml +++ b/code/applications/IntegratedCExample/.mps/migration.xml @@ -20,11 +20,12 @@ + - + \ No newline at end of file diff --git a/code/applications/IntegratedCExample/_spreferences/CodeReviewPreferences/module.msd b/code/applications/IntegratedCExample/_spreferences/CodeReviewPreferences/module.msd index 4dd798cb39c..d49f0ca296a 100644 --- a/code/applications/IntegratedCExample/_spreferences/CodeReviewPreferences/module.msd +++ b/code/applications/IntegratedCExample/_spreferences/CodeReviewPreferences/module.msd @@ -21,6 +21,7 @@ + diff --git a/code/applications/IntegratedCExample/_spreferences/PlatformTemplates/module.msd b/code/applications/IntegratedCExample/_spreferences/PlatformTemplates/module.msd index 1324c0ed42b..59a97df8189 100644 --- a/code/applications/IntegratedCExample/_spreferences/PlatformTemplates/module.msd +++ b/code/applications/IntegratedCExample/_spreferences/PlatformTemplates/module.msd @@ -28,6 +28,7 @@ + diff --git a/code/applications/IntegratedCExample/_spreferences/TypeSizeConfiguration/models/IntegratedCExample/__spreferences/TypeSizeConfiguration.mps b/code/applications/IntegratedCExample/_spreferences/TypeSizeConfiguration/models/IntegratedCExample/__spreferences/TypeSizeConfiguration.mps index 5f635890c77..852c58ce0b6 100644 --- a/code/applications/IntegratedCExample/_spreferences/TypeSizeConfiguration/models/IntegratedCExample/__spreferences/TypeSizeConfiguration.mps +++ b/code/applications/IntegratedCExample/_spreferences/TypeSizeConfiguration/models/IntegratedCExample/__spreferences/TypeSizeConfiguration.mps @@ -1,6 +1,7 @@ + diff --git a/code/applications/IntegratedCExample/_spreferences/TypeSizeConfiguration/module.msd b/code/applications/IntegratedCExample/_spreferences/TypeSizeConfiguration/module.msd index 503fd0e043a..2275df02c85 100644 --- a/code/applications/IntegratedCExample/_spreferences/TypeSizeConfiguration/module.msd +++ b/code/applications/IntegratedCExample/_spreferences/TypeSizeConfiguration/module.msd @@ -22,6 +22,7 @@ + diff --git a/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/DomainSpecificLanguage.mpl b/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/DomainSpecificLanguage.mpl index 88989d3c09c..c8675ebe1a0 100644 --- a/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/DomainSpecificLanguage.mpl +++ b/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/DomainSpecificLanguage.mpl @@ -47,6 +47,7 @@ + @@ -88,12 +89,12 @@ - + @@ -180,12 +181,12 @@ - + diff --git a/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/languageModels/structure.mps b/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/languageModels/structure.mps index 2f64e3e7a1c..c61dcbbb799 100644 --- a/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/languageModels/structure.mps +++ b/code/applications/IntegratedCExample/languages/DomainSpecificLanguage/languageModels/structure.mps @@ -16,7 +16,6 @@ - @@ -25,19 +24,6 @@ - - - - - - - - - - - - - @@ -63,9 +49,6 @@ - - - @@ -191,41 +174,17 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/applications/IntegratedCExample/solutions/EmbeddedProgram/EmbeddedProgram.msd b/code/applications/IntegratedCExample/solutions/EmbeddedProgram/EmbeddedProgram.msd index a947d5dd20c..02efaa21f3d 100644 --- a/code/applications/IntegratedCExample/solutions/EmbeddedProgram/EmbeddedProgram.msd +++ b/code/applications/IntegratedCExample/solutions/EmbeddedProgram/EmbeddedProgram.msd @@ -50,6 +50,7 @@ + diff --git a/code/applications/Pacemaker/.mps/migration.xml b/code/applications/Pacemaker/.mps/migration.xml index 81b873e7043..400c43bb13e 100644 --- a/code/applications/Pacemaker/.mps/migration.xml +++ b/code/applications/Pacemaker/.mps/migration.xml @@ -19,7 +19,8 @@ + - + \ No newline at end of file diff --git a/code/applications/Pacemaker/_spreferences/CodeReviewPreferences/module.msd b/code/applications/Pacemaker/_spreferences/CodeReviewPreferences/module.msd index 367e32ede6b..c4de6eda7b0 100644 --- a/code/applications/Pacemaker/_spreferences/CodeReviewPreferences/module.msd +++ b/code/applications/Pacemaker/_spreferences/CodeReviewPreferences/module.msd @@ -21,6 +21,7 @@ + diff --git a/code/applications/Pacemaker/_spreferences/PlatformTemplates/module.msd b/code/applications/Pacemaker/_spreferences/PlatformTemplates/module.msd index f19ca80ed66..ac3db67fc10 100644 --- a/code/applications/Pacemaker/_spreferences/PlatformTemplates/module.msd +++ b/code/applications/Pacemaker/_spreferences/PlatformTemplates/module.msd @@ -28,6 +28,7 @@ + diff --git a/code/applications/Pacemaker/_spreferences/TypeSizeConfiguration/models/org/fortiss/pacemakermodel/__spreferences/TypeSizeConfiguration.mps b/code/applications/Pacemaker/_spreferences/TypeSizeConfiguration/models/org/fortiss/pacemakermodel/__spreferences/TypeSizeConfiguration.mps index 4ae1be558ee..48cd959e9c2 100644 --- a/code/applications/Pacemaker/_spreferences/TypeSizeConfiguration/models/org/fortiss/pacemakermodel/__spreferences/TypeSizeConfiguration.mps +++ b/code/applications/Pacemaker/_spreferences/TypeSizeConfiguration/models/org/fortiss/pacemakermodel/__spreferences/TypeSizeConfiguration.mps @@ -1,6 +1,7 @@ + diff --git a/code/applications/Pacemaker/_spreferences/TypeSizeConfiguration/module.msd b/code/applications/Pacemaker/_spreferences/TypeSizeConfiguration/module.msd index 73f70c69ecb..f00b841549e 100644 --- a/code/applications/Pacemaker/_spreferences/TypeSizeConfiguration/module.msd +++ b/code/applications/Pacemaker/_spreferences/TypeSizeConfiguration/module.msd @@ -22,6 +22,7 @@ + diff --git a/code/applications/Pacemaker/solutions/pacemakermodel/models/pacemakermodel/model1_with_history.mps b/code/applications/Pacemaker/solutions/pacemakermodel/models/pacemakermodel/model1_with_history.mps index ccf3f19b476..2971882ad8f 100644 --- a/code/applications/Pacemaker/solutions/pacemakermodel/models/pacemakermodel/model1_with_history.mps +++ b/code/applications/Pacemaker/solutions/pacemakermodel/models/pacemakermodel/model1_with_history.mps @@ -6,8 +6,6 @@ - - @@ -117,14 +115,6 @@ - - - - - - - - @@ -310,7 +300,6 @@ - @@ -318,7 +307,6 @@ - @@ -1733,96 +1721,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/applications/Pacemaker/solutions/pacemakermodel/pacemakermodel.msd b/code/applications/Pacemaker/solutions/pacemakermodel/pacemakermodel.msd index e7d83e64f12..705b77c2494 100644 --- a/code/applications/Pacemaker/solutions/pacemakermodel/pacemakermodel.msd +++ b/code/applications/Pacemaker/solutions/pacemakermodel/pacemakermodel.msd @@ -40,7 +40,6 @@ - @@ -58,6 +57,7 @@ + @@ -66,13 +66,6 @@ - - - - - - - diff --git a/code/applications/com.mbeddr.build-examples/.mps/migration.xml b/code/applications/com.mbeddr.build-examples/.mps/migration.xml index 81b873e7043..400c43bb13e 100644 --- a/code/applications/com.mbeddr.build-examples/.mps/migration.xml +++ b/code/applications/com.mbeddr.build-examples/.mps/migration.xml @@ -19,7 +19,8 @@ + - + \ No newline at end of file diff --git a/code/applications/com.mbeddr.build-examples/_spreferences/CodeReviewPreferences/module.msd b/code/applications/com.mbeddr.build-examples/_spreferences/CodeReviewPreferences/module.msd index c9ee5643732..afcc5499c54 100644 --- a/code/applications/com.mbeddr.build-examples/_spreferences/CodeReviewPreferences/module.msd +++ b/code/applications/com.mbeddr.build-examples/_spreferences/CodeReviewPreferences/module.msd @@ -21,6 +21,7 @@ + diff --git a/code/applications/com.mbeddr.build-examples/_spreferences/PlatformTemplates/module.msd b/code/applications/com.mbeddr.build-examples/_spreferences/PlatformTemplates/module.msd index 3fb27a92972..df736db4803 100644 --- a/code/applications/com.mbeddr.build-examples/_spreferences/PlatformTemplates/module.msd +++ b/code/applications/com.mbeddr.build-examples/_spreferences/PlatformTemplates/module.msd @@ -28,6 +28,7 @@ + diff --git a/code/applications/com.mbeddr.build-examples/_spreferences/TypeSizeConfiguration/models/com/mbeddr/build-examples/__spreferences/TypeSizeConfiguration.mps b/code/applications/com.mbeddr.build-examples/_spreferences/TypeSizeConfiguration/models/com/mbeddr/build-examples/__spreferences/TypeSizeConfiguration.mps index 859b9c6cafd..4df12d449ae 100644 --- a/code/applications/com.mbeddr.build-examples/_spreferences/TypeSizeConfiguration/models/com/mbeddr/build-examples/__spreferences/TypeSizeConfiguration.mps +++ b/code/applications/com.mbeddr.build-examples/_spreferences/TypeSizeConfiguration/models/com/mbeddr/build-examples/__spreferences/TypeSizeConfiguration.mps @@ -1,6 +1,7 @@ + diff --git a/code/applications/com.mbeddr.build-examples/_spreferences/TypeSizeConfiguration/module.msd b/code/applications/com.mbeddr.build-examples/_spreferences/TypeSizeConfiguration/module.msd index 606f97f8fd9..2a0b6863d59 100644 --- a/code/applications/com.mbeddr.build-examples/_spreferences/TypeSizeConfiguration/module.msd +++ b/code/applications/com.mbeddr.build-examples/_spreferences/TypeSizeConfiguration/module.msd @@ -22,6 +22,7 @@ + diff --git a/code/applications/com.mbeddr.build-examples/languages/com.mbeddr.unless/com.mbeddr.unless.mpl b/code/applications/com.mbeddr.build-examples/languages/com.mbeddr.unless/com.mbeddr.unless.mpl index fc99b15dc7c..62eba4f4a96 100644 --- a/code/applications/com.mbeddr.build-examples/languages/com.mbeddr.unless/com.mbeddr.unless.mpl +++ b/code/applications/com.mbeddr.build-examples/languages/com.mbeddr.unless/com.mbeddr.unless.mpl @@ -61,12 +61,12 @@ - + @@ -139,12 +139,12 @@ - + diff --git a/code/applications/com.mbeddr.build-examples/solutions/com.baselanguage.unless.build/build.xml b/code/applications/com.mbeddr.build-examples/solutions/com.baselanguage.unless.build/build.xml index 313786d9e5d..9dbd7a87262 100644 --- a/code/applications/com.mbeddr.build-examples/solutions/com.baselanguage.unless.build/build.xml +++ b/code/applications/com.mbeddr.build-examples/solutions/com.baselanguage.unless.build/build.xml @@ -20,6 +20,7 @@ + @@ -55,19 +56,6 @@ - - - - com.baselanguage.unless - com.baselanguage.unless - 1.0 - com.mbeddr.mpsutil - - - - - - @@ -76,6 +64,7 @@ com.baselanguage.unless com.baselanguage.unless 1.0 + com.intellij.modules.platform com.mbeddr.mpsutil @@ -117,7 +106,6 @@ - @@ -243,7 +231,7 @@ - mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}com.mbeddr.platform.major.version=${com.mbeddr.platform.major.version}${line.separator}com.mbeddr.platform.minor.version=${com.mbeddr.platform.minor.version}${line.separator}com.mbeddr.platform.build=${com.mbeddr.platform.build}${line.separator}com.mbeddr.platform.mbeddr.version=${com.mbeddr.platform.mbeddr.version}${line.separator}de.itemis.mps.extensions.versionNumber=${de.itemis.mps.extensions.versionNumber}${line.separator}com.mbeddr.mpsutil.actionsfilter.major.version=${com.mbeddr.mpsutil.actionsfilter.major.version}${line.separator}com.mbeddr.mpsutil.actionsfilter.minor.version=${com.mbeddr.mpsutil.actionsfilter.minor.version}${line.separator}com.mbeddr.mpsutil.actionsfilter.build=${com.mbeddr.mpsutil.actionsfilter.build}${line.separator}com.mbeddr.mpsutil.actionsfilter.mbeddr.version=${com.mbeddr.mpsutil.actionsfilter.mbeddr.version} + mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mps.runtimeBuild=${mps.runtimeBuild}${line.separator}mpsBootstrapCore.version.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}com.mbeddr.platform.major.version=${com.mbeddr.platform.major.version}${line.separator}com.mbeddr.platform.minor.version=${com.mbeddr.platform.minor.version}${line.separator}com.mbeddr.platform.build=${com.mbeddr.platform.build}${line.separator}com.mbeddr.platform.mbeddr.version=${com.mbeddr.platform.mbeddr.version}${line.separator}de.itemis.mps.extensions.versionNumber=${de.itemis.mps.extensions.versionNumber}${line.separator}com.mbeddr.mpsutil.actionsfilter.major.version=${com.mbeddr.mpsutil.actionsfilter.major.version}${line.separator}com.mbeddr.mpsutil.actionsfilter.minor.version=${com.mbeddr.mpsutil.actionsfilter.minor.version}${line.separator}com.mbeddr.mpsutil.actionsfilter.build=${com.mbeddr.mpsutil.actionsfilter.build}${line.separator}com.mbeddr.mpsutil.actionsfilter.mbeddr.version=${com.mbeddr.mpsutil.actionsfilter.mbeddr.version} @@ -271,174 +259,60 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -472,9 +346,9 @@ - + @@ -500,15 +374,18 @@ + + + @@ -531,9 +408,9 @@ - + @@ -560,11 +437,13 @@ + + diff --git a/code/applications/com.mbeddr.build-examples/solutions/com.baselanguage.unless.build/com.baselanguage.unless.build.msd b/code/applications/com.mbeddr.build-examples/solutions/com.baselanguage.unless.build/com.baselanguage.unless.build.msd index e7eb85ee162..71f6e8ceef2 100644 --- a/code/applications/com.mbeddr.build-examples/solutions/com.baselanguage.unless.build/com.baselanguage.unless.build.msd +++ b/code/applications/com.mbeddr.build-examples/solutions/com.baselanguage.unless.build/com.baselanguage.unless.build.msd @@ -17,7 +17,7 @@ - + diff --git a/code/applications/com.mbeddr.build-examples/solutions/com.baselanguage.unless.build/models/com/baselanguage/unless/build/build.mps b/code/applications/com.mbeddr.build-examples/solutions/com.baselanguage.unless.build/models/com/baselanguage/unless/build/build.mps index 054d3be65ea..56b392283d4 100644 --- a/code/applications/com.mbeddr.build-examples/solutions/com.baselanguage.unless.build/models/com/baselanguage/unless/build/build.mps +++ b/code/applications/com.mbeddr.build-examples/solutions/com.baselanguage.unless.build/models/com/baselanguage/unless/build/build.mps @@ -3,7 +3,7 @@ - + @@ -105,16 +105,14 @@ + + + - - - - - @@ -126,6 +124,12 @@ + + + + + + @@ -218,7 +222,6 @@ - @@ -234,12 +237,30 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -263,6 +284,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/applications/com.mbeddr.build-examples/solutions/com.mbeddr.unless.sandbox/com.mbeddr.unless.sandbox.msd b/code/applications/com.mbeddr.build-examples/solutions/com.mbeddr.unless.sandbox/com.mbeddr.unless.sandbox.msd index 12ce78f5e1d..b9074e68e3b 100644 --- a/code/applications/com.mbeddr.build-examples/solutions/com.mbeddr.unless.sandbox/com.mbeddr.unless.sandbox.msd +++ b/code/applications/com.mbeddr.build-examples/solutions/com.mbeddr.unless.sandbox/com.mbeddr.unless.sandbox.msd @@ -41,6 +41,7 @@ + diff --git a/code/applications/com.mbeddr.documentation/.mps/migration.xml b/code/applications/com.mbeddr.documentation/.mps/migration.xml index f2bdcb6c621..d5d8c250626 100644 --- a/code/applications/com.mbeddr.documentation/.mps/migration.xml +++ b/code/applications/com.mbeddr.documentation/.mps/migration.xml @@ -22,12 +22,13 @@ + - + \ No newline at end of file diff --git a/code/applications/com.mbeddr.documentation/_spreferences/CodeReviewPreferences/module.msd b/code/applications/com.mbeddr.documentation/_spreferences/CodeReviewPreferences/module.msd index 7287b9f5ecc..ede4bd2ed84 100644 --- a/code/applications/com.mbeddr.documentation/_spreferences/CodeReviewPreferences/module.msd +++ b/code/applications/com.mbeddr.documentation/_spreferences/CodeReviewPreferences/module.msd @@ -21,6 +21,7 @@ + diff --git a/code/applications/com.mbeddr.documentation/_spreferences/PlatformTemplates/module.msd b/code/applications/com.mbeddr.documentation/_spreferences/PlatformTemplates/module.msd index eff4ab42b2e..719254a740b 100644 --- a/code/applications/com.mbeddr.documentation/_spreferences/PlatformTemplates/module.msd +++ b/code/applications/com.mbeddr.documentation/_spreferences/PlatformTemplates/module.msd @@ -28,6 +28,7 @@ + diff --git a/code/applications/com.mbeddr.documentation/_spreferences/TypeSizeConfiguration/models/com/mbeddr/documentation/__spreferences/TypeSizeConfiguration.mps b/code/applications/com.mbeddr.documentation/_spreferences/TypeSizeConfiguration/models/com/mbeddr/documentation/__spreferences/TypeSizeConfiguration.mps index 7a56ad65b6d..27de0d76023 100644 --- a/code/applications/com.mbeddr.documentation/_spreferences/TypeSizeConfiguration/models/com/mbeddr/documentation/__spreferences/TypeSizeConfiguration.mps +++ b/code/applications/com.mbeddr.documentation/_spreferences/TypeSizeConfiguration/models/com/mbeddr/documentation/__spreferences/TypeSizeConfiguration.mps @@ -1,6 +1,7 @@ + diff --git a/code/applications/com.mbeddr.documentation/_spreferences/TypeSizeConfiguration/module.msd b/code/applications/com.mbeddr.documentation/_spreferences/TypeSizeConfiguration/module.msd index 58d8f413225..744a5c798e4 100644 --- a/code/applications/com.mbeddr.documentation/_spreferences/TypeSizeConfiguration/module.msd +++ b/code/applications/com.mbeddr.documentation/_spreferences/TypeSizeConfiguration/module.msd @@ -22,6 +22,7 @@ + diff --git a/code/applications/com.mbeddr.documentation/solutions/com.mbeddr.mpsutil.interpreter.documentation/com.mbeddr.mpsutil.interpreter.documentation.msd b/code/applications/com.mbeddr.documentation/solutions/com.mbeddr.mpsutil.interpreter.documentation/com.mbeddr.mpsutil.interpreter.documentation.msd index 0169a4ffdd9..5cc5048069f 100644 --- a/code/applications/com.mbeddr.documentation/solutions/com.mbeddr.mpsutil.interpreter.documentation/com.mbeddr.mpsutil.interpreter.documentation.msd +++ b/code/applications/com.mbeddr.documentation/solutions/com.mbeddr.mpsutil.interpreter.documentation/com.mbeddr.mpsutil.interpreter.documentation.msd @@ -59,6 +59,7 @@ + @@ -104,12 +105,12 @@ - + diff --git a/code/applications/com.mbeddr.embedded/.mps/migration.xml b/code/applications/com.mbeddr.embedded/.mps/migration.xml index 98ddf186e6e..1fbeeea55cf 100644 --- a/code/applications/com.mbeddr.embedded/.mps/migration.xml +++ b/code/applications/com.mbeddr.embedded/.mps/migration.xml @@ -16,10 +16,11 @@ + - + \ No newline at end of file diff --git a/code/applications/com.mbeddr.embedded/_spreferences/CodeReviewPreferences/module.msd b/code/applications/com.mbeddr.embedded/_spreferences/CodeReviewPreferences/module.msd index 7b513eb9db6..d208f9abda9 100644 --- a/code/applications/com.mbeddr.embedded/_spreferences/CodeReviewPreferences/module.msd +++ b/code/applications/com.mbeddr.embedded/_spreferences/CodeReviewPreferences/module.msd @@ -21,6 +21,7 @@ + diff --git a/code/applications/com.mbeddr.embedded/_spreferences/PlatformTemplates/module.msd b/code/applications/com.mbeddr.embedded/_spreferences/PlatformTemplates/module.msd index 5d9549717cf..b6edf4a8d42 100644 --- a/code/applications/com.mbeddr.embedded/_spreferences/PlatformTemplates/module.msd +++ b/code/applications/com.mbeddr.embedded/_spreferences/PlatformTemplates/module.msd @@ -28,6 +28,7 @@ + diff --git a/code/applications/com.mbeddr.embedded/_spreferences/TypeSizeConfiguration/models/com/mbeddr/embedded/__spreferences/TypeSizeConfiguration.mps b/code/applications/com.mbeddr.embedded/_spreferences/TypeSizeConfiguration/models/com/mbeddr/embedded/__spreferences/TypeSizeConfiguration.mps index 914e80e04cc..f658450699a 100644 --- a/code/applications/com.mbeddr.embedded/_spreferences/TypeSizeConfiguration/models/com/mbeddr/embedded/__spreferences/TypeSizeConfiguration.mps +++ b/code/applications/com.mbeddr.embedded/_spreferences/TypeSizeConfiguration/models/com/mbeddr/embedded/__spreferences/TypeSizeConfiguration.mps @@ -1,6 +1,7 @@ + diff --git a/code/applications/com.mbeddr.embedded/_spreferences/TypeSizeConfiguration/module.msd b/code/applications/com.mbeddr.embedded/_spreferences/TypeSizeConfiguration/module.msd index c6253f68da5..09397149e05 100644 --- a/code/applications/com.mbeddr.embedded/_spreferences/TypeSizeConfiguration/module.msd +++ b/code/applications/com.mbeddr.embedded/_spreferences/TypeSizeConfiguration/module.msd @@ -22,6 +22,7 @@ + diff --git a/code/applications/com.mbeddr.embedded/languages/com.mbeddr.embedded.esp8266/com.mbeddr.embedded.esp8266.mpl b/code/applications/com.mbeddr.embedded/languages/com.mbeddr.embedded.esp8266/com.mbeddr.embedded.esp8266.mpl index 87276800d39..86becb45f58 100644 --- a/code/applications/com.mbeddr.embedded/languages/com.mbeddr.embedded.esp8266/com.mbeddr.embedded.esp8266.mpl +++ b/code/applications/com.mbeddr.embedded/languages/com.mbeddr.embedded.esp8266/com.mbeddr.embedded.esp8266.mpl @@ -57,6 +57,7 @@ + @@ -102,12 +103,12 @@ - + @@ -180,6 +181,7 @@ + @@ -233,12 +235,12 @@ - + diff --git a/code/applications/com.mbeddr.embedded/solutions/com.mbeddr.embedded.platform/com.mbeddr.embedded.platform.msd b/code/applications/com.mbeddr.embedded/solutions/com.mbeddr.embedded.platform/com.mbeddr.embedded.platform.msd index e2d65f0d8b3..2bb0679f276 100644 --- a/code/applications/com.mbeddr.embedded/solutions/com.mbeddr.embedded.platform/com.mbeddr.embedded.platform.msd +++ b/code/applications/com.mbeddr.embedded/solutions/com.mbeddr.embedded.platform/com.mbeddr.embedded.platform.msd @@ -50,6 +50,7 @@ + diff --git a/code/applications/com.mbeddr.embedded/solutions/demo.ESP8266.sdcard/demo.ESP8266.sdcard.msd b/code/applications/com.mbeddr.embedded/solutions/demo.ESP8266.sdcard/demo.ESP8266.sdcard.msd index 4f2204eb1ed..130cb52cba5 100644 --- a/code/applications/com.mbeddr.embedded/solutions/demo.ESP8266.sdcard/demo.ESP8266.sdcard.msd +++ b/code/applications/com.mbeddr.embedded/solutions/demo.ESP8266.sdcard/demo.ESP8266.sdcard.msd @@ -52,6 +52,7 @@ + diff --git a/code/applications/tutorial-dsls-extensions/.mps/migration.xml b/code/applications/tutorial-dsls-extensions/.mps/migration.xml index 64a93943bdc..c6a92707237 100644 --- a/code/applications/tutorial-dsls-extensions/.mps/migration.xml +++ b/code/applications/tutorial-dsls-extensions/.mps/migration.xml @@ -15,6 +15,7 @@ - + + \ No newline at end of file diff --git a/code/applications/tutorial-dsls-extensions/_spreferences/CodeReviewPreferences/module.msd b/code/applications/tutorial-dsls-extensions/_spreferences/CodeReviewPreferences/module.msd index 760daf7a5fc..bc70c3376ff 100644 --- a/code/applications/tutorial-dsls-extensions/_spreferences/CodeReviewPreferences/module.msd +++ b/code/applications/tutorial-dsls-extensions/_spreferences/CodeReviewPreferences/module.msd @@ -21,6 +21,7 @@ + diff --git a/code/applications/tutorial-dsls-extensions/_spreferences/PlatformTemplates/module.msd b/code/applications/tutorial-dsls-extensions/_spreferences/PlatformTemplates/module.msd index ed36d820358..90266a0e2b2 100644 --- a/code/applications/tutorial-dsls-extensions/_spreferences/PlatformTemplates/module.msd +++ b/code/applications/tutorial-dsls-extensions/_spreferences/PlatformTemplates/module.msd @@ -28,6 +28,7 @@ + diff --git a/code/applications/tutorial-dsls-extensions/_spreferences/TypeSizeConfiguration/models/tutorial-dsls-extensions.__spreferences.TypeSizeConfiguration.mps b/code/applications/tutorial-dsls-extensions/_spreferences/TypeSizeConfiguration/models/tutorial-dsls-extensions.__spreferences.TypeSizeConfiguration.mps index 6d723d634cd..0e12ed7261f 100644 --- a/code/applications/tutorial-dsls-extensions/_spreferences/TypeSizeConfiguration/models/tutorial-dsls-extensions.__spreferences.TypeSizeConfiguration.mps +++ b/code/applications/tutorial-dsls-extensions/_spreferences/TypeSizeConfiguration/models/tutorial-dsls-extensions.__spreferences.TypeSizeConfiguration.mps @@ -1,6 +1,7 @@ + diff --git a/code/applications/tutorial-dsls-extensions/_spreferences/TypeSizeConfiguration/module.msd b/code/applications/tutorial-dsls-extensions/_spreferences/TypeSizeConfiguration/module.msd index 3d7b00a5206..ab1def33276 100644 --- a/code/applications/tutorial-dsls-extensions/_spreferences/TypeSizeConfiguration/module.msd +++ b/code/applications/tutorial-dsls-extensions/_spreferences/TypeSizeConfiguration/module.msd @@ -22,6 +22,7 @@ + diff --git a/code/applications/tutorial-dsls-extensions/languages/blocks/blocks.mpl b/code/applications/tutorial-dsls-extensions/languages/blocks/blocks.mpl index 37486ab5ddf..1f40930e79f 100644 --- a/code/applications/tutorial-dsls-extensions/languages/blocks/blocks.mpl +++ b/code/applications/tutorial-dsls-extensions/languages/blocks/blocks.mpl @@ -46,6 +46,7 @@ + @@ -84,12 +85,12 @@ - + @@ -179,12 +180,12 @@ - + diff --git a/code/applications/tutorial-dsls-extensions/languages/blocks/languageModels/structure.mps b/code/applications/tutorial-dsls-extensions/languages/blocks/languageModels/structure.mps index ababfcbb93f..61bba209b28 100644 --- a/code/applications/tutorial-dsls-extensions/languages/blocks/languageModels/structure.mps +++ b/code/applications/tutorial-dsls-extensions/languages/blocks/languageModels/structure.mps @@ -15,7 +15,6 @@ - @@ -27,20 +26,6 @@ - - - - - - - - - - - - - - @@ -287,34 +272,13 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/code/applications/tutorial-dsls-extensions/languages/cimpl/cimpl.mpl b/code/applications/tutorial-dsls-extensions/languages/cimpl/cimpl.mpl index 77bb9e1ccbd..8c4dd869e14 100644 --- a/code/applications/tutorial-dsls-extensions/languages/cimpl/cimpl.mpl +++ b/code/applications/tutorial-dsls-extensions/languages/cimpl/cimpl.mpl @@ -45,6 +45,7 @@ + @@ -82,12 +83,12 @@ - + @@ -180,12 +181,12 @@ - + diff --git a/code/applications/tutorial-dsls-extensions/languages/demo.expr/models/demo/expr/editor.mps b/code/applications/tutorial-dsls-extensions/languages/demo.expr/models/demo/expr/editor.mps index c639bc176b9..ab035c9685b 100644 --- a/code/applications/tutorial-dsls-extensions/languages/demo.expr/models/demo/expr/editor.mps +++ b/code/applications/tutorial-dsls-extensions/languages/demo.expr/models/demo/expr/editor.mps @@ -11,7 +11,7 @@ - + @@ -78,68 +78,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -154,13 +122,6 @@ - - - - - - - @@ -172,15 +133,10 @@ - - - - - @@ -221,12 +177,6 @@ - - - - - - @@ -318,8 +268,8 @@ - - + + @@ -443,114 +393,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/applications/tutorial-dsls-extensions/languages/foreach/foreach.mpl b/code/applications/tutorial-dsls-extensions/languages/foreach/foreach.mpl index f5029876d2e..9af2957ab45 100644 --- a/code/applications/tutorial-dsls-extensions/languages/foreach/foreach.mpl +++ b/code/applications/tutorial-dsls-extensions/languages/foreach/foreach.mpl @@ -46,6 +46,7 @@ + @@ -78,12 +79,12 @@ - + @@ -169,12 +170,12 @@ - + diff --git a/code/applications/tutorial-dsls-extensions/languages/foreach/languageModels/typesystem.mps b/code/applications/tutorial-dsls-extensions/languages/foreach/languageModels/typesystem.mps index c07d1574bf4..30e2c03b2ad 100644 --- a/code/applications/tutorial-dsls-extensions/languages/foreach/languageModels/typesystem.mps +++ b/code/applications/tutorial-dsls-extensions/languages/foreach/languageModels/typesystem.mps @@ -7,7 +7,6 @@ - @@ -169,7 +168,7 @@ - + diff --git a/code/applications/tutorial-dsls-extensions/languages/heap/heap.mpl b/code/applications/tutorial-dsls-extensions/languages/heap/heap.mpl index e1522314d62..9f507cd48e3 100644 --- a/code/applications/tutorial-dsls-extensions/languages/heap/heap.mpl +++ b/code/applications/tutorial-dsls-extensions/languages/heap/heap.mpl @@ -46,6 +46,7 @@ + @@ -86,12 +87,12 @@ - + @@ -188,12 +189,12 @@ - + diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.extreqref/languageModels/editor.mps b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.extreqref/languageModels/editor.mps index 5cffb95ce91..4652efe1669 100644 --- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.extreqref/languageModels/editor.mps +++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.extreqref/languageModels/editor.mps @@ -10,6 +10,10 @@ + + + + @@ -107,6 +111,10 @@ + + + + @@ -146,6 +154,9 @@ + + + @@ -395,9 +406,21 @@ - - - + + + + + + + + + + + + + + + @@ -407,6 +430,7 @@ + diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.extreqref/mbeddr.tutorial.extreqref.mpl b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.extreqref/mbeddr.tutorial.extreqref.mpl index cd2568e63bd..000f0f3c67a 100644 --- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.extreqref/mbeddr.tutorial.extreqref.mpl +++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.extreqref/mbeddr.tutorial.extreqref.mpl @@ -35,6 +35,7 @@ + @@ -60,11 +61,11 @@ - + @@ -138,11 +139,11 @@ - + diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/languageModels/structure.mps b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/languageModels/structure.mps index 7fb7e27e9c8..0236125182b 100644 --- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/languageModels/structure.mps +++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/languageModels/structure.mps @@ -11,7 +11,6 @@ - @@ -26,19 +25,6 @@ - - - - - - - - - - - - - @@ -91,41 +77,17 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/mbeddr.tutorial.layers.mpl b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/mbeddr.tutorial.layers.mpl index ad9e3844f20..fa0662366c1 100644 --- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/mbeddr.tutorial.layers.mpl +++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.layers/mbeddr.tutorial.layers.mpl @@ -106,12 +106,12 @@ - + diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/mbeddr.tutorial.shonan.mpl b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/mbeddr.tutorial.shonan.mpl index fa5f5924da8..1feccb8dd8a 100644 --- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/mbeddr.tutorial.shonan.mpl +++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/mbeddr.tutorial.shonan.mpl @@ -54,6 +54,7 @@ + @@ -103,12 +104,12 @@ - + @@ -287,6 +288,7 @@ + @@ -344,12 +346,12 @@ - + diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/structure.mps b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/structure.mps index 6cc5f55a591..7c08f518a1e 100644 --- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/structure.mps +++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.shonan/models/structure.mps @@ -17,7 +17,6 @@ - @@ -35,20 +34,6 @@ - - - - - - - - - - - - - - @@ -775,66 +760,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -842,36 +791,15 @@ - - - - - - - - - - - - - - - - - - - - - @@ -879,33 +807,13 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.smtrigger/mbeddr.tutorial.smtrigger.mpl b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.smtrigger/mbeddr.tutorial.smtrigger.mpl index 8f2120afab5..7959d7431d1 100644 --- a/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.smtrigger/mbeddr.tutorial.smtrigger.mpl +++ b/code/applications/tutorial-dsls-extensions/languages/mbeddr.tutorial.smtrigger/mbeddr.tutorial.smtrigger.mpl @@ -62,6 +62,7 @@ + @@ -101,12 +102,12 @@ - + @@ -204,12 +205,12 @@ - + diff --git a/code/applications/tutorial-dsls-extensions/languages/memory/memory.mpl b/code/applications/tutorial-dsls-extensions/languages/memory/memory.mpl index be36559c1f6..e7da7237126 100644 --- a/code/applications/tutorial-dsls-extensions/languages/memory/memory.mpl +++ b/code/applications/tutorial-dsls-extensions/languages/memory/memory.mpl @@ -63,12 +63,12 @@ - + diff --git a/code/applications/tutorial-dsls-extensions/languages/metadata/languageModels/structure.mps b/code/applications/tutorial-dsls-extensions/languages/metadata/languageModels/structure.mps index 9327966e16b..82e98efae15 100644 --- a/code/applications/tutorial-dsls-extensions/languages/metadata/languageModels/structure.mps +++ b/code/applications/tutorial-dsls-extensions/languages/metadata/languageModels/structure.mps @@ -14,7 +14,6 @@ - @@ -29,19 +28,6 @@ - - - - - - - - - - - - - @@ -172,33 +158,13 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/code/applications/tutorial-dsls-extensions/languages/metadata/metadata.mpl b/code/applications/tutorial-dsls-extensions/languages/metadata/metadata.mpl index 434293fe25c..9069f5d9831 100644 --- a/code/applications/tutorial-dsls-extensions/languages/metadata/metadata.mpl +++ b/code/applications/tutorial-dsls-extensions/languages/metadata/metadata.mpl @@ -47,11 +47,11 @@ - + @@ -131,12 +131,12 @@ - + diff --git a/code/applications/tutorial-dsls-extensions/languages/osconfig/osconfig.mpl b/code/applications/tutorial-dsls-extensions/languages/osconfig/osconfig.mpl index b4bb2040044..8d2d65e60b0 100644 --- a/code/applications/tutorial-dsls-extensions/languages/osconfig/osconfig.mpl +++ b/code/applications/tutorial-dsls-extensions/languages/osconfig/osconfig.mpl @@ -61,11 +61,11 @@ - + diff --git a/code/applications/tutorial-dsls-extensions/languages/spellcheck/spellcheck.mpl b/code/applications/tutorial-dsls-extensions/languages/spellcheck/spellcheck.mpl index e66112dec25..622018ed20f 100644 --- a/code/applications/tutorial-dsls-extensions/languages/spellcheck/spellcheck.mpl +++ b/code/applications/tutorial-dsls-extensions/languages/spellcheck/spellcheck.mpl @@ -68,11 +68,11 @@ - + diff --git a/code/applications/tutorial-dsls-extensions/solutions/demo.expr.interpreter/demo.expr.interpreter.msd b/code/applications/tutorial-dsls-extensions/solutions/demo.expr.interpreter/demo.expr.interpreter.msd index eae468601e5..27e0ab7657d 100644 --- a/code/applications/tutorial-dsls-extensions/solutions/demo.expr.interpreter/demo.expr.interpreter.msd +++ b/code/applications/tutorial-dsls-extensions/solutions/demo.expr.interpreter/demo.expr.interpreter.msd @@ -6,12 +6,13 @@ - + 444fc60e-b7e2-46c2-95fa-301dd48918b2(demo.expr) + 735f86bc-17fb-4d1c-a664-82c2b8e8a34e(com.mbeddr.mpsutil.interpreter.rt) @@ -27,7 +28,10 @@ + + + diff --git a/code/applications/tutorial-dsls-extensions/solutions/demo.expr.interpreter/models/demo.expr.interpreter.runtime.mps b/code/applications/tutorial-dsls-extensions/solutions/demo.expr.interpreter/models/demo.expr.interpreter.runtime.mps new file mode 100644 index 00000000000..cf40edc1e86 --- /dev/null +++ b/code/applications/tutorial-dsls-extensions/solutions/demo.expr.interpreter/models/demo.expr.interpreter.runtime.mps @@ -0,0 +1,222 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/applications/tutorial-dsls-extensions/solutions/lib/com.mbeddr.ext.exceptionhandling/com.mbeddr.ext.exceptionhandling.library.msd b/code/applications/tutorial-dsls-extensions/solutions/lib/com.mbeddr.ext.exceptionhandling/com.mbeddr.ext.exceptionhandling.library.msd index 6b1c65a6996..a08a8ee9da4 100644 --- a/code/applications/tutorial-dsls-extensions/solutions/lib/com.mbeddr.ext.exceptionhandling/com.mbeddr.ext.exceptionhandling.library.msd +++ b/code/applications/tutorial-dsls-extensions/solutions/lib/com.mbeddr.ext.exceptionhandling/com.mbeddr.ext.exceptionhandling.library.msd @@ -40,6 +40,7 @@ + diff --git a/code/applications/tutorial-dsls-extensions/solutions/mbeddr.tutorial.dsls.extensions.main/mbeddr.tutorial.dsls.extensions.main.msd b/code/applications/tutorial-dsls-extensions/solutions/mbeddr.tutorial.dsls.extensions.main/mbeddr.tutorial.dsls.extensions.main.msd index 55b087e8d8e..7fb5b842fbe 100644 --- a/code/applications/tutorial-dsls-extensions/solutions/mbeddr.tutorial.dsls.extensions.main/mbeddr.tutorial.dsls.extensions.main.msd +++ b/code/applications/tutorial-dsls-extensions/solutions/mbeddr.tutorial.dsls.extensions.main/mbeddr.tutorial.dsls.extensions.main.msd @@ -45,6 +45,7 @@ + diff --git a/code/applications/tutorial-dsls-extensions/solutions/mbeddr.tutorial.dsls.extensions.main/models/newLanguages.mps b/code/applications/tutorial-dsls-extensions/solutions/mbeddr.tutorial.dsls.extensions.main/models/newLanguages.mps index 7542c72e7ba..b942dfcae6f 100644 --- a/code/applications/tutorial-dsls-extensions/solutions/mbeddr.tutorial.dsls.extensions.main/models/newLanguages.mps +++ b/code/applications/tutorial-dsls-extensions/solutions/mbeddr.tutorial.dsls.extensions.main/models/newLanguages.mps @@ -2572,6 +2572,7 @@ + diff --git a/code/applications/tutorial-dsls-extensions/solutions/mbeddr.tutorial.shonan.runtime/mbeddr.tutorial.shonan.runtime.msd b/code/applications/tutorial-dsls-extensions/solutions/mbeddr.tutorial.shonan.runtime/mbeddr.tutorial.shonan.runtime.msd index ebc06c60cb2..7b4eec388b2 100644 --- a/code/applications/tutorial-dsls-extensions/solutions/mbeddr.tutorial.shonan.runtime/mbeddr.tutorial.shonan.runtime.msd +++ b/code/applications/tutorial-dsls-extensions/solutions/mbeddr.tutorial.shonan.runtime/mbeddr.tutorial.shonan.runtime.msd @@ -62,12 +62,12 @@ - + diff --git a/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/mbeddr.tutorial.shonan.test.msd b/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/mbeddr.tutorial.shonan.test.msd index 598ae30686e..c300379c29d 100644 --- a/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/mbeddr.tutorial.shonan.test.msd +++ b/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.shonan.test/mbeddr.tutorial.shonan.test.msd @@ -36,6 +36,7 @@ + diff --git a/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.typesystemtests/typesystemtests.msd b/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.typesystemtests/typesystemtests.msd index 9ef342bcb3a..2765348807c 100644 --- a/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.typesystemtests/typesystemtests.msd +++ b/code/applications/tutorial-dsls-extensions/tests/mbeddr.tutorial.typesystemtests/typesystemtests.msd @@ -41,6 +41,7 @@ + diff --git a/code/applications/tutorial/.mps/migration.xml b/code/applications/tutorial/.mps/migration.xml index 65112394c89..6ad5e78e2c9 100644 --- a/code/applications/tutorial/.mps/migration.xml +++ b/code/applications/tutorial/.mps/migration.xml @@ -22,6 +22,7 @@ + @@ -30,6 +31,6 @@ - + \ No newline at end of file diff --git a/code/applications/tutorial/_spreferences/CodeReviewPreferences/module.msd b/code/applications/tutorial/_spreferences/CodeReviewPreferences/module.msd index 4f3e67e1185..3b9a5caaa33 100644 --- a/code/applications/tutorial/_spreferences/CodeReviewPreferences/module.msd +++ b/code/applications/tutorial/_spreferences/CodeReviewPreferences/module.msd @@ -21,6 +21,7 @@ + diff --git a/code/applications/tutorial/_spreferences/PlatformTemplates/module.msd b/code/applications/tutorial/_spreferences/PlatformTemplates/module.msd index 90a4a164d1e..019d48beb13 100644 --- a/code/applications/tutorial/_spreferences/PlatformTemplates/module.msd +++ b/code/applications/tutorial/_spreferences/PlatformTemplates/module.msd @@ -28,6 +28,7 @@ + diff --git a/code/applications/tutorial/_spreferences/TypeSizeConfiguration/models/tutorial/__spreferences/TypeSizeConfiguration.mps b/code/applications/tutorial/_spreferences/TypeSizeConfiguration/models/tutorial/__spreferences/TypeSizeConfiguration.mps index a397dcf2607..c04a3436219 100644 --- a/code/applications/tutorial/_spreferences/TypeSizeConfiguration/models/tutorial/__spreferences/TypeSizeConfiguration.mps +++ b/code/applications/tutorial/_spreferences/TypeSizeConfiguration/models/tutorial/__spreferences/TypeSizeConfiguration.mps @@ -1,6 +1,7 @@ + diff --git a/code/applications/tutorial/_spreferences/TypeSizeConfiguration/module.msd b/code/applications/tutorial/_spreferences/TypeSizeConfiguration/module.msd index a08a8cea10b..b1b69d1ef6e 100644 --- a/code/applications/tutorial/_spreferences/TypeSizeConfiguration/module.msd +++ b/code/applications/tutorial/_spreferences/TypeSizeConfiguration/module.msd @@ -22,6 +22,7 @@ + diff --git a/code/applications/tutorial/solutions/com.mbeddr.editingGuide/com.mbeddr.editingGuide.msd b/code/applications/tutorial/solutions/com.mbeddr.editingGuide/com.mbeddr.editingGuide.msd index ce86a7ac5d9..ac2908f27d7 100644 --- a/code/applications/tutorial/solutions/com.mbeddr.editingGuide/com.mbeddr.editingGuide.msd +++ b/code/applications/tutorial/solutions/com.mbeddr.editingGuide/com.mbeddr.editingGuide.msd @@ -51,6 +51,7 @@ + @@ -85,12 +86,12 @@ - + diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.buildProject/com.mbeddr.tutorial.buildProject.msd b/code/applications/tutorial/solutions/com.mbeddr.tutorial.buildProject/com.mbeddr.tutorial.buildProject.msd index 7c19a82c262..3b4a4efe0c4 100644 --- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.buildProject/com.mbeddr.tutorial.buildProject.msd +++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.buildProject/com.mbeddr.tutorial.buildProject.msd @@ -32,8 +32,9 @@ + - + diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.buildProject/models/com/mbeddr/tutorial/sample/buildProject/build.mps b/code/applications/tutorial/solutions/com.mbeddr.tutorial.buildProject/models/com/mbeddr/tutorial/sample/buildProject/build.mps index b560fb45d3d..868f4b92fdd 100644 --- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.buildProject/models/com/mbeddr/tutorial/sample/buildProject/build.mps +++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.buildProject/models/com/mbeddr/tutorial/sample/buildProject/build.mps @@ -3,7 +3,7 @@ - + @@ -108,7 +108,6 @@ - @@ -196,7 +195,6 @@ - diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/com.mbeddr.tutorial.documentation.msd b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/com.mbeddr.tutorial.documentation.msd index 2a93fbfdbe3..534235f1853 100644 --- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/com.mbeddr.tutorial.documentation.msd +++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/com.mbeddr.tutorial.documentation.msd @@ -67,6 +67,7 @@ + @@ -121,12 +122,12 @@ - + diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/images/analyses/verification_dectab_results.png b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/images/analyses/verification_dectab_results.png deleted file mode 100644 index 086f4b49fa2..00000000000 Binary files a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/images/analyses/verification_dectab_results.png and /dev/null differ diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/images/analyses/verification_dectab_start_verification.png b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/images/analyses/verification_dectab_start_verification.png deleted file mode 100644 index 7c42ca282bd..00000000000 Binary files a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/images/analyses/verification_dectab_start_verification.png and /dev/null differ diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/images/analyses/verification_dectab_toggle_check.png b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/images/analyses/verification_dectab_toggle_check.png deleted file mode 100644 index c25ca186c52..00000000000 Binary files a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/images/analyses/verification_dectab_toggle_check.png and /dev/null differ diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/images/analyses/verification_statemachine_results.png b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/images/analyses/verification_statemachine_results.png deleted file mode 100644 index 7a6b2990eb0..00000000000 Binary files a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/images/analyses/verification_statemachine_results.png and /dev/null differ diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/A_StaticEvaluation.mpsr b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/A_StaticEvaluation.mpsr index b4350620828..552afcea6db 100644 --- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/A_StaticEvaluation.mpsr +++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/A_StaticEvaluation.mpsr @@ -173,7 +173,7 @@ - + diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/B_DecisionTables.mpsr b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/B_DecisionTables.mpsr index 5e17793e848..356fd702934 100644 --- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/B_DecisionTables.mpsr +++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/B_DecisionTables.mpsr @@ -51,9 +51,6 @@ - - - @@ -336,13 +333,7 @@ - - - - - - - + diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/C_Units.mpsr b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/C_Units.mpsr index f4c94cb50c1..22a2d5edb60 100644 --- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/C_Units.mpsr +++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/C_Units.mpsr @@ -21,7 +21,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -90,7 +90,7 @@ - + diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/D_Components.mpsr b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/D_Components.mpsr index 2080c5653ea..c9dd08caa6e 100644 --- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/D_Components.mpsr +++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/D_Components.mpsr @@ -81,9 +81,6 @@ - - - @@ -2600,13 +2597,7 @@ - - - - - - - + diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/E_StateMachines.mpsr b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/E_StateMachines.mpsr index 414af056354..acb80361a8d 100644 --- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/E_StateMachines.mpsr +++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/E_StateMachines.mpsr @@ -6,7 +6,6 @@ - @@ -815,13 +814,7 @@ - - - - - - - + @@ -901,13 +894,7 @@ - - - - - - - + @@ -1026,13 +1013,7 @@ - - - - - - - + @@ -1083,7 +1064,7 @@ - + diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/UserGuideExport.mpsr b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/UserGuideExport.mpsr index 891e97bb3d8..301bf33fd89 100644 --- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/UserGuideExport.mpsr +++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/UserGuideExport.mpsr @@ -34,7 +34,7 @@ - + diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/analyses_code.mps b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/analyses_code.mps index 79cdf4ce63e..7d3a87fc823 100644 --- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/analyses_code.mps +++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/analyses_code.mps @@ -15,9 +15,6 @@ - - - @@ -25,10 +22,6 @@ - - - - @@ -47,9 +40,6 @@ - - - @@ -80,18 +70,10 @@ - - - - - - - - @@ -124,38 +106,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -192,13 +148,6 @@ - - - - - - - @@ -213,10 +162,6 @@ - - - - @@ -227,9 +172,6 @@ - - - @@ -251,60 +193,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -462,11 +358,8 @@ - - - @@ -480,34 +373,24 @@ - - - - - - - - - - @@ -520,22 +403,6 @@ - - - - - - - - - - - - - - - - @@ -858,181 +725,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1042,9 +737,6 @@ - - - @@ -1070,303 +762,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1421,499 +816,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -2415,82 +1320,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2519,251 +1348,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2835,116 +1419,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/code/5777244129531618669.mpsr b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/code/5777244129531618669.mpsr new file mode 100644 index 00000000000..51177e6d8f2 --- /dev/null +++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/code/5777244129531618669.mpsr @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/code/C99vsMbeddr.mpsr b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/code/C99vsMbeddr.mpsr new file mode 100644 index 00000000000..d9ec93add2e --- /dev/null +++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/code/C99vsMbeddr.mpsr @@ -0,0 +1,333 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/code/C99vsMbeddr2.mpsr b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/code/C99vsMbeddr2.mpsr new file mode 100644 index 00000000000..377fa6ed95f --- /dev/null +++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/code/C99vsMbeddr2.mpsr @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/code/HelloWorld.mpsr b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/code/HelloWorld.mpsr new file mode 100644 index 00000000000..940cfd60c7c --- /dev/null +++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/code/HelloWorld.mpsr @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/code/StaticEval.mpsr b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/code/StaticEval.mpsr new file mode 100644 index 00000000000..76680ef8875 --- /dev/null +++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/code/StaticEval.mpsr @@ -0,0 +1,204 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/code/stdio_stub.mpsr b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/code/stdio_stub.mpsr new file mode 100644 index 00000000000..dfbdef98711 --- /dev/null +++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/code/stdio_stub.mpsr @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/code/stdlib_stub.mpsr b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/code/stdlib_stub.mpsr new file mode 100644 index 00000000000..05462523725 --- /dev/null +++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/code/stdlib_stub.mpsr @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/_main.mps b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/_main.mps index 92b25dbc046..1eb9d82ae2b 100644 --- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/_main.mps +++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/_main.mps @@ -44,7 +44,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -119,7 +119,7 @@ - + diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/analyses.mps b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/analyses.mps index c9dfac05914..d3787e7b38d 100644 --- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/analyses.mps +++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/analyses.mps @@ -36,7 +36,7 @@ - + @@ -70,13 +70,8 @@ - - - - - @@ -87,7 +82,7 @@ - + @@ -117,7 +112,7 @@ - + @@ -694,13 +689,7 @@ - - - - - - - + @@ -1313,26 +1302,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -1479,278 +1448,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1761,109 +1458,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1982,26 +1576,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -2029,163 +1603,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2209,11 +1626,6 @@ - - - - - @@ -2221,9 +1633,6 @@ - - - diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/concepts.mps b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/concepts.mps index 580de908561..a7f04df6a4a 100644 --- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/concepts.mps +++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/concepts.mps @@ -28,7 +28,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -87,7 +87,7 @@ - + diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/ctooling.mps b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/ctooling.mps index 40ae14e246d..89f06c6e292 100644 --- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/ctooling.mps +++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/ctooling.mps @@ -46,7 +46,7 @@ - + @@ -112,7 +112,7 @@ - + @@ -140,7 +140,7 @@ - + @@ -219,7 +219,7 @@ - + @@ -286,7 +286,7 @@ - + @@ -376,7 +376,7 @@ - + @@ -401,7 +401,7 @@ - + @@ -602,7 +602,7 @@ - + @@ -792,7 +792,7 @@ - + @@ -915,10 +915,10 @@ - + - + diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/fundamentals.mps b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/fundamentals.mps index 34d84f89184..db702775607 100644 --- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/fundamentals.mps +++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/fundamentals.mps @@ -41,7 +41,7 @@ - + @@ -88,7 +88,7 @@ - + @@ -122,7 +122,7 @@ - + diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/generateCode.mps b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/generateCode.mps index bf3c3c34b99..0e5d76a2f7a 100644 --- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/generateCode.mps +++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/generateCode.mps @@ -23,7 +23,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -54,7 +54,7 @@ - + diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/mbeddrCvsC99.mps b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/mbeddrCvsC99.mps index 33ccfd9d7b5..50712ca8579 100644 --- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/mbeddrCvsC99.mps +++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/mbeddrCvsC99.mps @@ -42,7 +42,7 @@ - + @@ -111,7 +111,7 @@ - + @@ -138,7 +138,7 @@ - + @@ -1016,10 +1016,10 @@ - + - + @@ -1036,10 +1036,10 @@ - + - + @@ -1079,7 +1079,7 @@ - + @@ -1123,7 +1123,7 @@ - + @@ -1348,10 +1348,10 @@ - + - + @@ -1368,10 +1368,10 @@ - + - + @@ -1406,10 +1406,10 @@ - + - + @@ -1746,7 +1746,7 @@ - + diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/processSupport.mps b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/processSupport.mps index 28a265b9449..2cabcf18f0e 100644 --- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/processSupport.mps +++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/models/com/mbeddr/tutorial/documentation/ug/processSupport.mps @@ -16,7 +16,7 @@ - + @@ -35,7 +35,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -155,7 +155,7 @@ - + diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.sample.CProject/com.mbeddr.tutorial.sample.CProject.msd b/code/applications/tutorial/solutions/com.mbeddr.tutorial.sample.CProject/com.mbeddr.tutorial.sample.CProject.msd index d3cc1afda69..d02bafa0147 100644 --- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.sample.CProject/com.mbeddr.tutorial.sample.CProject.msd +++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.sample.CProject/com.mbeddr.tutorial.sample.CProject.msd @@ -40,6 +40,7 @@ + diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.sample.HelloWorld/com.mbeddr.tutorial.sample.HelloWorld.msd b/code/applications/tutorial/solutions/com.mbeddr.tutorial.sample.HelloWorld/com.mbeddr.tutorial.sample.HelloWorld.msd index 7d1ccec4012..ab61e50fa16 100644 --- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.sample.HelloWorld/com.mbeddr.tutorial.sample.HelloWorld.msd +++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.sample.HelloWorld/com.mbeddr.tutorial.sample.HelloWorld.msd @@ -40,6 +40,7 @@ + diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/com.mbeddr.tutorial.startup.msd b/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/com.mbeddr.tutorial.startup.msd index 66b42020c3d..1f6ef0b6cb9 100644 --- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/com.mbeddr.tutorial.startup.msd +++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/com.mbeddr.tutorial.startup.msd @@ -65,11 +65,11 @@ - + diff --git a/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/models/com/mbeddr/tutorial/startup/plugin.mps b/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/models/com/mbeddr/tutorial/startup/plugin.mps index 621dc9dbe07..81f3cb72e80 100644 --- a/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/models/com/mbeddr/tutorial/startup/plugin.mps +++ b/code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/models/com/mbeddr/tutorial/startup/plugin.mps @@ -53,6 +53,7 @@ + @@ -1005,6 +1006,7 @@ + @@ -1020,6 +1022,7 @@ + diff --git a/code/applications/tutorial/solutions/mbeddr.tutorial.main/mbeddr.tutorial.main.msd b/code/applications/tutorial/solutions/mbeddr.tutorial.main/mbeddr.tutorial.main.msd index c3602601589..8fe8710a8f6 100644 --- a/code/applications/tutorial/solutions/mbeddr.tutorial.main/mbeddr.tutorial.main.msd +++ b/code/applications/tutorial/solutions/mbeddr.tutorial.main/mbeddr.tutorial.main.msd @@ -89,6 +89,7 @@ + diff --git a/code/languages/com.mbeddr.build/.mps/migration.xml b/code/languages/com.mbeddr.build/.mps/migration.xml index 65112394c89..6ad5e78e2c9 100644 --- a/code/languages/com.mbeddr.build/.mps/migration.xml +++ b/code/languages/com.mbeddr.build/.mps/migration.xml @@ -22,6 +22,7 @@ + @@ -30,6 +31,6 @@ - + \ No newline at end of file diff --git a/code/languages/com.mbeddr.build/.mps/modules.xml b/code/languages/com.mbeddr.build/.mps/modules.xml index 20830d43834..d704fe52b82 100644 --- a/code/languages/com.mbeddr.build/.mps/modules.xml +++ b/code/languages/com.mbeddr.build/.mps/modules.xml @@ -11,7 +11,6 @@ - \ No newline at end of file diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.allScripts/com.mbeddr.allScripts.msd b/code/languages/com.mbeddr.build/solutions/com.mbeddr.allScripts/com.mbeddr.allScripts.msd index 3e40eb0cc39..fe420768510 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.allScripts/com.mbeddr.allScripts.msd +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.allScripts/com.mbeddr.allScripts.msd @@ -17,7 +17,7 @@ - + diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.allScripts/models/com/mbeddr/allScripts/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.allScripts/models/com/mbeddr/allScripts/build.mps index 5ddda0a3164..f46d1fd6e2b 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.allScripts/models/com/mbeddr/allScripts/build.mps +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.allScripts/models/com/mbeddr/allScripts/build.mps @@ -3,7 +3,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -200,9 +200,6 @@ - - - @@ -234,7 +231,7 @@ - + @@ -305,7 +302,7 @@ - + @@ -378,7 +375,7 @@ - + @@ -451,7 +448,7 @@ - + @@ -524,7 +521,7 @@ - + @@ -600,7 +597,7 @@ - + @@ -663,7 +660,7 @@ - + @@ -734,7 +731,7 @@ - + @@ -801,82 +798,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.build/com.mbeddr.build.msd b/code/languages/com.mbeddr.build/solutions/com.mbeddr.build/com.mbeddr.build.msd index 3068926601d..b3e4dddda4c 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.build/com.mbeddr.build.msd +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.build/com.mbeddr.build.msd @@ -17,7 +17,7 @@ - + diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.build/models/com/mbeddr/build/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.build/models/com/mbeddr/build/build.mps index 8b2e535d60e..d02eb944c43 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.build/models/com/mbeddr/build/build.mps +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.build/models/com/mbeddr/build/build.mps @@ -3,7 +3,7 @@ - + @@ -147,7 +147,7 @@ - + @@ -687,27 +687,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -790,7 +769,7 @@ - + @@ -869,7 +848,7 @@ - + @@ -978,7 +957,7 @@ - + @@ -1059,7 +1038,7 @@ - + @@ -1224,7 +1203,7 @@ - + @@ -1303,7 +1282,7 @@ - + @@ -1575,7 +1554,7 @@ - + @@ -1651,7 +1630,7 @@ - + @@ -1792,7 +1771,7 @@ - + @@ -2277,7 +2256,7 @@ - + @@ -2752,7 +2731,7 @@ - + @@ -2958,7 +2937,7 @@ - + @@ -3126,16 +3105,6 @@ - - - - - - - - - - @@ -3156,11 +3125,6 @@ - - - - - @@ -3171,11 +3135,6 @@ - - - - - @@ -3313,7 +3272,7 @@ - + @@ -3442,7 +3401,7 @@ - + @@ -4500,8 +4459,8 @@ - - + + @@ -4509,7 +4468,7 @@ - + @@ -4843,7 +4802,7 @@ - + @@ -4922,7 +4881,7 @@ - + @@ -5001,7 +4960,7 @@ - + @@ -6193,7 +6152,7 @@ - + @@ -7175,7 +7134,7 @@ - + @@ -7526,7 +7485,7 @@ - + @@ -8020,7 +7979,7 @@ - + @@ -8086,7 +8045,7 @@ - + @@ -8381,7 +8340,7 @@ - + @@ -8659,7 +8618,7 @@ - + @@ -8840,7 +8799,7 @@ - + @@ -9740,7 +9699,7 @@ - + @@ -10282,7 +10241,7 @@ - + @@ -10376,7 +10335,7 @@ - + @@ -11071,7 +11030,7 @@ - + @@ -11169,7 +11128,7 @@ - + @@ -11264,92 +11223,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11556,10 +11429,6 @@ - - - - diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.cc.tests.dev.build/com.mbeddr.cc.tests.dev.build.msd b/code/languages/com.mbeddr.build/solutions/com.mbeddr.cc.tests.dev.build/com.mbeddr.cc.tests.dev.build.msd index fdacedd0a32..76f42cc65cd 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.cc.tests.dev.build/com.mbeddr.cc.tests.dev.build.msd +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.cc.tests.dev.build/com.mbeddr.cc.tests.dev.build.msd @@ -18,7 +18,7 @@ - + diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.cc.tests.dev.build/models/com/mbeddr/cc/tests/dev/build/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.cc.tests.dev.build/models/com/mbeddr/cc/tests/dev/build/build.mps index 197bc1f9978..af61da577e5 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.cc.tests.dev.build/models/com/mbeddr/cc/tests/dev/build/build.mps +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.cc.tests.dev.build/models/com/mbeddr/cc/tests/dev/build/build.mps @@ -3,7 +3,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -279,7 +279,7 @@ - + @@ -383,7 +383,7 @@ - + @@ -445,7 +445,7 @@ - + @@ -661,7 +661,7 @@ - + @@ -715,7 +715,7 @@ - + @@ -772,7 +772,7 @@ - + @@ -829,7 +829,7 @@ - + @@ -886,7 +886,7 @@ - + @@ -943,7 +943,7 @@ - + diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.build/com.mbeddr.core.tests.build.msd b/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.build/com.mbeddr.core.tests.build.msd index 3822e5461d0..a68ac227b5c 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.build/com.mbeddr.core.tests.build.msd +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.build/com.mbeddr.core.tests.build.msd @@ -18,7 +18,7 @@ - + diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.build/models/com/mbeddr/core/tests/build/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.build/models/com/mbeddr/core/tests/build/build.mps index b711ca4d0b2..f4231d74462 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.build/models/com/mbeddr/core/tests/build/build.mps +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.build/models/com/mbeddr/core/tests/build/build.mps @@ -4,7 +4,7 @@ - + @@ -105,7 +105,7 @@ - + @@ -175,7 +175,7 @@ - + @@ -244,7 +244,7 @@ - + @@ -440,7 +440,7 @@ - + @@ -560,7 +560,7 @@ - + @@ -727,7 +727,7 @@ - + @@ -794,7 +794,7 @@ - + @@ -861,7 +861,7 @@ - + @@ -941,7 +941,7 @@ - + @@ -1016,7 +1016,7 @@ - + @@ -1199,7 +1199,7 @@ - + @@ -1288,7 +1288,7 @@ - + diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.performance.build/com.mbeddr.core.tests.performance.build.msd b/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.performance.build/com.mbeddr.core.tests.performance.build.msd index a28a2ae376a..e5402857790 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.performance.build/com.mbeddr.core.tests.performance.build.msd +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.performance.build/com.mbeddr.core.tests.performance.build.msd @@ -18,7 +18,7 @@ - + diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.performance.build/models/com/mbeddr/core/tests/performance/build/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.performance.build/models/com/mbeddr/core/tests/performance/build/build.mps index 34901ef1dcc..36d014f6e3c 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.performance.build/models/com/mbeddr/core/tests/performance/build/build.mps +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.performance.build/models/com/mbeddr/core/tests/performance/build/build.mps @@ -4,7 +4,7 @@ - + @@ -103,7 +103,7 @@ - + @@ -187,7 +187,7 @@ - + diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.ext.build/build.msd b/code/languages/com.mbeddr.build/solutions/com.mbeddr.ext.build/build.msd index 4b5284f403d..f34cd3928d4 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.ext.build/build.msd +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.ext.build/build.msd @@ -18,7 +18,7 @@ - + diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.ext.build/models/com/mbeddr/ext/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.ext.build/models/com/mbeddr/ext/build.mps index 362305ac625..678dab40d19 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.ext.build/models/com/mbeddr/ext/build.mps +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.ext.build/models/com/mbeddr/ext/build.mps @@ -4,7 +4,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -297,7 +297,7 @@ - + @@ -354,7 +354,7 @@ - + @@ -408,7 +408,7 @@ - + @@ -470,7 +470,7 @@ - + @@ -554,7 +554,7 @@ - + @@ -616,7 +616,7 @@ - + @@ -672,7 +672,7 @@ - + @@ -733,7 +733,7 @@ - + @@ -794,7 +794,7 @@ - + @@ -855,7 +855,7 @@ - + @@ -916,7 +916,7 @@ - + @@ -1183,7 +1183,7 @@ - + @@ -1260,7 +1260,7 @@ - + @@ -1327,7 +1327,7 @@ - + @@ -1394,7 +1394,7 @@ - + @@ -1461,7 +1461,7 @@ - + @@ -1523,7 +1523,7 @@ - + @@ -1603,7 +1603,7 @@ - + @@ -1657,7 +1657,7 @@ - + @@ -1724,7 +1724,7 @@ - + diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/com.mbeddr.platform.tests.build.msd b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/com.mbeddr.platform.tests.build.msd index 9afa90ff423..3754e6970ce 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/com.mbeddr.platform.tests.build.msd +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/com.mbeddr.platform.tests.build.msd @@ -6,7 +6,7 @@ - + @@ -17,7 +17,7 @@ - + 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 19ef2dd03ab..bf564f88e1c 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 @@ -2,7 +2,7 @@ - + @@ -3575,6 +3575,11 @@ + + + + + diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/com.mbeddr.platform.msd b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/com.mbeddr.platform.msd index f0fe984a452..0d8f5e36415 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/com.mbeddr.platform.msd +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/com.mbeddr.platform.msd @@ -16,7 +16,7 @@ - + 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 15a14f9d29c..1f35218ba98 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 @@ -188,7 +188,6 @@ - @@ -303,13 +302,16 @@ - - - + + + + + + @@ -1530,28 +1532,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -1919,6 +1899,11 @@ + + + + + @@ -2293,186 +2278,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2544,45 +2349,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2633,6 +2399,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2724,22 +2529,22 @@ - - - - - - + + + + + + @@ -4624,6 +4429,11 @@ + + + + + @@ -4951,6 +4761,11 @@ + + + + + @@ -7671,28 +7486,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -7731,6 +7524,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -11964,6 +11779,11 @@ + + + + + @@ -11987,6 +11807,11 @@ + + + + + @@ -12042,6 +11867,11 @@ + + + + + @@ -12064,25 +11894,6 @@ - - - - - - - - - - - - - - - - - - - @@ -13196,44 +13007,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -13310,6 +13083,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16745,7 +16556,7 @@ - + @@ -16757,7 +16568,7 @@ - + @@ -16768,9 +16579,9 @@ - + - + @@ -16792,7 +16603,7 @@ - + @@ -16811,7 +16622,7 @@ - + @@ -16830,7 +16641,7 @@ - + @@ -16849,7 +16660,7 @@ - + @@ -16868,7 +16679,7 @@ - + @@ -16887,7 +16698,7 @@ - + @@ -16906,7 +16717,7 @@ - + @@ -16919,11 +16730,11 @@ - + - + @@ -16941,7 +16752,7 @@ - + @@ -16967,7 +16778,7 @@ - + @@ -16986,7 +16797,7 @@ - + @@ -17005,7 +16816,7 @@ - + @@ -17024,7 +16835,7 @@ - + @@ -17043,7 +16854,7 @@ - + @@ -17062,7 +16873,7 @@ - + @@ -17081,7 +16892,7 @@ - + @@ -17100,7 +16911,7 @@ - + @@ -17119,7 +16930,7 @@ - + @@ -17138,7 +16949,7 @@ - + @@ -17157,7 +16968,7 @@ - + @@ -17176,7 +16987,7 @@ - + @@ -17195,7 +17006,7 @@ - + @@ -17214,7 +17025,7 @@ - + @@ -17233,7 +17044,7 @@ - + @@ -17252,7 +17063,7 @@ - + @@ -17271,7 +17082,7 @@ - + @@ -17290,7 +17101,7 @@ - + @@ -17309,7 +17120,7 @@ - + @@ -17328,7 +17139,7 @@ - + @@ -17347,7 +17158,7 @@ - + @@ -17366,7 +17177,7 @@ - + @@ -17385,7 +17196,7 @@ - + @@ -17404,7 +17215,7 @@ - + @@ -17423,7 +17234,7 @@ - + @@ -17442,7 +17253,7 @@ - + @@ -17461,7 +17272,7 @@ - + @@ -17480,7 +17291,7 @@ - + @@ -17499,7 +17310,7 @@ - + @@ -17518,7 +17329,7 @@ - + @@ -17537,7 +17348,7 @@ - + @@ -17556,7 +17367,7 @@ - + @@ -17575,7 +17386,7 @@ - + @@ -17594,7 +17405,7 @@ - + @@ -17613,7 +17424,7 @@ - + @@ -17632,7 +17443,7 @@ - + @@ -17644,6 +17455,405 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -18623,28 +18833,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -18683,6 +18871,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -19582,6 +19792,11 @@ + + + + + @@ -19604,11 +19819,6 @@ - - - - - @@ -19650,9 +19860,6 @@ - - - @@ -19662,6 +19869,9 @@ + + + @@ -19931,12 +20141,6 @@ - - - - - - @@ -19978,7 +20182,7 @@ - + @@ -19995,7 +20199,7 @@ - + @@ -20012,7 +20216,7 @@ - + @@ -20029,7 +20233,7 @@ - + @@ -20046,7 +20250,7 @@ - + @@ -20063,7 +20267,7 @@ - + @@ -20080,7 +20284,7 @@ - + @@ -20193,34 +20397,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -20440,27 +20616,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -20601,10 +20756,6 @@ - - - - @@ -20628,129 +20779,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -20920,9 +20948,6 @@ - - - @@ -20945,6 +20970,15 @@ + + + + + + + + + diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.templates/com.mbeddr.build.templates.msd b/code/languages/com.mbeddr.build/solutions/com.mbeddr.templates/com.mbeddr.build.templates.msd index 5be70f85906..49c24f216b1 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.templates/com.mbeddr.build.templates.msd +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.templates/com.mbeddr.build.templates.msd @@ -18,7 +18,7 @@ - + diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.templates/models/com/mbeddr/build/templates/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.templates/models/com/mbeddr/build/templates/build.mps index 9f2b8d086d1..b48c2f600eb 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.templates/models/com/mbeddr/build/templates/build.mps +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.templates/models/com/mbeddr/build/templates/build.mps @@ -2,7 +2,7 @@ - + diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.xmodel.build/com.mbeddr.xmodel.build.msd b/code/languages/com.mbeddr.build/solutions/com.mbeddr.xmodel.build/com.mbeddr.xmodel.build.msd deleted file mode 100644 index 2d89d95c5d1..00000000000 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.xmodel.build/com.mbeddr.xmodel.build.msd +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - 7ac0dfb8-7d5f-4573-ab80-81af2106ce03(com.mbeddr.build) - 3ae9cfda-f938-4524-b4ca-fbcba3b0525b(com.mbeddr.platform) - d47a3921-8b42-4664-bed6-25e3e4fd6efb(com.mbeddr.core.tests.build) - 422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build) - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.xmodel.build/models/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.xmodel.build/models/build.mps deleted file mode 100644 index 7cf8fd48ac3..00000000000 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.xmodel.build/models/build.mps +++ /dev/null @@ -1,355 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.cc/.mps/migration.xml b/code/languages/com.mbeddr.cc/.mps/migration.xml index 65112394c89..6ad5e78e2c9 100644 --- a/code/languages/com.mbeddr.cc/.mps/migration.xml +++ b/code/languages/com.mbeddr.cc/.mps/migration.xml @@ -22,6 +22,7 @@ + @@ -30,6 +31,6 @@ - + \ No newline at end of file diff --git a/code/languages/com.mbeddr.cc/_spreferences/CodeReviewPreferences/module.msd b/code/languages/com.mbeddr.cc/_spreferences/CodeReviewPreferences/module.msd index 813bd6b25c5..70409129591 100644 --- a/code/languages/com.mbeddr.cc/_spreferences/CodeReviewPreferences/module.msd +++ b/code/languages/com.mbeddr.cc/_spreferences/CodeReviewPreferences/module.msd @@ -21,6 +21,7 @@ + diff --git a/code/languages/com.mbeddr.cc/_spreferences/PlatformTemplates/module.msd b/code/languages/com.mbeddr.cc/_spreferences/PlatformTemplates/module.msd index 9f1bbb7cb40..a37d75ee011 100644 --- a/code/languages/com.mbeddr.cc/_spreferences/PlatformTemplates/module.msd +++ b/code/languages/com.mbeddr.cc/_spreferences/PlatformTemplates/module.msd @@ -28,6 +28,7 @@ + diff --git a/code/languages/com.mbeddr.cc/_spreferences/TypeSizeConfiguration/models/com/mbeddr/cc/__spreferences/TypeSizeConfiguration.mps b/code/languages/com.mbeddr.cc/_spreferences/TypeSizeConfiguration/models/com/mbeddr/cc/__spreferences/TypeSizeConfiguration.mps index 2ff1f88936f..3f98e814818 100644 --- a/code/languages/com.mbeddr.cc/_spreferences/TypeSizeConfiguration/models/com/mbeddr/cc/__spreferences/TypeSizeConfiguration.mps +++ b/code/languages/com.mbeddr.cc/_spreferences/TypeSizeConfiguration/models/com/mbeddr/cc/__spreferences/TypeSizeConfiguration.mps @@ -1,6 +1,7 @@ + diff --git a/code/languages/com.mbeddr.cc/_spreferences/TypeSizeConfiguration/module.msd b/code/languages/com.mbeddr.cc/_spreferences/TypeSizeConfiguration/module.msd index f5bbc058a4f..b4ffdd7c927 100644 --- a/code/languages/com.mbeddr.cc/_spreferences/TypeSizeConfiguration/module.msd +++ b/code/languages/com.mbeddr.cc/_spreferences/TypeSizeConfiguration/module.msd @@ -22,6 +22,7 @@ + diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/c.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/c.mpl index dfe0a06f834..54fcf7ee5ea 100644 --- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/c.mpl +++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/c.mpl @@ -42,6 +42,7 @@ + @@ -87,12 +88,12 @@ - + @@ -168,6 +169,7 @@ + @@ -233,12 +235,12 @@ - + diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c2doc/com.mbeddr.cc.requirements.c2doc.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c2doc/com.mbeddr.cc.requirements.c2doc.mpl index 62058ccb3b9..d5a0e6c2f15 100644 --- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c2doc/com.mbeddr.cc.requirements.c2doc.mpl +++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c2doc/com.mbeddr.cc.requirements.c2doc.mpl @@ -43,6 +43,7 @@ + @@ -82,12 +83,12 @@ - + @@ -159,11 +160,11 @@ - + diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.csv/csv.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.csv/csv.mpl index f7e26e58434..19ec2b596df 100644 --- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.csv/csv.mpl +++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.csv/csv.mpl @@ -77,11 +77,11 @@ - + diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/com.mbeddr.cc.requirements.report.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/com.mbeddr.cc.requirements.report.mpl index 84cee757842..0a958e48585 100644 --- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/com.mbeddr.cc.requirements.report.mpl +++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.report/com.mbeddr.cc.requirements.report.mpl @@ -51,6 +51,7 @@ + @@ -102,11 +103,11 @@ - + @@ -164,6 +165,7 @@ + @@ -212,11 +214,11 @@ - + diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenario2doc/com.mbeddr.cc.requirements.scenario2doc.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenario2doc/com.mbeddr.cc.requirements.scenario2doc.mpl index 72387ad6e66..defe1ca2490 100644 --- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenario2doc/com.mbeddr.cc.requirements.scenario2doc.mpl +++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenario2doc/com.mbeddr.cc.requirements.scenario2doc.mpl @@ -44,6 +44,7 @@ + @@ -81,11 +82,11 @@ - + @@ -156,11 +157,11 @@ - + diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/scenarios.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/scenarios.mpl index 1023240dca3..a85bec34809 100644 --- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/scenarios.mpl +++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.scenarios/scenarios.mpl @@ -26,6 +26,7 @@ + @@ -74,12 +75,12 @@ - + diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/structure.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/structure.mps index 13c755113bc..3e95fa69b67 100644 --- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/structure.mps +++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/languageModels/structure.mps @@ -15,7 +15,6 @@ - @@ -27,19 +26,6 @@ - - - - - - - - - - - - - @@ -257,61 +243,27 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/wp.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/wp.mpl index 0fa41e5a203..8e143453477 100644 --- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/wp.mpl +++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.wp/wp.mpl @@ -75,11 +75,11 @@ - + diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/intentions.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/intentions.mps index 6db9a2bda30..8afc6866817 100644 --- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/intentions.mps +++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/intentions.mps @@ -1358,7 +1358,7 @@ - + @@ -1478,7 +1478,7 @@ - + @@ -1562,7 +1562,7 @@ - + @@ -2016,7 +2016,7 @@ - + diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/structure.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/structure.mps index 3a96130d588..650f16ca8d2 100644 --- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/structure.mps +++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/structure.mps @@ -25,7 +25,6 @@ - @@ -37,19 +36,6 @@ - - - - - - - - - - - - - @@ -1044,50 +1030,21 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1095,52 +1052,22 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/requirements.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/requirements.mpl index c06431b8748..644c2dbdaec 100644 --- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/requirements.mpl +++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/requirements.mpl @@ -64,11 +64,11 @@ - + @@ -115,6 +115,7 @@ + @@ -169,11 +170,11 @@ - + diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/solutions/pluginSolution/models/com/mbeddr/cc/requirements/pluginSolution/plugin.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/solutions/pluginSolution/models/com/mbeddr/cc/requirements/pluginSolution/plugin.mps index e8b8769a634..e7939a282fa 100644 --- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/solutions/pluginSolution/models/com/mbeddr/cc/requirements/pluginSolution/plugin.mps +++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/solutions/pluginSolution/models/com/mbeddr/cc/requirements/pluginSolution/plugin.mps @@ -45,6 +45,7 @@ + @@ -204,6 +205,7 @@ + diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/solutions/pluginSolution/pluginSolution.msd b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/solutions/pluginSolution/pluginSolution.msd index 45fbbc38fb1..f109f8554aa 100644 --- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/solutions/pluginSolution/pluginSolution.msd +++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/solutions/pluginSolution/pluginSolution.msd @@ -76,11 +76,11 @@ - + diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/solutions/pluginSolution/pluginSolution.msd b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/solutions/pluginSolution/pluginSolution.msd index cb9078ad9ac..f0bb04b237f 100644 --- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/solutions/pluginSolution/pluginSolution.msd +++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/solutions/pluginSolution/pluginSolution.msd @@ -44,11 +44,11 @@ - + diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/trace.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/trace.mpl index 04054792a6f..f7e2482a4b0 100644 --- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/trace.mpl +++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.trace/trace.mpl @@ -40,6 +40,7 @@ + @@ -71,11 +72,11 @@ - + @@ -170,11 +171,11 @@ - + diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/fm.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/fm.mpl index 9fe3e684bff..083df6cd61b 100644 --- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/fm.mpl +++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/fm.mpl @@ -83,12 +83,12 @@ - + @@ -165,6 +165,7 @@ + @@ -218,12 +219,12 @@ - + diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/solutions/pluginSolution/models/com/mbeddr/cc/var/annotations/pluginSolution/plugin.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/solutions/pluginSolution/models/com/mbeddr/cc/var/annotations/pluginSolution/plugin.mps index 2e1ed9d09b0..26b56f6c2c0 100644 --- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/solutions/pluginSolution/models/com/mbeddr/cc/var/annotations/pluginSolution/plugin.mps +++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/solutions/pluginSolution/models/com/mbeddr/cc/var/annotations/pluginSolution/plugin.mps @@ -39,6 +39,7 @@ + @@ -150,6 +151,7 @@ + diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/solutions/pluginSolution/pluginSolution.msd b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/solutions/pluginSolution/pluginSolution.msd index e7a8718a17e..75aa8c1fd5d 100644 --- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/solutions/pluginSolution/pluginSolution.msd +++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.annotations/solutions/pluginSolution/pluginSolution.msd @@ -53,12 +53,12 @@ - + diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/c.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/c.mpl index c36c1b89dd1..c9b65b326f1 100644 --- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/c.mpl +++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.c/c.mpl @@ -40,6 +40,7 @@ + @@ -85,12 +86,12 @@ - + @@ -201,12 +202,12 @@ - + diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/com.mbeddr.cc.var.composition.c.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/com.mbeddr.cc.var.composition.c.mpl index 4b35ecf0fe6..b6b49d226bc 100644 --- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/com.mbeddr.cc.var.composition.c.mpl +++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition.c/com.mbeddr.cc.var.composition.c.mpl @@ -44,6 +44,7 @@ + @@ -78,12 +79,12 @@ - + @@ -178,12 +179,12 @@ - + diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/com.mbeddr.cc.var.composition.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/com.mbeddr.cc.var.composition.mpl index 0f18e7b036a..59b94eae0bc 100644 --- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/com.mbeddr.cc.var.composition.mpl +++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.composition/com.mbeddr.cc.var.composition.mpl @@ -43,6 +43,7 @@ + @@ -86,12 +87,12 @@ - + @@ -208,12 +209,12 @@ - + diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/fm.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/fm.mpl index 96f400c95c2..716dfbf5235 100644 --- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/fm.mpl +++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/fm.mpl @@ -42,6 +42,7 @@ + @@ -99,13 +100,13 @@ - + diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/structure.mps b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/structure.mps index 5cfee875d78..dc97cec471a 100644 --- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/structure.mps +++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.fm/languageModels/structure.mps @@ -21,7 +21,6 @@ - @@ -33,19 +32,6 @@ - - - - - - - - - - - - - @@ -494,33 +480,13 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/comp.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/comp.mpl index 2107ba2bf46..ccd908836c8 100644 --- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/comp.mpl +++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt.comp/comp.mpl @@ -48,6 +48,7 @@ + @@ -90,12 +91,12 @@ - + @@ -195,12 +196,12 @@ - + diff --git a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/rt.mpl b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/rt.mpl index 3ef162be397..f9c8de72f37 100644 --- a/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/rt.mpl +++ b/code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.var.rt/rt.mpl @@ -51,6 +51,7 @@ + @@ -92,12 +93,12 @@ - + @@ -162,6 +163,7 @@ + @@ -208,12 +210,12 @@ - + diff --git a/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.requirements.c.interpreter/com.mbeddr.cc.requirements.c.interpreter.msd b/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.requirements.c.interpreter/com.mbeddr.cc.requirements.c.interpreter.msd index aa46ee1d16a..73faa7cfae4 100644 --- a/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.requirements.c.interpreter/com.mbeddr.cc.requirements.c.interpreter.msd +++ b/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.requirements.c.interpreter/com.mbeddr.cc.requirements.c.interpreter.msd @@ -57,12 +57,12 @@ - + diff --git a/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.var.annotations.interpreter/com.mbeddr.cc.var.annotations.interpreter.msd b/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.var.annotations.interpreter/com.mbeddr.cc.var.annotations.interpreter.msd index 07dbf924eeb..917880b1940 100644 --- a/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.var.annotations.interpreter/com.mbeddr.cc.var.annotations.interpreter.msd +++ b/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.var.annotations.interpreter/com.mbeddr.cc.var.annotations.interpreter.msd @@ -47,12 +47,12 @@ - + diff --git a/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.var.fm.interpreter/com.mbeddr.cc.var.fm.interpreter.msd b/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.var.fm.interpreter/com.mbeddr.cc.var.fm.interpreter.msd index dff08c140c6..2cc10fb30fb 100644 --- a/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.var.fm.interpreter/com.mbeddr.cc.var.fm.interpreter.msd +++ b/code/languages/com.mbeddr.cc/solutions/com.mbeddr.cc.var.fm.interpreter/com.mbeddr.cc.var.fm.interpreter.msd @@ -46,12 +46,12 @@ - + diff --git a/code/languages/com.mbeddr.cc/tests/test.ex.cc.fm/fm.msd b/code/languages/com.mbeddr.cc/tests/test.ex.cc.fm/fm.msd index b4210495da2..49187ee0056 100644 --- a/code/languages/com.mbeddr.cc/tests/test.ex.cc.fm/fm.msd +++ b/code/languages/com.mbeddr.cc/tests/test.ex.cc.fm/fm.msd @@ -51,6 +51,7 @@ + diff --git a/code/languages/com.mbeddr.cc/tests/test.ex.cc.fmrt/fmrt.msd b/code/languages/com.mbeddr.cc/tests/test.ex.cc.fmrt/fmrt.msd index 84852a4b4d2..b62b5ce6811 100644 --- a/code/languages/com.mbeddr.cc/tests/test.ex.cc.fmrt/fmrt.msd +++ b/code/languages/com.mbeddr.cc/tests/test.ex.cc.fmrt/fmrt.msd @@ -43,6 +43,7 @@ + diff --git a/code/languages/com.mbeddr.cc/tests/test.ex.cc.requirements.c/c.msd b/code/languages/com.mbeddr.cc/tests/test.ex.cc.requirements.c/c.msd index c0c1316a1dd..e57c30702f8 100644 --- a/code/languages/com.mbeddr.cc/tests/test.ex.cc.requirements.c/c.msd +++ b/code/languages/com.mbeddr.cc/tests/test.ex.cc.requirements.c/c.msd @@ -35,6 +35,7 @@ + diff --git a/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.alternative/test.ex.cc.var.alternative.msd b/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.alternative/test.ex.cc.var.alternative.msd index b6f7d227638..4d1a3ff665a 100644 --- a/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.alternative/test.ex.cc.var.alternative.msd +++ b/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.alternative/test.ex.cc.var.alternative.msd @@ -44,6 +44,7 @@ + diff --git a/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.c/c.msd b/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.c/c.msd index d4959e1297e..1be3d3d651e 100644 --- a/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.c/c.msd +++ b/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.c/c.msd @@ -45,6 +45,7 @@ + diff --git a/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.composition/test.ex.cc.var.composition.msd b/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.composition/test.ex.cc.var.composition.msd index d6c543bfd04..c48adadbf29 100644 --- a/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.composition/test.ex.cc.var.composition.msd +++ b/code/languages/com.mbeddr.cc/tests/test.ex.cc.var.composition/test.ex.cc.var.composition.msd @@ -42,6 +42,7 @@ + diff --git a/code/languages/com.mbeddr.cc/tests/test.ts.cc.requirements/models/reqs.mps b/code/languages/com.mbeddr.cc/tests/test.ts.cc.requirements/models/reqs.mps index cac6bb57488..1f4322a9ac1 100644 --- a/code/languages/com.mbeddr.cc/tests/test.ts.cc.requirements/models/reqs.mps +++ b/code/languages/com.mbeddr.cc/tests/test.ts.cc.requirements/models/reqs.mps @@ -28,6 +28,16 @@ + + + + + + + + + + @@ -43,6 +53,9 @@ + + + @@ -85,6 +98,7 @@ + @@ -280,5 +294,16 @@ + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.cc/tests/test.ts.cc.requirements/requirements.msd b/code/languages/com.mbeddr.cc/tests/test.ts.cc.requirements/requirements.msd index a6eeb7cf2a1..d11ef3dea69 100644 --- a/code/languages/com.mbeddr.cc/tests/test.ts.cc.requirements/requirements.msd +++ b/code/languages/com.mbeddr.cc/tests/test.ts.cc.requirements/requirements.msd @@ -59,6 +59,7 @@ + @@ -92,12 +93,12 @@ - + diff --git a/code/languages/com.mbeddr.cc/tests/test.ts.cc.var.c/c.msd b/code/languages/com.mbeddr.cc/tests/test.ts.cc.var.c/c.msd index 593ddabdd2a..5033c3f40d5 100644 --- a/code/languages/com.mbeddr.cc/tests/test.ts.cc.var.c/c.msd +++ b/code/languages/com.mbeddr.cc/tests/test.ts.cc.var.c/c.msd @@ -35,6 +35,7 @@ + @@ -66,12 +67,12 @@ - + diff --git a/code/languages/com.mbeddr.cc/tests/test.ts.cc.var.c/models/test/ts/cc/var/c/m1@tests.mps b/code/languages/com.mbeddr.cc/tests/test.ts.cc.var.c/models/test/ts/cc/var/c/m1@tests.mps index b276d1a823f..459b0304329 100644 --- a/code/languages/com.mbeddr.cc/tests/test.ts.cc.var.c/models/test/ts/cc/var/c/m1@tests.mps +++ b/code/languages/com.mbeddr.cc/tests/test.ts.cc.var.c/models/test/ts/cc/var/c/m1@tests.mps @@ -489,6 +489,9 @@ + + + diff --git a/code/languages/com.mbeddr.cc/tests/test.ts.cc.var.composition/test.ts.cc.var.composition.msd b/code/languages/com.mbeddr.cc/tests/test.ts.cc.var.composition/test.ts.cc.var.composition.msd index 132c79e0c10..1a7bf5d3036 100644 --- a/code/languages/com.mbeddr.cc/tests/test.ts.cc.var.composition/test.ts.cc.var.composition.msd +++ b/code/languages/com.mbeddr.cc/tests/test.ts.cc.var.composition/test.ts.cc.var.composition.msd @@ -50,6 +50,7 @@ + @@ -79,12 +80,12 @@ - + diff --git a/code/languages/com.mbeddr.core/.mps/migration.xml b/code/languages/com.mbeddr.core/.mps/migration.xml index 65112394c89..6ad5e78e2c9 100644 --- a/code/languages/com.mbeddr.core/.mps/migration.xml +++ b/code/languages/com.mbeddr.core/.mps/migration.xml @@ -22,6 +22,7 @@ + @@ -30,6 +31,6 @@ - + \ No newline at end of file diff --git a/code/languages/com.mbeddr.core/.mps/modules.xml b/code/languages/com.mbeddr.core/.mps/modules.xml index 2eaad73b0c4..e33f94de31f 100644 --- a/code/languages/com.mbeddr.core/.mps/modules.xml +++ b/code/languages/com.mbeddr.core/.mps/modules.xml @@ -54,7 +54,7 @@ - + diff --git a/code/languages/com.mbeddr.core/_spreferences/CodeReviewPreferences/module.msd b/code/languages/com.mbeddr.core/_spreferences/CodeReviewPreferences/module.msd index ca0836e23bd..25e565f2393 100644 --- a/code/languages/com.mbeddr.core/_spreferences/CodeReviewPreferences/module.msd +++ b/code/languages/com.mbeddr.core/_spreferences/CodeReviewPreferences/module.msd @@ -21,6 +21,7 @@ + diff --git a/code/languages/com.mbeddr.core/_spreferences/PlatformTemplates/module.msd b/code/languages/com.mbeddr.core/_spreferences/PlatformTemplates/module.msd index 6db7806c84c..a35a4328284 100644 --- a/code/languages/com.mbeddr.core/_spreferences/PlatformTemplates/module.msd +++ b/code/languages/com.mbeddr.core/_spreferences/PlatformTemplates/module.msd @@ -28,6 +28,7 @@ + diff --git a/code/languages/com.mbeddr.core/_spreferences/TypeSizeConfiguration/models/com.mbeddr.core.__spreferences.TypeSizeConfiguration.mps b/code/languages/com.mbeddr.core/_spreferences/TypeSizeConfiguration/models/com.mbeddr.core.__spreferences.TypeSizeConfiguration.mps index 507e2c9b6bc..8f99a428e57 100644 --- a/code/languages/com.mbeddr.core/_spreferences/TypeSizeConfiguration/models/com.mbeddr.core.__spreferences.TypeSizeConfiguration.mps +++ b/code/languages/com.mbeddr.core/_spreferences/TypeSizeConfiguration/models/com.mbeddr.core.__spreferences.TypeSizeConfiguration.mps @@ -1,6 +1,7 @@ + diff --git a/code/languages/com.mbeddr.core/_spreferences/TypeSizeConfiguration/module.msd b/code/languages/com.mbeddr.core/_spreferences/TypeSizeConfiguration/module.msd index e17ad1b7362..ce8aac58eb5 100644 --- a/code/languages/com.mbeddr.core/_spreferences/TypeSizeConfiguration/module.msd +++ b/code/languages/com.mbeddr.core/_spreferences/TypeSizeConfiguration/module.msd @@ -22,6 +22,7 @@ + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/arrays.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/arrays.mpl index 1ecbe1383ce..0e976cfbda0 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/arrays.mpl +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/arrays.mpl @@ -42,6 +42,7 @@ + @@ -77,12 +78,12 @@ - + @@ -137,6 +138,7 @@ + @@ -190,12 +192,12 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/base.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/base.mpl index 265ed4b6de1..c9c5c979797 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/base.mpl +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/base.mpl @@ -63,11 +63,11 @@ - + @@ -130,6 +130,7 @@ + @@ -196,11 +197,11 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/structure.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/structure.mps index ce324ba3a71..9b650fee3f5 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/structure.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/structure.mps @@ -150,7 +150,6 @@ - @@ -171,19 +170,6 @@ - - - - - - - - - - - - - @@ -1715,42 +1701,17 @@ - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1758,33 +1719,13 @@ - - - - - - - - - - - - - - - - - - - - @@ -1792,39 +1733,17 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps index 0042dbbd10b..61e5e6d2f6c 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps @@ -130,6 +130,7 @@ + @@ -144,6 +145,7 @@ + @@ -297,6 +299,10 @@ + + + + @@ -1163,6 +1169,7 @@ + @@ -2079,6 +2086,7 @@ + @@ -3802,6 +3810,7 @@ + @@ -3817,6 +3826,7 @@ + @@ -6074,6 +6084,7 @@ + @@ -6146,6 +6157,7 @@ + @@ -7507,6 +7519,7 @@ + @@ -7899,6 +7912,7 @@ + @@ -12530,6 +12544,7 @@ + @@ -16572,52 +16587,45 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - + + + + + - - + + + + + + + + + + + @@ -16701,6 +16709,7 @@ + @@ -16730,6 +16739,7 @@ + @@ -16746,6 +16756,7 @@ + @@ -16759,6 +16770,7 @@ + @@ -16773,6 +16785,7 @@ + @@ -16787,6 +16800,7 @@ + @@ -16799,6 +16813,7 @@ + @@ -16817,6 +16832,7 @@ + @@ -16925,15 +16941,30 @@ - - - - + + + + + - - - - + + + + + + + + + + + + + + + + + + @@ -16996,6 +17027,7 @@ + @@ -18542,6 +18574,7 @@ + @@ -18647,15 +18680,30 @@ - - - - + + + + + - - - - + + + + + + + + + + + + + + + + + + @@ -18683,6 +18731,7 @@ + @@ -19522,6 +19571,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -20503,11 +20574,11 @@ - + - + @@ -22039,6 +22110,7 @@ + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/pluginSolution.msd b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/pluginSolution.msd index 3dcd57dff99..ab960639329 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/pluginSolution.msd +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/solutions/pluginSolution/pluginSolution.msd @@ -42,6 +42,7 @@ + @@ -83,11 +84,11 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/buildconfig.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/buildconfig.mpl index d33159d240f..1f5217baaf7 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/buildconfig.mpl +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/buildconfig.mpl @@ -57,6 +57,7 @@ + @@ -113,12 +114,12 @@ - + @@ -249,6 +250,7 @@ + @@ -305,12 +307,12 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/structure.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/structure.mps index 99717de410e..f0fa97bf5f1 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/structure.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/languageModels/structure.mps @@ -22,7 +22,6 @@ - @@ -32,19 +31,6 @@ - - - - - - - - - - - - - @@ -662,23 +648,9 @@ - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/solution/pluginSolution/com.mbddr.core.buildconfig.pluginSolution.msd b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/solution/pluginSolution/com.mbddr.core.buildconfig.pluginSolution.msd index 6a723ef4cac..00d1f1f0453 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/solution/pluginSolution/com.mbddr.core.buildconfig.pluginSolution.msd +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.buildconfig/solution/pluginSolution/com.mbddr.core.buildconfig.pluginSolution.msd @@ -50,12 +50,12 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.checks/com.mbeddr.core.checks.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.checks/com.mbeddr.core.checks.mpl index cf09ef93a90..8a0230a8edf 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.checks/com.mbeddr.core.checks.mpl +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.checks/com.mbeddr.core.checks.mpl @@ -72,13 +72,13 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/com.mbeddr.core.cinterpreter.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/com.mbeddr.core.cinterpreter.mpl index d8661381fb5..f72bd58588a 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/com.mbeddr.core.cinterpreter.mpl +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.cinterpreter/com.mbeddr.core.cinterpreter.mpl @@ -86,12 +86,12 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/com.mbeddr.core.codereview.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/com.mbeddr.core.codereview.mpl index bece3b3f5fc..70d0653143e 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/com.mbeddr.core.codereview.mpl +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/com.mbeddr.core.codereview.mpl @@ -93,11 +93,11 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/behavior.mps index 762875d4226..18bc9813448 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/behavior.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.codereview/models/behavior.mps @@ -12,7 +12,7 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.dependencies/com.mbeddr.core.dependencies.msd b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.dependencies/com.mbeddr.core.dependencies.msd index 2a87c15ac2f..d70f6e8b9d9 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.dependencies/com.mbeddr.core.dependencies.msd +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.dependencies/com.mbeddr.core.dependencies.msd @@ -59,12 +59,12 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.dependencies/models/com/mbeddr/core/dependencies/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.dependencies/models/com/mbeddr/core/dependencies/plugin.mps index eb8839f2fd8..9ceba1b6713 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.dependencies/models/com/mbeddr/core/dependencies/plugin.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.dependencies/models/com/mbeddr/core/dependencies/plugin.mps @@ -33,6 +33,7 @@ + @@ -510,7 +511,7 @@ - + @@ -1281,6 +1282,7 @@ + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/embedded.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/embedded.mpl index e962007c216..6586c38f70f 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/embedded.mpl +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/embedded.mpl @@ -50,6 +50,7 @@ + @@ -95,12 +96,12 @@ - + @@ -209,12 +210,12 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/languageModels/structure.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/languageModels/structure.mps index a7a5de7190b..bab67e861ab 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/languageModels/structure.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/languageModels/structure.mps @@ -17,7 +17,6 @@ - @@ -30,19 +29,6 @@ - - - - - - - - - - - - - @@ -493,34 +479,14 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/expressions.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/expressions.mpl index 2828a1f6dd5..3130ca6994b 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/expressions.mpl +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/expressions.mpl @@ -36,6 +36,7 @@ + @@ -65,12 +66,12 @@ - + @@ -183,12 +184,12 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/structure.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/structure.mps index eeff3dd8d45..6dfbfa4d9df 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/structure.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/structure.mps @@ -20,7 +20,6 @@ - @@ -32,20 +31,6 @@ - - - - - - - - - - - - - - @@ -1668,61 +1653,25 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/solutions/pluginSolution/com.mbeddt.core.expressions.pluginSolution.msd b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/solutions/pluginSolution/com.mbeddt.core.expressions.pluginSolution.msd index 347908b0285..c965740deea 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/solutions/pluginSolution/com.mbeddt.core.expressions.pluginSolution.msd +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/solutions/pluginSolution/com.mbeddt.core.expressions.pluginSolution.msd @@ -43,12 +43,12 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/legacy.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/legacy.mpl index 9c185ec5f21..861e1fd1af5 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/legacy.mpl +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/legacy.mpl @@ -75,12 +75,12 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/solutions/pluginSolution/pluginSolution.msd b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/solutions/pluginSolution/pluginSolution.msd index ea83fb86a3f..3ae9eb33aea 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/solutions/pluginSolution/pluginSolution.msd +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.legacy/solutions/pluginSolution/pluginSolution.msd @@ -44,12 +44,12 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/structure.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/structure.mps index 5a3f4ccdadf..2d1a9df02ea 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/structure.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/structure.mps @@ -20,7 +20,6 @@ - @@ -35,22 +34,6 @@ - - - - - - - - - - - - - - - - @@ -664,61 +647,25 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -767,61 +714,25 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/make.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/make.mpl index 7c3f2cfa4a7..107b01e2176 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/make.mpl +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/make.mpl @@ -138,12 +138,12 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/gen.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/gen.mpl index 21fa284d4a4..ecbcdc694b6 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/gen.mpl +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/gen.mpl @@ -74,6 +74,7 @@ + @@ -119,12 +120,12 @@ - + @@ -277,12 +278,12 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/structure.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/structure.mps index 3a0baf0cc4e..b395d56a584 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/structure.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/languageModels/structure.mps @@ -19,7 +19,6 @@ - @@ -38,20 +37,6 @@ - - - - - - - - - - - - - - @@ -444,36 +429,15 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/structure.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/structure.mps index 96a89dd0448..de6f499d604 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/structure.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/structure.mps @@ -25,7 +25,6 @@ - @@ -44,20 +43,6 @@ - - - - - - - - - - - - - - @@ -1613,34 +1598,13 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/modules.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/modules.mpl index f40ccf04f8a..d05497a479d 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/modules.mpl +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/modules.mpl @@ -51,6 +51,7 @@ + @@ -94,12 +95,12 @@ - + @@ -177,6 +178,7 @@ + @@ -247,13 +249,13 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/solutions/pluginSolution/pluginSolution.msd b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/solutions/pluginSolution/pluginSolution.msd index 235bcc69eb3..fc84d7f591a 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/solutions/pluginSolution/pluginSolution.msd +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/solutions/pluginSolution/pluginSolution.msd @@ -58,12 +58,12 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.qa/com.mbeddr.core.qa.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.qa/com.mbeddr.core.qa.mpl index ab022ca574b..52b7c8d2410 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.qa/com.mbeddr.core.qa.mpl +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.qa/com.mbeddr.core.qa.mpl @@ -37,6 +37,7 @@ + @@ -66,11 +67,11 @@ - + @@ -109,6 +110,7 @@ + @@ -153,12 +155,12 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.runconfiguration/solutions/pluginSolution/models/com/mbeddr/core/runconfiguration/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.runconfiguration/solutions/pluginSolution/models/com/mbeddr/core/runconfiguration/pluginSolution/plugin.mps index 49c48dd69cf..562296503f1 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.runconfiguration/solutions/pluginSolution/models/com/mbeddr/core/runconfiguration/pluginSolution/plugin.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.runconfiguration/solutions/pluginSolution/models/com/mbeddr/core/runconfiguration/pluginSolution/plugin.mps @@ -78,6 +78,8 @@ + + @@ -4096,20 +4098,24 @@ - - - - - + + + + + + + + + + + + + - + - - - - diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.runconfiguration/solutions/pluginSolution/pluginSolution.msd b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.runconfiguration/solutions/pluginSolution/pluginSolution.msd index 839655558b8..b987b8d509d 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.runconfiguration/solutions/pluginSolution/pluginSolution.msd +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.runconfiguration/solutions/pluginSolution/pluginSolution.msd @@ -39,6 +39,7 @@ + @@ -83,12 +84,12 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/solutions/pluginSolution/pluginSolution.msd b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/solutions/pluginSolution/pluginSolution.msd index ea68cf85319..bd45a44d569 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/solutions/pluginSolution/pluginSolution.msd +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/solutions/pluginSolution/pluginSolution.msd @@ -44,12 +44,12 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/statements.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/statements.mpl index ac3156e3405..83bed079044 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/statements.mpl +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/statements.mpl @@ -43,6 +43,7 @@ + @@ -103,12 +104,12 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/udt.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/udt.mpl index 5812a96dc58..97b3db2cc5c 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/udt.mpl +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/udt.mpl @@ -55,12 +55,12 @@ - + @@ -79,16 +79,12 @@ - 61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions) 3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) - d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base) 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) - efda956e-491e-4f00-ba14-36af2f213ecf(com.mbeddr.core.udt) 7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem) c1c2a88a-323c-4605-a37d-9ab77a2ccbd2(com.mbeddr.mpsutil.suppresswarning) - ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) @@ -108,6 +104,7 @@ + @@ -166,12 +163,12 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/structure.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/structure.mps index 18d129d22f1..d38c4dc8d29 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/structure.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/structure.mps @@ -25,7 +25,6 @@ - @@ -38,20 +37,6 @@ - - - - - - - - - - - - - - @@ -641,36 +626,15 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/solutions/pluginSolution/models/com/mbeddr/core/unittest/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/solutions/pluginSolution/models/com/mbeddr/core/unittest/pluginSolution/plugin.mps index c29b755e0ee..b8e021292ef 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/solutions/pluginSolution/models/com/mbeddr/core/unittest/pluginSolution/plugin.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/solutions/pluginSolution/models/com/mbeddr/core/unittest/pluginSolution/plugin.mps @@ -39,6 +39,7 @@ + @@ -531,6 +532,7 @@ + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/solutions/pluginSolution/pluginSolution.msd b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/solutions/pluginSolution/pluginSolution.msd index a96ea2be1aa..05455d7c1c6 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/solutions/pluginSolution/pluginSolution.msd +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/solutions/pluginSolution/pluginSolution.msd @@ -31,6 +31,7 @@ + @@ -71,12 +72,12 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/unittest.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/unittest.mpl index 71335fd13ec..56e84caa8de 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/unittest.mpl +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/unittest.mpl @@ -65,6 +65,7 @@ + @@ -114,12 +115,12 @@ - + @@ -248,6 +249,7 @@ + @@ -310,12 +312,12 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/editor.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/editor.mps index 1b9d2a582cc..42682a25a0b 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/editor.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/editor.mps @@ -36,6 +36,7 @@ + @@ -370,6 +371,7 @@ + @@ -530,7 +532,6 @@ - @@ -1396,28 +1397,49 @@ - - - - - + + + + + + + + - - + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/structure.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/structure.mps index d0b9506461a..d050e8b0d67 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/structure.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/structure.mps @@ -25,7 +25,6 @@ - @@ -40,21 +39,6 @@ - - - - - - - - - - - - - - - @@ -1825,42 +1809,17 @@ - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1868,37 +1827,15 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/solutions/pluginSolution/models/com/mbeddr/core/util/pluginSolution/plugin.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/solutions/pluginSolution/models/com/mbeddr/core/util/pluginSolution/plugin.mps index d5b78a74957..3150aac5f7b 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/solutions/pluginSolution/models/com/mbeddr/core/util/pluginSolution/plugin.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/solutions/pluginSolution/models/com/mbeddr/core/util/pluginSolution/plugin.mps @@ -82,6 +82,7 @@ + @@ -609,6 +610,7 @@ + @@ -6748,6 +6750,7 @@ + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/solutions/pluginSolution/pluginSolution.msd b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/solutions/pluginSolution/pluginSolution.msd index 92be20c1fc7..e11423d97d0 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/solutions/pluginSolution/pluginSolution.msd +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/solutions/pluginSolution/pluginSolution.msd @@ -80,12 +80,12 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/util.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/util.mpl index 688b83327d3..eedc00d36d8 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/util.mpl +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/util.mpl @@ -62,6 +62,7 @@ + @@ -109,12 +110,12 @@ - + @@ -349,7 +350,7 @@ c1c2a88a-323c-4605-a37d-9ab77a2ccbd2(com.mbeddr.mpsutil.suppresswarning) 61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions) 8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform) - efda956e-491e-4f00-ba14-36af2f213ecf(com.mbeddr.core.udt) + efda956e-491e-4f00-ba14-36af2f213ecf(com.mbeddr.core.udt) 92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext) 18bc6592-03a6-4e29-a83a-7ff23bde13ba(jetbrains.mps.lang.editor) @@ -379,6 +380,7 @@ + @@ -435,12 +437,12 @@ - + diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.expressions.interpreter/com.mbeddr.core.expressions.interpreter.msd b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.expressions.interpreter/com.mbeddr.core.expressions.interpreter.msd index 4c06ac742c6..5a1b00abe4d 100644 --- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.expressions.interpreter/com.mbeddr.core.expressions.interpreter.msd +++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.expressions.interpreter/com.mbeddr.core.expressions.interpreter.msd @@ -48,12 +48,12 @@ - + diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.expressions.runtime/com.mbeddr.core.expressions.runtime.msd b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.expressions.runtime/com.mbeddr.core.expressions.runtime.msd index 32d89f63e0b..7a39bba3780 100644 --- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.expressions.runtime/com.mbeddr.core.expressions.runtime.msd +++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.expressions.runtime/com.mbeddr.core.expressions.runtime.msd @@ -43,12 +43,12 @@ - + diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.interpreterdebugger.rt/com.mbeddr.core.interpreterdebugger.rt.msd b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.interpreterdebugger.rt/com.mbeddr.core.interpreterdebugger.rt.msd index 2733ff14f74..5a96a678838 100644 --- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.interpreterdebugger.rt/com.mbeddr.core.interpreterdebugger.rt.msd +++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.interpreterdebugger.rt/com.mbeddr.core.interpreterdebugger.rt.msd @@ -49,11 +49,11 @@ - + diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.legacy.interpreter/com.mbeddr.core.legacy.interpreter.msd b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.legacy.interpreter/com.mbeddr.core.legacy.interpreter.msd index 3b502b10c41..00a4b497957 100644 --- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.legacy.interpreter/com.mbeddr.core.legacy.interpreter.msd +++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.legacy.interpreter/com.mbeddr.core.legacy.interpreter.msd @@ -46,12 +46,12 @@ - + diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.modules.interpreter/com.mbeddr.core.modules.interpreter.msd b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.modules.interpreter/com.mbeddr.core.modules.interpreter.msd index 26f67f1a1ef..4461eaaf813 100644 --- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.modules.interpreter/com.mbeddr.core.modules.interpreter.msd +++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.modules.interpreter/com.mbeddr.core.modules.interpreter.msd @@ -52,12 +52,12 @@ - + diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.pointers.interpreter/com.mbeddr.core.pointers.interpreter.msd b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.pointers.interpreter/com.mbeddr.core.pointers.interpreter.msd index 97dcb07e369..efe75945336 100644 --- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.pointers.interpreter/com.mbeddr.core.pointers.interpreter.msd +++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.pointers.interpreter/com.mbeddr.core.pointers.interpreter.msd @@ -49,12 +49,12 @@ - + diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.statements.interpreter/com.mbeddr.core.statements.interpreter.msd b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.statements.interpreter/com.mbeddr.core.statements.interpreter.msd index 76d5bd59f99..2b008172e58 100644 --- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.statements.interpreter/com.mbeddr.core.statements.interpreter.msd +++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.statements.interpreter/com.mbeddr.core.statements.interpreter.msd @@ -53,12 +53,12 @@ - + diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/com.mbeddr.core.stdlib.msd b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/com.mbeddr.core.stdlib.msd index ecab0d9fd27..d8a19dc45e8 100644 --- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/com.mbeddr.core.stdlib.msd +++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/com.mbeddr.core.stdlib.msd @@ -28,6 +28,7 @@ + diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.util.interpreter/com.mbeddr.core.util.interpreter.msd b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.util.interpreter/com.mbeddr.core.util.interpreter.msd index fd7c0a4c32d..91a68b8b696 100644 --- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.util.interpreter/com.mbeddr.core.util.interpreter.msd +++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.util.interpreter/com.mbeddr.core.util.interpreter.msd @@ -52,12 +52,12 @@ - + diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.tutorialActions/models/com/mbeddr/tutorialActions/plugin.mps b/code/languages/com.mbeddr.core/solutions/com.mbeddr.tutorialActions/models/com/mbeddr/tutorialActions/plugin.mps index 4e8385ad3c4..e93491fb6e8 100644 --- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.tutorialActions/models/com/mbeddr/tutorialActions/plugin.mps +++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.tutorialActions/models/com/mbeddr/tutorialActions/plugin.mps @@ -65,6 +65,10 @@ + + + + @@ -1583,6 +1587,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.core/tests/aLibrary/aLibrary.msd b/code/languages/com.mbeddr.core/tests/aLibrary/aLibrary.msd index cd06e8eeb7e..9be7760923e 100644 --- a/code/languages/com.mbeddr.core/tests/aLibrary/aLibrary.msd +++ b/code/languages/com.mbeddr.core/tests/aLibrary/aLibrary.msd @@ -46,6 +46,7 @@ + diff --git a/code/languages/com.mbeddr.core/tests/test.assessments.testlang/test.assessments.testlang.mpl b/code/languages/com.mbeddr.core/tests/test.assessments.testlang/test.assessments.testlang.mpl index f5024c465e8..d0ff1a1e0e1 100644 --- a/code/languages/com.mbeddr.core/tests/test.assessments.testlang/test.assessments.testlang.mpl +++ b/code/languages/com.mbeddr.core/tests/test.assessments.testlang/test.assessments.testlang.mpl @@ -62,11 +62,11 @@ - + diff --git a/code/languages/com.mbeddr.core/tests/test.assessments/test.assessments.msd b/code/languages/com.mbeddr.core/tests/test.assessments/test.assessments.msd index a17e8bd48fc..82d3adca0a3 100644 --- a/code/languages/com.mbeddr.core/tests/test.assessments/test.assessments.msd +++ b/code/languages/com.mbeddr.core/tests/test.assessments/test.assessments.msd @@ -26,6 +26,7 @@ + @@ -51,11 +52,11 @@ - + diff --git a/code/languages/com.mbeddr.core/tests/test.editor.core/test.editor.core.msd b/code/languages/com.mbeddr.core/tests/test.editor.core/test.editor.core.msd index 04e85d65a11..d5148342b2f 100644 --- a/code/languages/com.mbeddr.core/tests/test.editor.core/test.editor.core.msd +++ b/code/languages/com.mbeddr.core/tests/test.editor.core/test.editor.core.msd @@ -49,6 +49,7 @@ + diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/core.msd b/code/languages/com.mbeddr.core/tests/test.ex.core/core.msd index c1ea5aab0f9..77e174a7d7b 100644 --- a/code/languages/com.mbeddr.core/tests/test.ex.core/core.msd +++ b/code/languages/com.mbeddr.core/tests/test.ex.core/core.msd @@ -47,6 +47,7 @@ + diff --git a/code/languages/com.mbeddr.core/tests/test.ex.errorreporting/errorreporting.msd b/code/languages/com.mbeddr.core/tests/test.ex.errorreporting/errorreporting.msd index 8ec15719c29..fcf113d40a0 100644 --- a/code/languages/com.mbeddr.core/tests/test.ex.errorreporting/errorreporting.msd +++ b/code/languages/com.mbeddr.core/tests/test.ex.errorreporting/errorreporting.msd @@ -45,6 +45,7 @@ + diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core.checks/test.ts.core.checks.msd b/code/languages/com.mbeddr.core/tests/test.ts.core.checks/test.ts.core.checks.msd index 2ed61cf023e..ffc915de9d5 100644 --- a/code/languages/com.mbeddr.core/tests/test.ts.core.checks/test.ts.core.checks.msd +++ b/code/languages/com.mbeddr.core/tests/test.ts.core.checks/test.ts.core.checks.msd @@ -34,6 +34,7 @@ + diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core.dataflow/dataflow.msd b/code/languages/com.mbeddr.core/tests/test.ts.core.dataflow/dataflow.msd index 28e9407ccab..dc6720aaf5d 100644 --- a/code/languages/com.mbeddr.core/tests/test.ts.core.dataflow/dataflow.msd +++ b/code/languages/com.mbeddr.core/tests/test.ts.core.dataflow/dataflow.msd @@ -45,6 +45,7 @@ + @@ -77,12 +78,12 @@ - + diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core.extended/test.ts.core.extended.msd b/code/languages/com.mbeddr.core/tests/test.ts.core.extended/test.ts.core.extended.msd index 4bcfaa549a4..c0c345369dc 100644 --- a/code/languages/com.mbeddr.core/tests/test.ts.core.extended/test.ts.core.extended.msd +++ b/code/languages/com.mbeddr.core/tests/test.ts.core.extended/test.ts.core.extended.msd @@ -46,6 +46,7 @@ + @@ -80,12 +81,12 @@ - + diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core.performance/test.ts.core.performance.msd b/code/languages/com.mbeddr.core/tests/test.ts.core.performance/test.ts.core.performance.msd index 475db13b3df..e4fdf340fcb 100644 --- a/code/languages/com.mbeddr.core/tests/test.ts.core.performance/test.ts.core.performance.msd +++ b/code/languages/com.mbeddr.core/tests/test.ts.core.performance/test.ts.core.performance.msd @@ -41,6 +41,7 @@ + @@ -81,12 +82,12 @@ - + diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core/core.msd b/code/languages/com.mbeddr.core/tests/test.ts.core/core.msd index 62b09c8b641..108ec9dd12a 100644 --- a/code/languages/com.mbeddr.core/tests/test.ts.core/core.msd +++ b/code/languages/com.mbeddr.core/tests/test.ts.core/core.msd @@ -60,6 +60,7 @@ + @@ -104,12 +105,12 @@ - + diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests1@tests.mps b/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests1@tests.mps index c46ac773104..2b5b311e953 100644 --- a/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests1@tests.mps +++ b/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests1@tests.mps @@ -55,7 +55,7 @@ - + @@ -117,7 +117,7 @@ - + @@ -156,10 +156,10 @@ - + - + @@ -327,7 +327,7 @@ - + @@ -394,10 +394,10 @@ - + - + @@ -405,7 +405,7 @@ - + @@ -476,7 +476,7 @@ - + @@ -517,7 +517,7 @@ - + @@ -579,7 +579,7 @@ - + @@ -727,6 +727,9 @@ + + + @@ -1022,6 +1025,9 @@ + + + @@ -16232,6 +16238,9 @@ + + + diff --git a/code/languages/com.mbeddr.doc.aspect/.mps/migration.xml b/code/languages/com.mbeddr.doc.aspect/.mps/migration.xml index f2bdcb6c621..d5d8c250626 100644 --- a/code/languages/com.mbeddr.doc.aspect/.mps/migration.xml +++ b/code/languages/com.mbeddr.doc.aspect/.mps/migration.xml @@ -22,12 +22,13 @@ + - + \ No newline at end of file diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage.extended/com.mbeddr.doc.aspect.exampleLanguage.extended.mpl b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage.extended/com.mbeddr.doc.aspect.exampleLanguage.extended.mpl index f74f5c45299..559cc7cbb2b 100644 --- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage.extended/com.mbeddr.doc.aspect.exampleLanguage.extended.mpl +++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage.extended/com.mbeddr.doc.aspect.exampleLanguage.extended.mpl @@ -53,11 +53,11 @@ - + @@ -94,6 +94,7 @@ + @@ -141,11 +142,11 @@ - + diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/com.mbeddr.doc.aspect.exampleLanguage.mpl b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/com.mbeddr.doc.aspect.exampleLanguage.mpl index 0c01c8d4b95..8a869a5036f 100644 --- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/com.mbeddr.doc.aspect.exampleLanguage.mpl +++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/com.mbeddr.doc.aspect.exampleLanguage.mpl @@ -32,6 +32,7 @@ + @@ -81,11 +82,11 @@ - + diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/sandbox/com.mbeddr.doc.aspect.exampleLanguage.sandbox.msd b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/sandbox/com.mbeddr.doc.aspect.exampleLanguage.sandbox.msd index 5c37bc4a166..3ef30a3a268 100644 --- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/sandbox/com.mbeddr.doc.aspect.exampleLanguage.sandbox.msd +++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/sandbox/com.mbeddr.doc.aspect.exampleLanguage.sandbox.msd @@ -22,6 +22,7 @@ + diff --git a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/com.mbeddr.doc.aspect.mpl b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/com.mbeddr.doc.aspect.mpl index 545f7949450..ade634cdda2 100644 --- a/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/com.mbeddr.doc.aspect.mpl +++ b/code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect/com.mbeddr.doc.aspect.mpl @@ -73,11 +73,11 @@ - + @@ -168,11 +168,11 @@ - + diff --git a/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.runtime/com.mbeddr.doc.aspect.runtime.msd b/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.runtime/com.mbeddr.doc.aspect.runtime.msd index ec949cfbc2a..cb07f733162 100644 --- a/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.runtime/com.mbeddr.doc.aspect.runtime.msd +++ b/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.runtime/com.mbeddr.doc.aspect.runtime.msd @@ -54,11 +54,11 @@ - + diff --git a/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/com.mbeddr.doc.aspect.ui.msd b/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/com.mbeddr.doc.aspect.ui.msd index 937941db7f5..08d0c7ba87d 100644 --- a/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/com.mbeddr.doc.aspect.ui.msd +++ b/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/com.mbeddr.doc.aspect.ui.msd @@ -73,6 +73,7 @@ + diff --git a/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/models/com/mbeddr/doc/aspect/ui/plugin.mps b/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/models/com/mbeddr/doc/aspect/ui/plugin.mps index 9d90ae2d89a..1dab9a5835a 100644 --- a/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/models/com/mbeddr/doc/aspect/ui/plugin.mps +++ b/code/languages/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/models/com/mbeddr/doc/aspect/ui/plugin.mps @@ -91,6 +91,7 @@ + @@ -489,15 +490,30 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -526,6 +542,7 @@ + @@ -1157,12 +1174,27 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.doc/.mps/migration.xml b/code/languages/com.mbeddr.doc/.mps/migration.xml index 65112394c89..6ad5e78e2c9 100644 --- a/code/languages/com.mbeddr.doc/.mps/migration.xml +++ b/code/languages/com.mbeddr.doc/.mps/migration.xml @@ -22,6 +22,7 @@ + @@ -30,6 +31,6 @@ - + \ No newline at end of file diff --git a/code/languages/com.mbeddr.doc/.mps/modules.xml b/code/languages/com.mbeddr.doc/.mps/modules.xml index 2bff5b2bfc3..f45c75a16ed 100644 --- a/code/languages/com.mbeddr.doc/.mps/modules.xml +++ b/code/languages/com.mbeddr.doc/.mps/modules.xml @@ -18,13 +18,13 @@ - + - + diff --git a/code/languages/com.mbeddr.doc/_spreferences/PlatformTemplates/module.msd b/code/languages/com.mbeddr.doc/_spreferences/PlatformTemplates/module.msd index 6d668271b87..1ba31299cf2 100644 --- a/code/languages/com.mbeddr.doc/_spreferences/PlatformTemplates/module.msd +++ b/code/languages/com.mbeddr.doc/_spreferences/PlatformTemplates/module.msd @@ -28,6 +28,7 @@ + diff --git a/code/languages/com.mbeddr.doc/_spreferences/TypeSizeConfiguration/models/com.mbeddr.doc.__spreferences.TypeSizeConfiguration.mps b/code/languages/com.mbeddr.doc/_spreferences/TypeSizeConfiguration/models/com.mbeddr.doc.__spreferences.TypeSizeConfiguration.mps index d6eacc66b83..85deb361a2c 100644 --- a/code/languages/com.mbeddr.doc/_spreferences/TypeSizeConfiguration/models/com.mbeddr.doc.__spreferences.TypeSizeConfiguration.mps +++ b/code/languages/com.mbeddr.doc/_spreferences/TypeSizeConfiguration/models/com.mbeddr.doc.__spreferences.TypeSizeConfiguration.mps @@ -1,6 +1,7 @@ + diff --git a/code/languages/com.mbeddr.doc/_spreferences/TypeSizeConfiguration/module.msd b/code/languages/com.mbeddr.doc/_spreferences/TypeSizeConfiguration/module.msd index 57f84bb7117..1c222e40bda 100644 --- a/code/languages/com.mbeddr.doc/_spreferences/TypeSizeConfiguration/module.msd +++ b/code/languages/com.mbeddr.doc/_spreferences/TypeSizeConfiguration/module.msd @@ -22,6 +22,7 @@ + diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/com.mbeddr.doc.expressions.mpl b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/com.mbeddr.doc.expressions.mpl index 57840149a03..b9e0d0acdee 100644 --- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/com.mbeddr.doc.expressions.mpl +++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.expressions/com.mbeddr.doc.expressions.mpl @@ -42,6 +42,7 @@ + @@ -76,12 +77,12 @@ - + @@ -171,12 +172,12 @@ - + diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_latex/com.mbeddr.doc.gen_latex.mpl b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_latex/com.mbeddr.doc.gen_latex.mpl index fdaa00a1a6c..957164c9ea5 100644 --- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_latex/com.mbeddr.doc.gen_latex.mpl +++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_latex/com.mbeddr.doc.gen_latex.mpl @@ -45,6 +45,7 @@ + @@ -79,11 +80,11 @@ - + @@ -169,11 +170,11 @@ - + diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_markdown/com.mbeddr.doc.gen_markdown.mpl b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_markdown/com.mbeddr.doc.gen_markdown.mpl index 734c0a1b5bb..7dd8b7cbc99 100644 --- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_markdown/com.mbeddr.doc.gen_markdown.mpl +++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_markdown/com.mbeddr.doc.gen_markdown.mpl @@ -76,11 +76,11 @@ - + @@ -166,11 +166,11 @@ - + diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/com.mbeddr.doc.gen_xhtml.mpl b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/com.mbeddr.doc.gen_xhtml.mpl index e54ddd88653..0020446b89c 100644 --- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/com.mbeddr.doc.gen_xhtml.mpl +++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/com.mbeddr.doc.gen_xhtml.mpl @@ -49,6 +49,7 @@ + @@ -84,11 +85,11 @@ - + @@ -183,6 +184,7 @@ + @@ -243,11 +245,11 @@ - + diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.latex/com.mbeddr.doc.latex.mpl b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.latex/com.mbeddr.doc.latex.mpl index eba73ff9038..e51a2748dda 100644 --- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.latex/com.mbeddr.doc.latex.mpl +++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.latex/com.mbeddr.doc.latex.mpl @@ -64,11 +64,11 @@ - + diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.markdown/com.mbeddr.doc.markdown.mpl b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.markdown/com.mbeddr.doc.markdown.mpl index 627ab742f39..c595b251946 100644 --- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.markdown/com.mbeddr.doc.markdown.mpl +++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.markdown/com.mbeddr.doc.markdown.mpl @@ -118,11 +118,11 @@ - + diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.meta/com.mbeddr.doc.meta.mpl b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.meta/com.mbeddr.doc.meta.mpl index d62cfcb064c..2cb3985bb9c 100644 --- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.meta/com.mbeddr.doc.meta.mpl +++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.meta/com.mbeddr.doc.meta.mpl @@ -41,6 +41,7 @@ + @@ -73,11 +74,11 @@ - + @@ -185,11 +186,11 @@ - + diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.qa/com.mbeddr.doc.qa.mpl b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.qa/com.mbeddr.doc.qa.mpl index 2669e2de7ef..3bc884fc183 100644 --- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.qa/com.mbeddr.doc.qa.mpl +++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.qa/com.mbeddr.doc.qa.mpl @@ -38,6 +38,7 @@ + @@ -68,11 +69,11 @@ - + @@ -147,12 +148,12 @@ - + diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/com.mbeddr.doc.self.mpl b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/com.mbeddr.doc.self.mpl index 5d34c24deaa..382b08c4995 100644 --- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/com.mbeddr.doc.self.mpl +++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/com.mbeddr.doc.self.mpl @@ -44,6 +44,7 @@ + @@ -77,11 +78,11 @@ - + @@ -130,7 +131,6 @@ - @@ -144,7 +144,6 @@ - @@ -154,8 +153,6 @@ - - @@ -177,12 +174,12 @@ - + diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/languageModels/com.mbeddr.doc.self.plugin.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/languageModels/com.mbeddr.doc.self.plugin.mps index 60335f9e9a2..11b3a6ee3c5 100644 --- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/languageModels/com.mbeddr.doc.self.plugin.mps +++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.self/languageModels/com.mbeddr.doc.self.plugin.mps @@ -2,15 +2,13 @@ - - - - + + @@ -30,8 +28,10 @@ + + @@ -49,6 +49,12 @@ + + + + + + @@ -73,9 +79,19 @@ + + + + + + + + + + @@ -86,6 +102,134 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -96,16 +240,11 @@ - - - - - - - - - - + + + + + diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/doc.mpl b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/doc.mpl index 2b15ff11830..5ec3b8043cf 100644 --- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/doc.mpl +++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/doc.mpl @@ -47,6 +47,7 @@ + @@ -82,13 +83,14 @@ + - + @@ -270,13 +272,14 @@ + - + diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/editor.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/editor.mps index 0836e3b7ae8..c16bbbd1439 100644 --- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/editor.mps +++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/editor.mps @@ -85,6 +85,7 @@ + @@ -8635,20 +8636,35 @@ - - - - - - - + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/plugin.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/plugin.mps index dfca79de977..f113b985dba 100644 --- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/plugin.mps +++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/plugin.mps @@ -10,8 +10,6 @@ - - @@ -40,7 +38,6 @@ - @@ -52,8 +49,10 @@ - - + + + + @@ -93,6 +92,7 @@ + @@ -757,6 +757,7 @@ + @@ -1063,7 +1064,6 @@ - @@ -1073,16 +1073,11 @@ - - - - - - - - - - + + + + + @@ -1749,6 +1744,134 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1856,16 +1979,10 @@ - - - - - - - - - - + + + + diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/solutions/pluginssolution/com.mbeddr.doc.pluginsolution.msd b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/solutions/pluginssolution/com.mbeddr.doc.pluginsolution.msd index 6b370f821b0..65f42a19eeb 100644 --- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/solutions/pluginssolution/com.mbeddr.doc.pluginsolution.msd +++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/solutions/pluginssolution/com.mbeddr.doc.pluginsolution.msd @@ -79,11 +79,11 @@ - + diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/solutions/pluginssolution/models/com/mbeddr/doc/pluginSolution/plugin.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/solutions/pluginssolution/models/com/mbeddr/doc/pluginSolution/plugin.mps index 1da3e10e78f..bda93ead82d 100644 --- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/solutions/pluginssolution/models/com/mbeddr/doc/pluginSolution/plugin.mps +++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/solutions/pluginssolution/models/com/mbeddr/doc/pluginSolution/plugin.mps @@ -30,9 +30,10 @@ + + - @@ -55,6 +56,7 @@ + @@ -642,6 +644,7 @@ + @@ -1341,6 +1344,7 @@ + @@ -1393,15 +1397,30 @@ - - - - + + + + + - - - - + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.slides/com.mbeddr.slides.mpl b/code/languages/com.mbeddr.doc/languages/com.mbeddr.slides/com.mbeddr.slides.mpl index f50da94422e..5ee8688ae33 100644 --- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.slides/com.mbeddr.slides.mpl +++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.slides/com.mbeddr.slides.mpl @@ -38,6 +38,7 @@ + @@ -70,11 +71,11 @@ - + @@ -154,11 +155,11 @@ - + diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/generator/template/com/mbeddr/spreadsheat/generator/main/util.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/generator/template/com/mbeddr/spreadsheat/generator/main/util.mps similarity index 99% rename from code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/generator/template/com/mbeddr/spreadsheat/generator/main/util.mps rename to code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/generator/template/com/mbeddr/spreadsheat/generator/main/util.mps index 258497ac28b..e06b72e1523 100644 --- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/generator/template/com/mbeddr/spreadsheat/generator/main/util.mps +++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/generator/template/com/mbeddr/spreadsheat/generator/main/util.mps @@ -1,13 +1,13 @@ - + - - + + @@ -762,4 +762,3 @@ - diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/generator/template/com/mbeddr/spreadsheat/generator/template/main@generator.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/generator/template/com/mbeddr/spreadsheat/generator/template/main@generator.mps similarity index 99% rename from code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/generator/template/com/mbeddr/spreadsheat/generator/template/main@generator.mps rename to code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/generator/template/com/mbeddr/spreadsheat/generator/template/main@generator.mps index 701bca6f2ba..3db619c19e6 100644 --- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/generator/template/com/mbeddr/spreadsheat/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/generator/template/com/mbeddr/spreadsheat/generator/template/main@generator.mps @@ -1,5 +1,5 @@ - + @@ -9,19 +9,19 @@ - - - + + + - - + + - + @@ -1793,4 +1793,3 @@ - diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/behavior.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/languageModels/behavior.mps similarity index 99% rename from code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/behavior.mps rename to code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/languageModels/behavior.mps index bbccaab52e7..36edb22dd89 100644 --- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/behavior.mps +++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/languageModels/behavior.mps @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ - + @@ -92,7 +92,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -186,7 +186,7 @@ - + @@ -918,4 +918,3 @@ - diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/com.mbeddr.spreadsheat.enumMigration.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/languageModels/com.mbeddr.spreadsheet.enumMigration.mps similarity index 98% rename from code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/com.mbeddr.spreadsheat.enumMigration.mps rename to code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/languageModels/com.mbeddr.spreadsheet.enumMigration.mps index 6499cbc95d7..a3acdb7f9de 100644 --- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/com.mbeddr.spreadsheat.enumMigration.mps +++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/languageModels/com.mbeddr.spreadsheet.enumMigration.mps @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -92,7 +92,7 @@ - + @@ -261,4 +261,3 @@ - diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/constraints.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/languageModels/constraints.mps similarity index 99% rename from code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/constraints.mps rename to code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/languageModels/constraints.mps index 4c9bc19a09c..cbd1d134b9b 100644 --- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/constraints.mps +++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/languageModels/constraints.mps @@ -1,13 +1,13 @@ - + - + - + @@ -50,7 +50,7 @@ - + @@ -344,4 +344,3 @@ - diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/editor.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/languageModels/editor.mps similarity index 99% rename from code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/editor.mps rename to code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/languageModels/editor.mps index 710d65ae4da..92dc5d45d35 100644 --- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/editor.mps +++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/languageModels/editor.mps @@ -1,16 +1,16 @@ - + - + - + @@ -65,7 +65,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -153,7 +153,7 @@ - + @@ -190,7 +190,7 @@ - + @@ -875,4 +875,3 @@ - diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/structure.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/languageModels/structure.mps similarity index 80% rename from code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/structure.mps rename to code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/languageModels/structure.mps index b6c83680699..fb64463a269 100644 --- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/structure.mps +++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/languageModels/structure.mps @@ -1,5 +1,5 @@ - + @@ -14,7 +14,6 @@ - @@ -26,20 +25,6 @@ - - - - - - - - - - - - - - @@ -389,155 +374,67 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/typesystem.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/languageModels/typesystem.mps similarity index 92% rename from code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/typesystem.mps rename to code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/languageModels/typesystem.mps index 1558bd82d38..d0e56573739 100644 --- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/languageModels/typesystem.mps +++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/languageModels/typesystem.mps @@ -1,5 +1,5 @@ - + @@ -7,4 +7,3 @@ - diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/lib/commons-codec-1.10.jar b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/lib/commons-codec-1.10.jar similarity index 100% rename from code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/lib/commons-codec-1.10.jar rename to code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/lib/commons-codec-1.10.jar diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/lib/commons-collections4-4.1.jar b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/lib/commons-collections4-4.1.jar similarity index 100% rename from code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/lib/commons-collections4-4.1.jar rename to code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/lib/commons-collections4-4.1.jar diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/lib/curvesapi-1.04.jar b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/lib/curvesapi-1.04.jar similarity index 100% rename from code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/lib/curvesapi-1.04.jar rename to code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/lib/curvesapi-1.04.jar diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/lib/poi-5.0.0.jar b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/lib/poi-5.0.0.jar similarity index 100% rename from code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/lib/poi-5.0.0.jar rename to code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/lib/poi-5.0.0.jar diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/lib/poi-ooxml-5.0.0.jar b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/lib/poi-ooxml-5.0.0.jar similarity index 100% rename from code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/lib/poi-ooxml-5.0.0.jar rename to code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/lib/poi-ooxml-5.0.0.jar diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/lib/poi-ooxml-lite-5.0.0.jar b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/lib/poi-ooxml-lite-5.0.0.jar similarity index 100% rename from code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/lib/poi-ooxml-lite-5.0.0.jar rename to code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/lib/poi-ooxml-lite-5.0.0.jar diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/lib/xmlbeans-4.0.0.jar b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/lib/xmlbeans-4.0.0.jar similarity index 100% rename from code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/lib/xmlbeans-4.0.0.jar rename to code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/lib/xmlbeans-4.0.0.jar diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/spreadsheat.mpl b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/spreadsheet.mpl similarity index 89% rename from code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/spreadsheat.mpl rename to code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/spreadsheet.mpl index 03189be9a6b..8b918aa0a70 100644 --- a/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheat/spreadsheat.mpl +++ b/code/languages/com.mbeddr.doc/languages/com.mbeddr.spreadsheet/spreadsheet.mpl @@ -1,5 +1,5 @@ - + @@ -51,11 +51,32 @@ + + + + + + + + + + + + + + + + + + + + + - + @@ -68,7 +89,7 @@ - 1d891f7b-dc93-42f9-a4bc-b016656b14e2(com.mbeddr.spreadsheat) + 1d891f7b-dc93-42f9-a4bc-b016656b14e2(com.mbeddr.spreadsheet) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 2764de2d-de8a-48ff-9db3-f78342da5c1a(com.mbeddr.core.base#8626086128958648025) @@ -103,17 +124,17 @@ - - + + - + @@ -129,9 +150,9 @@ - + - + @@ -201,16 +222,16 @@ - + - + @@ -228,4 +249,3 @@ d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base) - diff --git a/code/languages/com.mbeddr.doc/languages/terms/com.mbeddr.doc.terms.mpl b/code/languages/com.mbeddr.doc/languages/terms/com.mbeddr.doc.terms.mpl index 724f88750d5..0c3d677de81 100644 --- a/code/languages/com.mbeddr.doc/languages/terms/com.mbeddr.doc.terms.mpl +++ b/code/languages/com.mbeddr.doc/languages/terms/com.mbeddr.doc.terms.mpl @@ -39,6 +39,7 @@ + @@ -70,11 +71,11 @@ - + @@ -114,6 +115,7 @@ 92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext) + @@ -170,11 +172,11 @@ - + diff --git a/code/languages/com.mbeddr.doc/languages/terms/languageModels/editor.mps b/code/languages/com.mbeddr.doc/languages/terms/languageModels/editor.mps index fd695c4f4d2..8b781d1e30f 100644 --- a/code/languages/com.mbeddr.doc/languages/terms/languageModels/editor.mps +++ b/code/languages/com.mbeddr.doc/languages/terms/languageModels/editor.mps @@ -4,6 +4,7 @@ + @@ -24,7 +25,6 @@ - @@ -81,7 +81,6 @@ - @@ -91,7 +90,9 @@ - + + + @@ -123,7 +124,21 @@ + + + + + + + + + + + + + + @@ -341,22 +356,6 @@ - - - - - - - - - - - - - - - - @@ -369,6 +368,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.doc/com.mbeddr.doc.doc.msd b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.doc/com.mbeddr.doc.doc.msd index 97acf22a9a6..ac31254870e 100644 --- a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.doc/com.mbeddr.doc.doc.msd +++ b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.doc/com.mbeddr.doc.doc.msd @@ -54,6 +54,7 @@ + diff --git a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.markdown.sandbox/com.mbeddr.doc.markdown.sandbox.msd b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.markdown.sandbox/com.mbeddr.doc.markdown.sandbox.msd index ac2ba57ddca..e96f67ace12 100644 --- a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.markdown.sandbox/com.mbeddr.doc.markdown.sandbox.msd +++ b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.markdown.sandbox/com.mbeddr.doc.markdown.sandbox.msd @@ -31,6 +31,7 @@ + @@ -60,11 +61,11 @@ - + diff --git a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.slides.sandbox/com.mbeddr.doc.slides.sandbox.msd b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.slides.sandbox/com.mbeddr.doc.slides.sandbox.msd index db4ba1d0d07..be5721c93c1 100644 --- a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.slides.sandbox/com.mbeddr.doc.slides.sandbox.msd +++ b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.slides.sandbox/com.mbeddr.doc.slides.sandbox.msd @@ -27,6 +27,7 @@ + diff --git a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/com.mbeddr.doc.test.documents.msd b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/com.mbeddr.doc.test.documents.msd index fb74609a784..211e6b5745d 100644 --- a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/com.mbeddr.doc.test.documents.msd +++ b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.test.documents/com.mbeddr.doc.test.documents.msd @@ -32,6 +32,7 @@ + diff --git a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.spreadsheat.sandbox/com.mbeddr.spreadsheat.sandbox.msd b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.spreadsheet.sandbox/com.mbeddr.spreadsheet.sandbox.msd similarity index 88% rename from code/languages/com.mbeddr.doc/solutions/com.mbeddr.spreadsheat.sandbox/com.mbeddr.spreadsheat.sandbox.msd rename to code/languages/com.mbeddr.doc/solutions/com.mbeddr.spreadsheet.sandbox/com.mbeddr.spreadsheet.sandbox.msd index 62c4dadb7ac..be8da396f6a 100644 --- a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.spreadsheat.sandbox/com.mbeddr.spreadsheat.sandbox.msd +++ b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.spreadsheet.sandbox/com.mbeddr.spreadsheet.sandbox.msd @@ -1,5 +1,5 @@ - + @@ -16,18 +16,19 @@ - + + - + diff --git a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.spreadsheat.sandbox/models/com/mbeddr/spreadsheat/sandbox/sandbox.mps b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.spreadsheet.sandbox/models/com/mbeddr/spreadsheat/sandbox/sandbox.mps similarity index 89% rename from code/languages/com.mbeddr.doc/solutions/com.mbeddr.spreadsheat.sandbox/models/com/mbeddr/spreadsheat/sandbox/sandbox.mps rename to code/languages/com.mbeddr.doc/solutions/com.mbeddr.spreadsheet.sandbox/models/com/mbeddr/spreadsheat/sandbox/sandbox.mps index e610e3bb2b4..dba80fb066e 100644 --- a/code/languages/com.mbeddr.doc/solutions/com.mbeddr.spreadsheat.sandbox/models/com/mbeddr/spreadsheat/sandbox/sandbox.mps +++ b/code/languages/com.mbeddr.doc/solutions/com.mbeddr.spreadsheet.sandbox/models/com/mbeddr/spreadsheat/sandbox/sandbox.mps @@ -1,29 +1,29 @@ - + - + - - - - + + + + - + - + - + - + diff --git a/code/languages/com.mbeddr.doc/tests/tests.ts.doc/tests.ts.doc.msd b/code/languages/com.mbeddr.doc/tests/tests.ts.doc/tests.ts.doc.msd index deb978aac9f..a706aa14a20 100644 --- a/code/languages/com.mbeddr.doc/tests/tests.ts.doc/tests.ts.doc.msd +++ b/code/languages/com.mbeddr.doc/tests/tests.ts.doc/tests.ts.doc.msd @@ -35,6 +35,7 @@ + @@ -62,11 +63,11 @@ - + diff --git a/code/languages/com.mbeddr.ext/.mps/migration.xml b/code/languages/com.mbeddr.ext/.mps/migration.xml index 65112394c89..6ad5e78e2c9 100644 --- a/code/languages/com.mbeddr.ext/.mps/migration.xml +++ b/code/languages/com.mbeddr.ext/.mps/migration.xml @@ -22,6 +22,7 @@ + @@ -30,6 +31,6 @@ - + \ No newline at end of file diff --git a/code/languages/com.mbeddr.ext/_spreferences/CodeReviewPreferences/module.msd b/code/languages/com.mbeddr.ext/_spreferences/CodeReviewPreferences/module.msd index 6ae7ededf7a..ed5bc3f128e 100644 --- a/code/languages/com.mbeddr.ext/_spreferences/CodeReviewPreferences/module.msd +++ b/code/languages/com.mbeddr.ext/_spreferences/CodeReviewPreferences/module.msd @@ -21,6 +21,7 @@ + diff --git a/code/languages/com.mbeddr.ext/_spreferences/PlatformTemplates/module.msd b/code/languages/com.mbeddr.ext/_spreferences/PlatformTemplates/module.msd index 9a70bca5ea5..90a425a3f52 100644 --- a/code/languages/com.mbeddr.ext/_spreferences/PlatformTemplates/module.msd +++ b/code/languages/com.mbeddr.ext/_spreferences/PlatformTemplates/module.msd @@ -28,6 +28,7 @@ + diff --git a/code/languages/com.mbeddr.ext/_spreferences/TypeSizeConfiguration/models/com/mbeddr/ext/__spreferences/TypeSizeConfiguration.mps b/code/languages/com.mbeddr.ext/_spreferences/TypeSizeConfiguration/models/com/mbeddr/ext/__spreferences/TypeSizeConfiguration.mps index 00783bff87f..ad54dfef881 100644 --- a/code/languages/com.mbeddr.ext/_spreferences/TypeSizeConfiguration/models/com/mbeddr/ext/__spreferences/TypeSizeConfiguration.mps +++ b/code/languages/com.mbeddr.ext/_spreferences/TypeSizeConfiguration/models/com/mbeddr/ext/__spreferences/TypeSizeConfiguration.mps @@ -1,6 +1,7 @@ + diff --git a/code/languages/com.mbeddr.ext/_spreferences/TypeSizeConfiguration/module.msd b/code/languages/com.mbeddr.ext/_spreferences/TypeSizeConfiguration/module.msd index dd2eb56a4ec..40ad7c91615 100644 --- a/code/languages/com.mbeddr.ext/_spreferences/TypeSizeConfiguration/module.msd +++ b/code/languages/com.mbeddr.ext/_spreferences/TypeSizeConfiguration/module.msd @@ -22,6 +22,7 @@ + diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/com.mbeddr.ext.components.concurrency.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/com.mbeddr.ext.components.concurrency.mpl index 8e6fe44776e..e10e78546aa 100644 --- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/com.mbeddr.ext.components.concurrency.mpl +++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.concurrency/com.mbeddr.ext.components.concurrency.mpl @@ -59,6 +59,7 @@ + @@ -105,12 +106,12 @@ - + @@ -375,12 +376,12 @@ - + diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/com.mbeddr.ext.components.embedded.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/com.mbeddr.ext.components.embedded.mpl index 27d73952d83..414c79a66b2 100644 --- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/com.mbeddr.ext.components.embedded.mpl +++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.embedded/com.mbeddr.ext.components.embedded.mpl @@ -54,6 +54,7 @@ + @@ -105,12 +106,12 @@ - + @@ -233,12 +234,12 @@ - + diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/gen_nomw.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/gen_nomw.mpl index 19d2f5fd6cc..2f42d3f9e0a 100644 --- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/gen_nomw.mpl +++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.gen_nomw/gen_nomw.mpl @@ -70,6 +70,7 @@ + @@ -127,12 +128,12 @@ - + @@ -208,6 +209,7 @@ + @@ -264,12 +266,12 @@ - + diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/mock.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/mock.mpl index 5895043efb5..411cd024cee 100644 --- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/mock.mpl +++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.mock/mock.mpl @@ -55,6 +55,7 @@ + @@ -96,12 +97,12 @@ - + @@ -163,6 +164,7 @@ + @@ -207,12 +209,12 @@ - + diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/sm_comp.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/sm_comp.mpl index cfd6ba3f0e4..ab76ffc86a9 100644 --- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/sm_comp.mpl +++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.statemachine/sm_comp.mpl @@ -57,6 +57,7 @@ + @@ -104,12 +105,12 @@ - + @@ -267,12 +268,12 @@ - + diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.test/test.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.test/test.mpl index 8ecc31b2d8f..1754d213348 100644 --- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.test/test.mpl +++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.test/test.mpl @@ -64,6 +64,7 @@ + @@ -116,12 +117,12 @@ - + @@ -232,12 +233,12 @@ - + diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.units/com.mbeddr.ext.components.units.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.units/com.mbeddr.ext.components.units.mpl index 21d9730be5e..d5df4a766cf 100644 --- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.units/com.mbeddr.ext.components.units.mpl +++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components.units/com.mbeddr.ext.components.units.mpl @@ -46,6 +46,7 @@ + @@ -86,12 +87,12 @@ - + @@ -182,12 +183,12 @@ - + diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/components.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/components.mpl index 3861f02d48d..f3d1525c139 100644 --- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/components.mpl +++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/components.mpl @@ -43,6 +43,7 @@ + @@ -80,12 +81,12 @@ - + @@ -146,6 +147,7 @@ + @@ -207,12 +209,12 @@ - + diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/solutions/pluginSolution/models/com/mbeddr/ext/components/pluginSolution/plugin.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/solutions/pluginSolution/models/com/mbeddr/ext/components/pluginSolution/plugin.mps index bc973651773..5e76196a339 100644 --- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/solutions/pluginSolution/models/com/mbeddr/ext/components/pluginSolution/plugin.mps +++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/solutions/pluginSolution/models/com/mbeddr/ext/components/pluginSolution/plugin.mps @@ -56,6 +56,7 @@ + @@ -792,6 +793,7 @@ + diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/solutions/pluginSolution/pluginSolution.msd b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/solutions/pluginSolution/pluginSolution.msd index 32516ff070f..1b960c63033 100644 --- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/solutions/pluginSolution/pluginSolution.msd +++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.components/solutions/pluginSolution/pluginSolution.msd @@ -63,12 +63,12 @@ - + diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/compositecomponents.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/compositecomponents.mpl index 3f8a409a856..3de2b49919b 100644 --- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/compositecomponents.mpl +++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.compositecomponents/compositecomponents.mpl @@ -48,6 +48,7 @@ + @@ -89,12 +90,12 @@ - + @@ -215,12 +216,12 @@ - + diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/com.mbeddr.ext.concurrency.c.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/com.mbeddr.ext.concurrency.c.mpl index be3b5199850..c02d2a10561 100644 --- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/com.mbeddr.ext.concurrency.c.mpl +++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.plainC/com.mbeddr.ext.concurrency.c.mpl @@ -59,6 +59,7 @@ + @@ -105,12 +106,12 @@ - + @@ -344,6 +345,7 @@ + @@ -397,12 +399,12 @@ - + diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.pthreads/com.mbeddr.ext.concurrency.pthreads.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.pthreads/com.mbeddr.ext.concurrency.pthreads.mpl index f1ff3e465db..0b476fef70b 100644 --- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.pthreads/com.mbeddr.ext.concurrency.pthreads.mpl +++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency.pthreads/com.mbeddr.ext.concurrency.pthreads.mpl @@ -58,6 +58,7 @@ + @@ -104,12 +105,12 @@ - + @@ -179,6 +180,7 @@ + @@ -234,12 +236,12 @@ - + diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/com.mbeddr.ext.concurrency.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/com.mbeddr.ext.concurrency.mpl index acba877aa4b..23d0347e94c 100644 --- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/com.mbeddr.ext.concurrency.mpl +++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/com.mbeddr.ext.concurrency.mpl @@ -43,6 +43,7 @@ + @@ -79,12 +80,12 @@ - + @@ -177,12 +178,12 @@ - + diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/languageModels/structure.mps b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/languageModels/structure.mps index a6fb52b325a..c3722a8f726 100644 --- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/languageModels/structure.mps +++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.concurrency/languageModels/structure.mps @@ -16,7 +16,6 @@ - @@ -32,20 +31,6 @@ - - - - - - - - - - - - - - @@ -843,75 +828,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/com.mbeddr.ext.math.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/com.mbeddr.ext.math.mpl index 83ea7257acd..2100a5c5881 100644 --- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/com.mbeddr.ext.math.mpl +++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.math/com.mbeddr.ext.math.mpl @@ -47,6 +47,7 @@ + @@ -79,12 +80,12 @@ - + @@ -194,12 +195,12 @@ - + diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/com.mbeddr.ext.messaging.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/com.mbeddr.ext.messaging.mpl index c073b9db344..c69446851e9 100644 --- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/com.mbeddr.ext.messaging.mpl +++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.messaging/com.mbeddr.ext.messaging.mpl @@ -69,6 +69,7 @@ + @@ -115,12 +116,12 @@ - + @@ -201,6 +202,7 @@ + @@ -254,12 +256,12 @@ - + diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/com.mbeddr.ext.serialization.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/com.mbeddr.ext.serialization.mpl index 1a23d545b1a..bd8eddebb8d 100644 --- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/com.mbeddr.ext.serialization.mpl +++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.serialization/com.mbeddr.ext.serialization.mpl @@ -69,6 +69,7 @@ + @@ -116,12 +117,12 @@ - + @@ -216,6 +217,7 @@ + @@ -270,12 +272,12 @@ - + diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/pluginSolution/com.mbeddr.ext.statemachines.pluginSolution.msd b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/pluginSolution/com.mbeddr.ext.statemachines.pluginSolution.msd index c7aff6cd3c4..83ebbe69739 100644 --- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/pluginSolution/com.mbeddr.ext.statemachines.pluginSolution.msd +++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/pluginSolution/com.mbeddr.ext.statemachines.pluginSolution.msd @@ -52,12 +52,12 @@ - + diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/statemachines.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/statemachines.mpl index 4efcc486938..a51eb1bd410 100644 --- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/statemachines.mpl +++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.statemachines/statemachines.mpl @@ -59,6 +59,7 @@ + @@ -101,12 +102,12 @@ - + @@ -192,6 +193,7 @@ + @@ -258,12 +260,12 @@ - + diff --git a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/com.mbeddr.ext.units.mpl b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/com.mbeddr.ext.units.mpl index 31af03efe1e..e9719963671 100644 --- a/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/com.mbeddr.ext.units.mpl +++ b/code/languages/com.mbeddr.ext/languages/com.mbeddr.ext.units/com.mbeddr.ext.units.mpl @@ -49,6 +49,7 @@ + @@ -86,12 +87,12 @@ - + @@ -168,6 +169,7 @@ + @@ -230,12 +232,12 @@ - + diff --git a/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.math.interpreter/com.mbeddr.ext.math.interpreter.msd b/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.math.interpreter/com.mbeddr.ext.math.interpreter.msd index 75dcd5df803..0e0982eed05 100644 --- a/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.math.interpreter/com.mbeddr.ext.math.interpreter.msd +++ b/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.math.interpreter/com.mbeddr.ext.math.interpreter.msd @@ -51,12 +51,12 @@ - + diff --git a/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.units.interpreter/com.mbeddr.ext.units.interpreter.msd b/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.units.interpreter/com.mbeddr.ext.units.interpreter.msd index fc66c5c3239..9fc0944eea1 100644 --- a/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.units.interpreter/com.mbeddr.ext.units.interpreter.msd +++ b/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.units.interpreter/com.mbeddr.ext.units.interpreter.msd @@ -50,12 +50,12 @@ - + diff --git a/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.units.runtime/com.mbeddr.ext.units.runtime.msd b/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.units.runtime/com.mbeddr.ext.units.runtime.msd index 7fe07867fed..4981b93c98c 100644 --- a/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.units.runtime/com.mbeddr.ext.units.runtime.msd +++ b/code/languages/com.mbeddr.ext/solutions/com.mbeddr.ext.units.runtime/com.mbeddr.ext.units.runtime.msd @@ -57,12 +57,12 @@ - + diff --git a/code/languages/com.mbeddr.ext/solutions/test.editor.ext/test.editor.ext.msd b/code/languages/com.mbeddr.ext/solutions/test.editor.ext/test.editor.ext.msd index 1544ad180d5..624149be441 100644 --- a/code/languages/com.mbeddr.ext/solutions/test.editor.ext/test.editor.ext.msd +++ b/code/languages/com.mbeddr.ext/solutions/test.editor.ext/test.editor.ext.msd @@ -56,6 +56,7 @@ + @@ -85,12 +86,12 @@ - + diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.comp_mocking/comp_mocking.msd b/code/languages/com.mbeddr.ext/tests/test.ex.ext.comp_mocking/comp_mocking.msd index c64fec28df7..bfde1206d97 100644 --- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.comp_mocking/comp_mocking.msd +++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.comp_mocking/comp_mocking.msd @@ -48,6 +48,7 @@ + diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/test.ex.ext.components.concurrency.msd b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/test.ex.ext.components.concurrency.msd index 72b58463e37..9ac313e637c 100644 --- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/test.ex.ext.components.concurrency.msd +++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.concurrency/test.ex.ext.components.concurrency.msd @@ -55,6 +55,7 @@ + diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.sri/sri.msd b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.sri/sri.msd index 83b166c1200..2b863f10e65 100644 --- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.sri/sri.msd +++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components.sri/sri.msd @@ -36,6 +36,7 @@ + diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/components.msd b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/components.msd index 3c4a4925ac2..9d4d5fa392e 100644 --- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/components.msd +++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.components/components.msd @@ -58,6 +58,7 @@ + diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/compositecomponents.msd b/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/compositecomponents.msd index 1ff257448b2..1987f2bd9d0 100644 --- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/compositecomponents.msd +++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.compositecomponents/compositecomponents.msd @@ -53,6 +53,7 @@ + @@ -89,12 +90,12 @@ - + diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/test.ex.ext.concurrency.c.msd b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/test.ex.ext.concurrency.c.msd index dac20214fa0..f560c26f23d 100644 --- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/test.ex.ext.concurrency.c.msd +++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency.plainC/test.ex.ext.concurrency.c.msd @@ -46,6 +46,7 @@ + diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/tests.ex.ext.concurrency.msd b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/tests.ex.ext.concurrency.msd index 6cd8c451569..ce415a8b82e 100644 --- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/tests.ex.ext.concurrency.msd +++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.concurrency/tests.ex.ext.concurrency.msd @@ -46,6 +46,7 @@ + diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.math/models/Issue1855@tests.mps b/code/languages/com.mbeddr.ext/tests/test.ex.ext.math/models/Issue1855@tests.mps index 70c0dc958cb..5392119baec 100644 --- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.math/models/Issue1855@tests.mps +++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.math/models/Issue1855@tests.mps @@ -11,10 +11,10 @@ + - @@ -62,7 +62,7 @@ - + @@ -87,7 +87,7 @@ - + @@ -97,7 +97,7 @@ - + @@ -131,7 +131,7 @@ - + diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.math/test.ex.ext.math.msd b/code/languages/com.mbeddr.ext/tests/test.ex.ext.math/test.ex.ext.math.msd index 9d8cfddc2ab..b985eee1f9f 100644 --- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.math/test.ex.ext.math.msd +++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.math/test.ex.ext.math.msd @@ -46,6 +46,7 @@ + @@ -77,12 +78,12 @@ - + diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.messaging/test.ex.ext.messaging.msd b/code/languages/com.mbeddr.ext/tests/test.ex.ext.messaging/test.ex.ext.messaging.msd index 57aaa79af48..4542ebc1a94 100644 --- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.messaging/test.ex.ext.messaging.msd +++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.messaging/test.ex.ext.messaging.msd @@ -45,6 +45,7 @@ + diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.serialization/test.ex.ext.serialization.msd b/code/languages/com.mbeddr.ext/tests/test.ex.ext.serialization/test.ex.ext.serialization.msd index 9f610c11edd..ae80f64c806 100644 --- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.serialization/test.ex.ext.serialization.msd +++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.serialization/test.ex.ext.serialization.msd @@ -45,6 +45,7 @@ + diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/statemachine.msd b/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/statemachine.msd index 474b02356bc..935315c4c16 100644 --- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/statemachine.msd +++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.statemachine/statemachine.msd @@ -37,6 +37,7 @@ + diff --git a/code/languages/com.mbeddr.ext/tests/test.ex.ext.units/test.ex.ext.units.msd b/code/languages/com.mbeddr.ext/tests/test.ex.ext.units/test.ex.ext.units.msd index a4b935a7d52..dd188b7682d 100644 --- a/code/languages/com.mbeddr.ext/tests/test.ex.ext.units/test.ex.ext.units.msd +++ b/code/languages/com.mbeddr.ext/tests/test.ex.ext.units/test.ex.ext.units.msd @@ -36,6 +36,7 @@ + @@ -66,12 +67,12 @@ - + diff --git a/code/languages/com.mbeddr.ext/tests/test.ext.components.nodes_tracing/test.ext.components.nodes_tracing.msd b/code/languages/com.mbeddr.ext/tests/test.ext.components.nodes_tracing/test.ext.components.nodes_tracing.msd index 7bbd8e28e13..f6575a8e821 100644 --- a/code/languages/com.mbeddr.ext/tests/test.ext.components.nodes_tracing/test.ext.components.nodes_tracing.msd +++ b/code/languages/com.mbeddr.ext/tests/test.ext.components.nodes_tracing/test.ext.components.nodes_tracing.msd @@ -56,6 +56,7 @@ + diff --git a/code/languages/com.mbeddr.ext/tests/test.ext.math.nodes_tracing/test.ext.math.nodes_tracing.msd b/code/languages/com.mbeddr.ext/tests/test.ext.math.nodes_tracing/test.ext.math.nodes_tracing.msd index 39faddffafa..21f8a7589f3 100644 --- a/code/languages/com.mbeddr.ext/tests/test.ext.math.nodes_tracing/test.ext.math.nodes_tracing.msd +++ b/code/languages/com.mbeddr.ext/tests/test.ext.math.nodes_tracing/test.ext.math.nodes_tracing.msd @@ -47,6 +47,7 @@ + diff --git a/code/languages/com.mbeddr.ext/tests/test.ext.statemachine.nodes_tracing/test.ext.statemachine.nodes_tracing.msd b/code/languages/com.mbeddr.ext/tests/test.ext.statemachine.nodes_tracing/test.ext.statemachine.nodes_tracing.msd index 2dcc9bb787e..3c06ac517fe 100644 --- a/code/languages/com.mbeddr.ext/tests/test.ext.statemachine.nodes_tracing/test.ext.statemachine.nodes_tracing.msd +++ b/code/languages/com.mbeddr.ext/tests/test.ext.statemachine.nodes_tracing/test.ext.statemachine.nodes_tracing.msd @@ -48,6 +48,7 @@ + diff --git a/code/languages/com.mbeddr.ext/tests/test.ts.ext.components.embedded/tests.ts.ext.components.embedded.msd b/code/languages/com.mbeddr.ext/tests/test.ts.ext.components.embedded/tests.ts.ext.components.embedded.msd index 5acda1516ef..13b890e5051 100644 --- a/code/languages/com.mbeddr.ext/tests/test.ts.ext.components.embedded/tests.ts.ext.components.embedded.msd +++ b/code/languages/com.mbeddr.ext/tests/test.ts.ext.components.embedded/tests.ts.ext.components.embedded.msd @@ -52,6 +52,7 @@ + @@ -86,12 +87,12 @@ - + diff --git a/code/languages/com.mbeddr.ext/tests/test.ts.ext.components/components.msd b/code/languages/com.mbeddr.ext/tests/test.ts.ext.components/components.msd index 978b07cbcb5..c6622e05f53 100644 --- a/code/languages/com.mbeddr.ext/tests/test.ts.ext.components/components.msd +++ b/code/languages/com.mbeddr.ext/tests/test.ts.ext.components/components.msd @@ -56,6 +56,7 @@ + @@ -93,12 +94,12 @@ - + diff --git a/code/languages/com.mbeddr.ext/tests/test.ts.ext.concurrency/test.ts.ext.concurrency.msd b/code/languages/com.mbeddr.ext/tests/test.ts.ext.concurrency/test.ts.ext.concurrency.msd index fdc7f7d1b3e..ccde3dd9643 100644 --- a/code/languages/com.mbeddr.ext/tests/test.ts.ext.concurrency/test.ts.ext.concurrency.msd +++ b/code/languages/com.mbeddr.ext/tests/test.ts.ext.concurrency/test.ts.ext.concurrency.msd @@ -45,6 +45,7 @@ + @@ -77,12 +78,12 @@ - + diff --git a/code/languages/com.mbeddr.ext/tests/test.ts.ext.statemachine/test.ts.ext.statemachine.msd b/code/languages/com.mbeddr.ext/tests/test.ts.ext.statemachine/test.ts.ext.statemachine.msd index 5d252bd367a..b5b8a53b5ca 100644 --- a/code/languages/com.mbeddr.ext/tests/test.ts.ext.statemachine/test.ts.ext.statemachine.msd +++ b/code/languages/com.mbeddr.ext/tests/test.ts.ext.statemachine/test.ts.ext.statemachine.msd @@ -53,6 +53,7 @@ + @@ -84,12 +85,12 @@ - + diff --git a/code/languages/com.mbeddr.ext/tests/test.ts.ext.units/test.ts.ext.units.msd b/code/languages/com.mbeddr.ext/tests/test.ts.ext.units/test.ts.ext.units.msd index 94a3e43386c..d491f25b7b0 100644 --- a/code/languages/com.mbeddr.ext/tests/test.ts.ext.units/test.ts.ext.units.msd +++ b/code/languages/com.mbeddr.ext/tests/test.ts.ext.units/test.ts.ext.units.msd @@ -36,6 +36,7 @@ + @@ -69,12 +70,12 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/.mps/migration.xml b/code/languages/com.mbeddr.mpsutil/.mps/migration.xml index 65112394c89..6ad5e78e2c9 100644 --- a/code/languages/com.mbeddr.mpsutil/.mps/migration.xml +++ b/code/languages/com.mbeddr.mpsutil/.mps/migration.xml @@ -22,6 +22,7 @@ + @@ -30,6 +31,6 @@ - + \ No newline at end of file diff --git a/code/languages/com.mbeddr.mpsutil/.mps/modules.xml b/code/languages/com.mbeddr.mpsutil/.mps/modules.xml index f623dca2282..581a9bc5597 100644 --- a/code/languages/com.mbeddr.mpsutil/.mps/modules.xml +++ b/code/languages/com.mbeddr.mpsutil/.mps/modules.xml @@ -37,7 +37,6 @@ - diff --git a/code/languages/com.mbeddr.mpsutil/languages/EcoreImporter_TestLanguage1/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/EcoreImporter_TestLanguage1/models/structure.mps index 2e3d4b0bfa7..9f1548e1675 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/EcoreImporter_TestLanguage1/models/structure.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/EcoreImporter_TestLanguage1/models/structure.mps @@ -20,7 +20,6 @@ - @@ -32,19 +31,6 @@ - - - - - - - - - - - - - @@ -202,82 +188,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.bldoc/com.mbeddr.mpsutil.bldoc.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.bldoc/com.mbeddr.mpsutil.bldoc.mpl index ce1d9efc272..124f977b7b9 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.bldoc/com.mbeddr.mpsutil.bldoc.mpl +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.bldoc/com.mbeddr.mpsutil.bldoc.mpl @@ -66,7 +66,6 @@ - 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 f52a4495bc7..30d7655b957 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 @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/structure.mps index db5a4bb773d..82efe641bc7 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/structure.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare.pattern/models/structure.mps @@ -15,7 +15,6 @@ - @@ -33,20 +32,6 @@ - - - - - - - - - - - - - - @@ -379,36 +364,15 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/com.mbeddr.mpsutil.conceptdiagram.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/com.mbeddr.mpsutil.conceptdiagram.mpl index 49281f0460c..d03bf4db58e 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/com.mbeddr.mpsutil.conceptdiagram.mpl +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/com.mbeddr.mpsutil.conceptdiagram.mpl @@ -92,7 +92,6 @@ - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/plugin.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/plugin.mps index df77d4da364..1a4d770cdd0 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/plugin.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/plugin.mps @@ -50,6 +50,7 @@ + @@ -473,6 +474,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker.sandbox/com.mbeddr.mpsutil.datepicker.sandbox.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker.sandbox/com.mbeddr.mpsutil.datepicker.sandbox.mpl index 93e703bd939..6848d92260d 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker.sandbox/com.mbeddr.mpsutil.datepicker.sandbox.mpl +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker.sandbox/com.mbeddr.mpsutil.datepicker.sandbox.mpl @@ -55,6 +55,7 @@ 98a7bbe2-0ea1-4503-9fc1-9efb7b48c6ea(com.mbeddr.mpsutil.datepicker.runtime) + 39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty) @@ -97,6 +98,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker.sandbox/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker.sandbox/languageModels/editor.mps index e33af6fa836..b4f692262ab 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker.sandbox/languageModels/editor.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker.sandbox/languageModels/editor.mps @@ -9,8 +9,8 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/com.mbeddr.mpsutil.datepicker.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/com.mbeddr.mpsutil.datepicker.mpl index 95fb949beb1..82783c33052 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/com.mbeddr.mpsutil.datepicker.mpl +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/com.mbeddr.mpsutil.datepicker.mpl @@ -29,6 +29,7 @@ 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) 0647eca7-da98-422a-8a8b-6ebc0bd014ea(jetbrains.mps.lang.editor#1129914002149) + 39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty) @@ -54,6 +55,7 @@ + @@ -95,6 +97,7 @@ 18bc6592-03a6-4e29-a83a-7ff23bde13ba(jetbrains.mps.lang.editor) 98a7bbe2-0ea1-4503-9fc1-9efb7b48c6ea(com.mbeddr.mpsutil.datepicker.runtime) + 39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty) @@ -137,6 +140,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/generator/template/main@generator.mps index 0a071209633..547f49f1dc5 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/generator/template/main@generator.mps @@ -18,10 +18,8 @@ - - - + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/languageModels/behavior.mps index 813284d1b2a..5720189b294 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/languageModels/behavior.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.datepicker/languageModels/behavior.mps @@ -12,7 +12,7 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dependenciesdiagram/com.mbeddr.mpsutil.dependenciesdiagram.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dependenciesdiagram/com.mbeddr.mpsutil.dependenciesdiagram.mpl index fcdf234565b..971227389be 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dependenciesdiagram/com.mbeddr.mpsutil.dependenciesdiagram.mpl +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.dependenciesdiagram/com.mbeddr.mpsutil.dependenciesdiagram.mpl @@ -85,7 +85,6 @@ - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecore.modelImportExport.testMetaModel/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecore.modelImportExport.testMetaModel/models/structure.mps index d3bff1a414e..adf9a99310e 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecore.modelImportExport.testMetaModel/models/structure.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecore.modelImportExport.testMetaModel/models/structure.mps @@ -32,7 +32,6 @@ - @@ -44,19 +43,6 @@ - - - - - - - - - - - - - @@ -235,32 +221,13 @@ - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoretransformation.amaltheametamodel/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoretransformation.amaltheametamodel/models/structure.mps index 32ce8c2f795..e92f689dfdc 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoretransformation.amaltheametamodel/models/structure.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoretransformation.amaltheametamodel/models/structure.mps @@ -33,7 +33,6 @@ - @@ -45,19 +44,6 @@ - - - - - - - - - - - - - @@ -6478,2326 +6464,991 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8841,282 +7492,118 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide.execution.lang/com.mbeddr.mpsutil.editingGuide.execution.lang.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide.execution.lang/com.mbeddr.mpsutil.editingGuide.execution.lang.mpl index 00dcd736f0a..d0d43ff6bd1 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide.execution.lang/com.mbeddr.mpsutil.editingGuide.execution.lang.mpl +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide.execution.lang/com.mbeddr.mpsutil.editingGuide.execution.lang.mpl @@ -73,7 +73,6 @@ - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/com.mbeddr.mpsutil.editingGuide.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/com.mbeddr.mpsutil.editingGuide.mpl index 778ca941afa..1b4af093edb 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/com.mbeddr.mpsutil.editingGuide.mpl +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.editingGuide/com.mbeddr.mpsutil.editingGuide.mpl @@ -58,7 +58,6 @@ - @@ -140,7 +139,6 @@ - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/com.mbeddr.mpsutil.favourites.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/com.mbeddr.mpsutil.favourites.mpl deleted file mode 100644 index 01a9115d08e..00000000000 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/com.mbeddr.mpsutil.favourites.mpl +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) - 8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform) - 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) - 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) - 86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/models/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/models/behavior.mps deleted file mode 100644 index 8c308b65be2..00000000000 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/models/behavior.mps +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/models/com.mbeddr.mpsutil.favourites.migration.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/models/com.mbeddr.mpsutil.favourites.migration.mps deleted file mode 100644 index 98036426ebb..00000000000 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/models/com.mbeddr.mpsutil.favourites.migration.mps +++ /dev/null @@ -1,403 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/models/constraints.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/models/constraints.mps deleted file mode 100644 index bb14f8dfc0f..00000000000 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/models/constraints.mps +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/models/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/models/editor.mps deleted file mode 100644 index 5f8ec69b9c6..00000000000 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/models/editor.mps +++ /dev/null @@ -1,573 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/models/intentions.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/models/intentions.mps deleted file mode 100644 index ae64aa88b8d..00000000000 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/models/intentions.mps +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/models/structure.mps deleted file mode 100644 index b09e559816e..00000000000 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/models/structure.mps +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/models/typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/models/typesystem.mps deleted file mode 100644 index 0315d9731d5..00000000000 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/models/typesystem.mps +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/com.mbeddr.mpsutil.graphstream.runtime.msd b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/com.mbeddr.mpsutil.graphstream.runtime.msd index 6dc7a6fb34f..ff4eb69ae23 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/com.mbeddr.mpsutil.graphstream.runtime.msd +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/com.mbeddr.mpsutil.graphstream.runtime.msd @@ -8,7 +8,6 @@ - @@ -19,7 +18,6 @@ - @@ -57,6 +55,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/lib/jgraphx-3.7.4.jar b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/lib/jgraphx-3.7.4.jar deleted file mode 100644 index 4b107c01f37..00000000000 Binary files a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/lib/jgraphx-3.7.4.jar and /dev/null differ diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/models/plugin.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/models/plugin.mps index edc8ded2714..62e9f2c75cf 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/models/plugin.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/models/plugin.mps @@ -21,10 +21,8 @@ - - @@ -41,11 +39,11 @@ - - + + - + @@ -76,6 +74,7 @@ + @@ -916,13 +915,28 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -1584,6 +1598,7 @@ + @@ -1709,6 +1724,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/com.mbeddr.mpsutil.httpsupport.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/com.mbeddr.mpsutil.httpsupport.mpl index a849abd5fa6..a69d09419c6 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/com.mbeddr.mpsutil.httpsupport.mpl +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/com.mbeddr.mpsutil.httpsupport.mpl @@ -37,6 +37,7 @@ + @@ -64,6 +65,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/generator/template/main@generator.mps index f9cb04faf31..d085d29eef9 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/generator/template/main@generator.mps @@ -7,6 +7,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/languageModels/structure.mps index 0d1e2476891..2eb2845fec4 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/languageModels/structure.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.httpsupport/languageModels/structure.mps @@ -13,7 +13,6 @@ - @@ -25,19 +24,6 @@ - - - - - - - - - - - - - @@ -159,59 +145,25 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink/languageModels/plugin.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink/languageModels/plugin.mps index 7dde0f3623c..a91d8b73a00 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink/languageModels/plugin.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.hyperlink/languageModels/plugin.mps @@ -38,6 +38,7 @@ + @@ -570,14 +571,10 @@ - - - - - - + + - + @@ -634,14 +631,10 @@ - - - - - - + + - + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.mpl index 913fcf927e3..0e71f643e4d 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.mpl +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/com.mbeddr.mpsutil.interpreter.mpl @@ -203,7 +203,6 @@ - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/plugin.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/plugin.mps index c6463d88f8a..47e05cfee94 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/plugin.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/plugin.mps @@ -59,6 +59,7 @@ + @@ -738,6 +739,7 @@ + @@ -751,6 +753,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/solutions/pluginSolution/models/com/mbeddr/mpsutil/jung/pluginSolution/plugin.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/solutions/pluginSolution/models/com/mbeddr/mpsutil/jung/pluginSolution/plugin.mps index 48498689f00..a2a513712b9 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/solutions/pluginSolution/models/com/mbeddr/mpsutil/jung/pluginSolution/plugin.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.jung/solutions/pluginSolution/models/com/mbeddr/mpsutil/jung/pluginSolution/plugin.mps @@ -44,6 +44,7 @@ + @@ -67,6 +68,7 @@ + @@ -77,6 +79,7 @@ + @@ -9285,11 +9288,17 @@ + - + + + + + + @@ -9308,7 +9317,7 @@ - + @@ -9330,7 +9339,7 @@ - + @@ -9352,110 +9361,127 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + @@ -9549,6 +9575,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/languageModels/dummy.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/languageModels/dummy.mps index 63a33a7c281..5f7ea259b81 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/languageModels/dummy.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/languageModels/dummy.mps @@ -11,6 +11,7 @@ + @@ -22,6 +23,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/languageModels/structure.mps index 1ac77510143..55e7203a1bc 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/languageModels/structure.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lang.plugin.extensions/languageModels/structure.mps @@ -14,7 +14,6 @@ - @@ -26,19 +25,6 @@ - - - - - - - - - - - - - @@ -127,50 +113,21 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/com.mbeddr.mpsutil.multilingual.baseLanguage.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/com.mbeddr.mpsutil.multilingual.baseLanguage.mpl index 2e6424a495b..886cf6776c5 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/com.mbeddr.mpsutil.multilingual.baseLanguage.mpl +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.baseLanguage/com.mbeddr.mpsutil.multilingual.baseLanguage.mpl @@ -71,7 +71,6 @@ - @@ -175,7 +174,6 @@ - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.concept/com.mbeddr.mpsutil.multilingual.concept.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.concept/com.mbeddr.mpsutil.multilingual.concept.mpl index 1e5c0dcf28a..542fc108eab 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.concept/com.mbeddr.mpsutil.multilingual.concept.mpl +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.multilingual.concept/com.mbeddr.mpsutil.multilingual.concept.mpl @@ -68,7 +68,6 @@ - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.nodes_tracing.test/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.nodes_tracing.test/models/structure.mps index e0080f8cb6b..68f364d0143 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.nodes_tracing.test/models/structure.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.nodes_tracing.test/models/structure.mps @@ -15,7 +15,6 @@ - @@ -30,19 +29,6 @@ - - - - - - - - - - - - - @@ -178,34 +164,15 @@ - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/com.mbeddr.mpsutil.preferenceform.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/com.mbeddr.mpsutil.preferenceform.mpl index 1a74435916d..44b43678b31 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/com.mbeddr.mpsutil.preferenceform.mpl +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/com.mbeddr.mpsutil.preferenceform.mpl @@ -193,7 +193,6 @@ - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/languageModels/structure.mps index c3c8f2d2181..876c4978940 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/languageModels/structure.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.preferenceform/languageModels/structure.mps @@ -16,7 +16,6 @@ - @@ -28,19 +27,6 @@ - - - - - - - - - - - - - @@ -420,32 +406,13 @@ - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/com.mbeddr.mpsutil.process.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/com.mbeddr.mpsutil.process.mpl index 8a45e825d70..ff1e1ff27db 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/com.mbeddr.mpsutil.process.mpl +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/com.mbeddr.mpsutil.process.mpl @@ -36,6 +36,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/generator/template/main@generator.mps index 84afb36f6ee..8875c066be1 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.process/generator/template/main@generator.mps @@ -7,6 +7,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/generator/template/main@generator.mps index f8622d4864c..767957a3654 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.rcp/generator/template/main@generator.mps @@ -44,6 +44,7 @@ + @@ -1271,6 +1272,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring.rt/models/com/mbeddr/mpsutil/refactoring/rt/util.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring.rt/models/com/mbeddr/mpsutil/refactoring/rt/util.mps index 43eab2e5033..a6c7962144b 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring.rt/models/com/mbeddr/mpsutil/refactoring/rt/util.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring.rt/models/com/mbeddr/mpsutil/refactoring/rt/util.mps @@ -52,6 +52,10 @@ + + + + @@ -834,6 +838,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -1496,6 +1523,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring/generator/template/com/mbeddr/mpsutil/refactoring/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring/generator/template/com/mbeddr/mpsutil/refactoring/generator/template/main@generator.mps index f7def2973c9..32e4a7a2f68 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring/generator/template/com/mbeddr/mpsutil/refactoring/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.refactoring/generator/template/com/mbeddr/mpsutil/refactoring/generator/template/main@generator.mps @@ -30,6 +30,7 @@ + @@ -61,6 +62,7 @@ + @@ -117,6 +119,10 @@ + + + + @@ -1500,6 +1506,7 @@ + @@ -2639,6 +2646,7 @@ + @@ -3014,6 +3022,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -3563,6 +3593,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.resources/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.resources/models/structure.mps index b8f7f6f0e23..4aeb47e5ceb 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.resources/models/structure.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.resources/models/structure.mps @@ -14,7 +14,6 @@ - @@ -26,20 +25,6 @@ - - - - - - - - - - - - - - @@ -119,102 +104,42 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.annotation/com.mbeddr.mpsutil.review.annotation.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.annotation/com.mbeddr.mpsutil.review.annotation.mpl index 431bbfcf771..e193a71df90 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.annotation/com.mbeddr.mpsutil.review.annotation.mpl +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.annotation/com.mbeddr.mpsutil.review.annotation.mpl @@ -68,7 +68,6 @@ - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.readonly/com.mbeddr.mpsutil.review.readonly.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.readonly/com.mbeddr.mpsutil.review.readonly.mpl index 9b166a6d002..59c4b460f38 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.readonly/com.mbeddr.mpsutil.review.readonly.mpl +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review.readonly/com.mbeddr.mpsutil.review.readonly.mpl @@ -67,7 +67,6 @@ - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review/com.mbeddr.mpsutil.review.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review/com.mbeddr.mpsutil.review.mpl index ad729a46f7f..81991a535ba 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review/com.mbeddr.mpsutil.review.mpl +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.review/com.mbeddr.mpsutil.review.mpl @@ -62,7 +62,6 @@ - @@ -133,7 +132,6 @@ - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/com.mbeddr.mpsutil.richstring.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/com.mbeddr.mpsutil.richstring.mpl index deed0009562..0514b362c48 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/com.mbeddr.mpsutil.richstring.mpl +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.richstring/com.mbeddr.mpsutil.richstring.mpl @@ -63,7 +63,6 @@ - @@ -147,7 +146,6 @@ - diff --git a/code/languages/com.mbeddr.mpsutil/languages/doc.com.mbeddr.mpsutil.multilingual.lang/doc.com.mbeddr.mpsutil.multilingual.lang.mpl b/code/languages/com.mbeddr.mpsutil/languages/doc.com.mbeddr.mpsutil.multilingual.lang/doc.com.mbeddr.mpsutil.multilingual.lang.mpl index 10945633f55..04430f3ff8e 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/doc.com.mbeddr.mpsutil.multilingual.lang/doc.com.mbeddr.mpsutil.multilingual.lang.mpl +++ b/code/languages/com.mbeddr.mpsutil/languages/doc.com.mbeddr.mpsutil.multilingual.lang/doc.com.mbeddr.mpsutil.multilingual.lang.mpl @@ -65,7 +65,6 @@ - diff --git a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecore.metaModelImport.expectedComplex10/test.com.mbeddr.mpsutil.ecore.metaModelImport.expectedComplex10.mpl b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecore.metaModelImport.expectedComplex10/test.com.mbeddr.mpsutil.ecore.metaModelImport.expectedComplex10.mpl index 50ca46db00c..14730ebccb7 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecore.metaModelImport.expectedComplex10/test.com.mbeddr.mpsutil.ecore.metaModelImport.expectedComplex10.mpl +++ b/code/languages/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.ecore.metaModelImport.expectedComplex10/test.com.mbeddr.mpsutil.ecore.metaModelImport.expectedComplex10.mpl @@ -6,7 +6,7 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/models/com/mbeddr/mpsutil/actionsfilter/runtime.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/models/com/mbeddr/mpsutil/actionsfilter/runtime.mps index 57973ef3fb3..2bb7f7078bf 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/models/com/mbeddr/mpsutil/actionsfilter/runtime.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/models/com/mbeddr/mpsutil/actionsfilter/runtime.mps @@ -38,6 +38,7 @@ + @@ -6240,18 +6241,22 @@ - - - - - - + + + + + + - + + + + + @@ -9358,6 +9363,7 @@ + @@ -9366,7 +9372,6 @@ - @@ -9844,6 +9849,7 @@ + @@ -9856,7 +9862,6 @@ - @@ -9869,10 +9874,10 @@ + - @@ -11377,6 +11382,7 @@ + @@ -11387,10 +11393,10 @@ - + @@ -11398,10 +11404,10 @@ - + @@ -11413,40 +11419,39 @@ - + - + - + - @@ -12979,6 +12984,7 @@ + @@ -12991,7 +12997,6 @@ - @@ -13153,6 +13158,7 @@ + @@ -13165,7 +13171,6 @@ - @@ -13178,6 +13183,7 @@ + @@ -13185,7 +13191,6 @@ - @@ -13738,10 +13743,15 @@ - - - - + + + + + + + + + @@ -14103,35 +14113,35 @@ + - + - + - diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.checkinHandler.demo.plugin/com.mbeddr.mpsutil.checkinHandler.demo.plugin.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.checkinHandler.demo.plugin/com.mbeddr.mpsutil.checkinHandler.demo.plugin.msd index d46d465dd22..9e30be391fe 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.checkinHandler.demo.plugin/com.mbeddr.mpsutil.checkinHandler.demo.plugin.msd +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.checkinHandler.demo.plugin/com.mbeddr.mpsutil.checkinHandler.demo.plugin.msd @@ -6,7 +6,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 4e596bd6e27..397e20a5606 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 @@ -6,7 +6,7 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/com.mbeddr.mpsutil.comparator.diff.demo.tests.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/com.mbeddr.mpsutil.comparator.diff.demo.tests.msd index b2cb31af132..2ab1b301374 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/com.mbeddr.mpsutil.comparator.diff.demo.tests.msd +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/com.mbeddr.mpsutil.comparator.diff.demo.tests.msd @@ -6,7 +6,7 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.comparator.diff.tests.diffs@tests.mps similarity index 99% rename from code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps rename to code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.comparator.diff.tests.diffs@tests.mps index 0e8934b0e19..db103cc6705 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.comparator.diff.tests.diffs@tests.mps @@ -1,9 +1,8 @@ - + - @@ -16,7 +15,6 @@ - @@ -28,7 +26,7 @@ - + @@ -522,7 +520,7 @@ - + @@ -603,7 +601,7 @@ - + @@ -890,7 +888,9 @@ - + + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.contextactions.runtime/models/com/mbeddr/mpsutil/contextactions/runtime.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.contextactions.runtime/models/com/mbeddr/mpsutil/contextactions/runtime.mps index 58f109ceeec..0cd51a59576 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.contextactions.runtime/models/com/mbeddr/mpsutil/contextactions/runtime.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.contextactions.runtime/models/com/mbeddr/mpsutil/contextactions/runtime.mps @@ -2143,7 +2143,7 @@ - + @@ -13629,10 +13629,32 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.dataflow.ui/models/com/mbeddr/mpsutil/dataflow/ui/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.dataflow.ui/models/com/mbeddr/mpsutil/dataflow/ui/plugin.mps index 2704869e66d..416a4d53967 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.dataflow.ui/models/com/mbeddr/mpsutil/dataflow/ui/plugin.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.dataflow.ui/models/com/mbeddr/mpsutil/dataflow/ui/plugin.mps @@ -56,6 +56,7 @@ + @@ -1626,6 +1627,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.datepicker.runtime/com.mbeddr.mpsutil.datepicker.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.datepicker.runtime/com.mbeddr.mpsutil.datepicker.runtime.msd index 08cc11223f2..5df247fe691 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.datepicker.runtime/com.mbeddr.mpsutil.datepicker.runtime.msd +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.datepicker.runtime/com.mbeddr.mpsutil.datepicker.runtime.msd @@ -4,14 +4,10 @@ - - - - @@ -19,10 +15,10 @@ 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) + 39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty) - @@ -37,6 +33,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.datepicker.runtime/lib/microba-0.4.4.jar b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.datepicker.runtime/lib/microba-0.4.4.jar deleted file mode 100644 index 137dd01bfdb..00000000000 Binary files a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.datepicker.runtime/lib/microba-0.4.4.jar and /dev/null differ diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.datepicker.runtime/models/com/mbeddr/mpsutil/datepicker/runtime/model.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.datepicker.runtime/models/com/mbeddr/mpsutil/datepicker/runtime/model.mps index 2e88aaa4303..c58a165660f 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.datepicker.runtime/models/com/mbeddr/mpsutil/datepicker/runtime/model.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.datepicker.runtime/models/com/mbeddr/mpsutil/datepicker/runtime/model.mps @@ -5,18 +5,15 @@ - - - @@ -25,8 +22,6 @@ - - @@ -34,6 +29,8 @@ + + @@ -288,10 +285,10 @@ - + - + @@ -1806,7 +1803,7 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.runtime/com.mbeddr.mpsutil.ecore.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.runtime/com.mbeddr.mpsutil.ecore.runtime.msd index 3f78e16cc04..d4dd369794c 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.runtime/com.mbeddr.mpsutil.ecore.runtime.msd +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.runtime/com.mbeddr.mpsutil.ecore.runtime.msd @@ -19,6 +19,7 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure) 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) + 39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty) @@ -38,6 +39,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.runtime/models/com/mbeddr/mpsutil/ecore/runtime/main.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.runtime/models/com/mbeddr/mpsutil/ecore/runtime/main.mps index 3405eceb870..e288ddfba0a 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.runtime/models/com/mbeddr/mpsutil/ecore/runtime/main.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.runtime/models/com/mbeddr/mpsutil/ecore/runtime/main.mps @@ -49,6 +49,9 @@ + + + @@ -5960,12 +5963,15 @@ - - - + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.ui.modelexporter/models/com/mbeddr/mpsutil/ecore/ui/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.ui.modelexporter/models/com/mbeddr/mpsutil/ecore/ui/plugin.mps index c300deddcc3..fd324e7d553 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.ui.modelexporter/models/com/mbeddr/mpsutil/ecore/ui/plugin.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.ui.modelexporter/models/com/mbeddr/mpsutil/ecore/ui/plugin.mps @@ -53,6 +53,7 @@ + @@ -1675,6 +1676,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/com.mbeddr.mpsutil.ecore.stubs.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/com.mbeddr.mpsutil.ecore.stubs.msd index 797a1eb8a47..52942dfe6b1 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/com.mbeddr.mpsutil.ecore.stubs.msd +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/com.mbeddr.mpsutil.ecore.stubs.msd @@ -1,10 +1,7 @@ - - - - + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/models/com/mbeddr/mpsutil/ecore/stubs/dummy.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/models/com/mbeddr/mpsutil/ecore/stubs/dummy.mps deleted file mode 100644 index 655fc811a1b..00000000000 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/models/com/mbeddr/mpsutil/ecore/stubs/dummy.mps +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.execution/com.mbeddr.mpsutil.editingGuide.execution.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.execution/com.mbeddr.mpsutil.editingGuide.execution.msd index 45b0929dc25..57e0b98e94d 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.execution/com.mbeddr.mpsutil.editingGuide.execution.msd +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.execution/com.mbeddr.mpsutil.editingGuide.execution.msd @@ -54,7 +54,6 @@ - diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.plugin/com.mbeddr.mpsutil.editingGuide.plugin.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.plugin/com.mbeddr.mpsutil.editingGuide.plugin.msd index eb8e6c94a32..b359d39d8fa 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.plugin/com.mbeddr.mpsutil.editingGuide.plugin.msd +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.plugin/com.mbeddr.mpsutil.editingGuide.plugin.msd @@ -43,7 +43,6 @@ - diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.plugin/models/com/mbeddr/mpsutil/editingGuide/plugin/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.plugin/models/com/mbeddr/mpsutil/editingGuide/plugin/plugin.mps index f849e55b7fd..a83b5d1d6d5 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.plugin/models/com/mbeddr/mpsutil/editingGuide/plugin/plugin.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.plugin/models/com/mbeddr/mpsutil/editingGuide/plugin/plugin.mps @@ -38,6 +38,7 @@ + @@ -275,6 +276,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.sandbox/com.mbeddr.mpsutil.editingGuide.sandbox.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.sandbox/com.mbeddr.mpsutil.editingGuide.sandbox.msd index 6515860b6a5..7a7692d5ea3 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.sandbox/com.mbeddr.mpsutil.editingGuide.sandbox.msd +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.editingGuide.sandbox/com.mbeddr.mpsutil.editingGuide.sandbox.msd @@ -48,7 +48,6 @@ - diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genericactions/models/com/mbeddr/mpsutil/genericactions/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genericactions/models/com/mbeddr/mpsutil/genericactions/plugin.mps index f7ab3678fd8..74e7ff72b61 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genericactions/models/com/mbeddr/mpsutil/genericactions/plugin.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genericactions/models/com/mbeddr/mpsutil/genericactions/plugin.mps @@ -56,6 +56,7 @@ + @@ -302,6 +303,7 @@ + @@ -760,6 +762,7 @@ + @@ -1159,6 +1162,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/models/com.mbeddr.mpsutil.genreview.plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/models/com.mbeddr.mpsutil.genreview.plugin.mps index 44356517d7d..99d8722fb81 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/models/com.mbeddr.mpsutil.genreview.plugin.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.genreview/models/com.mbeddr.mpsutil.genreview.plugin.mps @@ -40,8 +40,9 @@ + + - @@ -96,6 +97,7 @@ + @@ -5677,18 +5679,28 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -5747,18 +5759,28 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -6678,6 +6700,7 @@ + @@ -6694,6 +6717,7 @@ + @@ -7015,15 +7039,30 @@ - - - - + + + + + - - - - + + + + + + + + + + + + + + + + + + @@ -8226,15 +8265,30 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -8354,15 +8408,30 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -8418,13 +8487,16 @@ - - - - - - + + + + + + + + + @@ -8624,12 +8696,15 @@ - - - + + - + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.httpserver/com.mbeddr.mpsutil.httpserver.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.httpserver/com.mbeddr.mpsutil.httpserver.msd index fbd9dd31900..2a6717ef97a 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.httpserver/com.mbeddr.mpsutil.httpserver.msd +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.httpserver/com.mbeddr.mpsutil.httpserver.msd @@ -21,6 +21,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.httpserver/models/com/mbeddr/mpsutil/httpserver/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.httpserver/models/com/mbeddr/mpsutil/httpserver/plugin.mps index 42325102b52..25b289ee619 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.httpserver/models/com/mbeddr/mpsutil/httpserver/plugin.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.httpserver/models/com/mbeddr/mpsutil/httpserver/plugin.mps @@ -6,6 +6,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.interpreter.migration/models/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.interpreter.migration/models/plugin.mps index d70a717970c..506964937d9 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.interpreter.migration/models/plugin.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.interpreter.migration/models/plugin.mps @@ -70,6 +70,7 @@ + @@ -483,6 +484,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.interpreter.plugin/models/com/mbeddr/mpsutil/interpreter/plugin/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.interpreter.plugin/models/com/mbeddr/mpsutil/interpreter/plugin/plugin.mps index b9959bc305a..1b76dcaefa1 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.interpreter.plugin/models/com/mbeddr/mpsutil/interpreter/plugin/plugin.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.interpreter.plugin/models/com/mbeddr/mpsutil/interpreter/plugin/plugin.mps @@ -26,6 +26,7 @@ + @@ -57,6 +58,10 @@ + + + + @@ -227,10 +232,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.javainterpreter.richstring/com.mbeddr.mpsutil.javainterpreter.richstring.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.javainterpreter.richstring/com.mbeddr.mpsutil.javainterpreter.richstring.msd index c3aad4eff87..cc970e1daeb 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.javainterpreter.richstring/com.mbeddr.mpsutil.javainterpreter.richstring.msd +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.javainterpreter.richstring/com.mbeddr.mpsutil.javainterpreter.richstring.msd @@ -19,6 +19,7 @@ + @@ -42,7 +43,6 @@ - diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.javainterpreter.richstring/models/com/mbeddr/mpsutil/javainterpreter/richstring/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.javainterpreter.richstring/models/com/mbeddr/mpsutil/javainterpreter/richstring/plugin.mps index a12251bdfee..0ad6d76937a 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.javainterpreter.richstring/models/com/mbeddr/mpsutil/javainterpreter/richstring/plugin.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.javainterpreter.richstring/models/com/mbeddr/mpsutil/javainterpreter/richstring/plugin.mps @@ -5,6 +5,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.jfreechart.runtime/models/com/mbeddr/mpsutil/jfreechart/runtime/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.jfreechart.runtime/models/com/mbeddr/mpsutil/jfreechart/runtime/plugin.mps index 6161538454c..f0fa1c951d4 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.jfreechart.runtime/models/com/mbeddr/mpsutil/jfreechart/runtime/plugin.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.jfreechart.runtime/models/com/mbeddr/mpsutil/jfreechart/runtime/plugin.mps @@ -21,6 +21,7 @@ + @@ -146,6 +147,11 @@ + + + + + @@ -565,15 +571,30 @@ - - - - + + + + + - - - - + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.make/models/com/mbeddr/mpsutil/make/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.make/models/com/mbeddr/mpsutil/make/plugin.mps index 934d3a4f372..741c842d97b 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.make/models/com/mbeddr/mpsutil/make/plugin.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.make/models/com/mbeddr/mpsutil/make/plugin.mps @@ -56,6 +56,7 @@ + @@ -2758,6 +2759,7 @@ + @@ -2771,6 +2773,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodeaccess/models/com/mbeddr/mpsutil/nodeaccess/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodeaccess/models/com/mbeddr/mpsutil/nodeaccess/plugin.mps index 0b6869b04ac..fa23e9edb36 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodeaccess/models/com/mbeddr/mpsutil/nodeaccess/plugin.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodeaccess/models/com/mbeddr/mpsutil/nodeaccess/plugin.mps @@ -25,7 +25,7 @@ - + @@ -55,6 +55,7 @@ + @@ -1715,6 +1716,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodediff/models/com/mbeddr/mpsutil/nodediff/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodediff/models/com/mbeddr/mpsutil/nodediff/plugin.mps index 3aad94e8aea..4fdbfbd1df1 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodediff/models/com/mbeddr/mpsutil/nodediff/plugin.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.nodediff/models/com/mbeddr/mpsutil/nodediff/plugin.mps @@ -49,6 +49,7 @@ + @@ -1015,6 +1016,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/models/com/mbeddr/mpsutil/plantuml/pluginSolution/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/models/com/mbeddr/mpsutil/plantuml/pluginSolution/plugin.mps index 5186e3444fb..1aaa0f64a86 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/models/com/mbeddr/mpsutil/plantuml/pluginSolution/plugin.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/models/com/mbeddr/mpsutil/plantuml/pluginSolution/plugin.mps @@ -36,14 +36,16 @@ - - - - - - - + + + + + + + + + @@ -77,6 +79,7 @@ + @@ -2750,15 +2753,30 @@ - - - - + + + + + - - - - + + + + + + + + + + + + + + + + + + @@ -2847,6 +2865,7 @@ + @@ -2859,6 +2878,7 @@ + @@ -3175,7 +3195,7 @@ - + @@ -3203,9 +3223,9 @@ - - + + @@ -3954,14 +3974,16 @@ - - - - + + + + + + - + @@ -4543,7 +4565,7 @@ - + @@ -4677,7 +4699,7 @@ - + @@ -5167,6 +5189,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -6220,15 +6265,30 @@ - - - - + + + + + - - - - + + + + + + + + + + + + + + + + + + @@ -6293,6 +6353,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/pluginSolution.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/pluginSolution.msd index af0e3a5ff64..51c30a7e70a 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/pluginSolution.msd +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/pluginSolution.msd @@ -22,8 +22,8 @@ 742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform) b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node) 5b1f863d-65a0-41a6-a801-33896be24202(jetbrains.mps.ide.editor) - 96569509-ecfc-4944-b6c9-075faf02fe2c(org.xml) - 5ad14eca-28d7-4bce-b8e0-648908a49062(org.apache.batik) + 563a0770-eb88-4f4f-83ed-f708776fc2fe(de.itemis.stubs.batik) + 124d077c-270f-42ca-8bf8-bee488dc96dc(de.itemis.stubs.xml) @@ -54,6 +54,8 @@ + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.postprocessGeneratedFiles.runtime/models/com/mbeddr/mpsutil/postprocessGeneratedFiles/runtime/rt.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.postprocessGeneratedFiles.runtime/models/com/mbeddr/mpsutil/postprocessGeneratedFiles/runtime/rt.mps index 6841f3e404d..2fa059bd9f8 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.postprocessGeneratedFiles.runtime/models/com/mbeddr/mpsutil/postprocessGeneratedFiles/runtime/rt.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.postprocessGeneratedFiles.runtime/models/com/mbeddr/mpsutil/postprocessGeneratedFiles/runtime/rt.mps @@ -7,6 +7,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.print.pluginSolution/models/com/mbeddr/mpsutil/print/pluginSolution/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.print.pluginSolution/models/com/mbeddr/mpsutil/print/pluginSolution/plugin.mps index 790ff502902..8af9bd4317f 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.print.pluginSolution/models/com/mbeddr/mpsutil/print/pluginSolution/plugin.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.print.pluginSolution/models/com/mbeddr/mpsutil/print/pluginSolution/plugin.mps @@ -18,6 +18,7 @@ + @@ -34,6 +35,7 @@ + @@ -207,7 +209,7 @@ - + @@ -491,7 +493,7 @@ - + @@ -580,20 +582,20 @@ - - - - - - - + + + + + + + - - + + - + @@ -618,7 +620,7 @@ - + @@ -626,6 +628,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.process.sandbox/models/com/mbeddr/mpsutil/process/sandbox/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.process.sandbox/models/com/mbeddr/mpsutil/process/sandbox/plugin.mps index 9a52017a030..1915dd167b4 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.process.sandbox/models/com/mbeddr/mpsutil/process/sandbox/plugin.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.process.sandbox/models/com/mbeddr/mpsutil/process/sandbox/plugin.mps @@ -32,6 +32,7 @@ + @@ -199,7 +200,7 @@ - + @@ -648,6 +649,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.review.runtime/com.mbeddr.mpsutil.review.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.review.runtime/com.mbeddr.mpsutil.review.runtime.msd index 4dabeb56f63..b10197b6ccd 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.review.runtime/com.mbeddr.mpsutil.review.runtime.msd +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.review.runtime/com.mbeddr.mpsutil.review.runtime.msd @@ -75,7 +75,6 @@ - diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.review.runtime/models/com/mbeddr/mpsutil/review/runtime/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.review.runtime/models/com/mbeddr/mpsutil/review/runtime/plugin.mps index bf7be673ed3..c19318bd9f8 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.review.runtime/models/com/mbeddr/mpsutil/review/runtime/plugin.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.review.runtime/models/com/mbeddr/mpsutil/review/runtime/plugin.mps @@ -40,6 +40,7 @@ + @@ -985,6 +986,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.smodule.sandbox/com.mbeddr.mpdutil.smodule.sandbox.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.smodule.sandbox/com.mbeddr.mpdutil.smodule.sandbox.msd index 7e50f4600fb..e6d635cd1f4 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.smodule.sandbox/com.mbeddr.mpdutil.smodule.sandbox.msd +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.smodule.sandbox/com.mbeddr.mpdutil.smodule.sandbox.msd @@ -23,6 +23,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.smodule.sandbox/models/com/mbeddr/mpsutil/smodule/sandbox/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.smodule.sandbox/models/com/mbeddr/mpsutil/smodule/sandbox/plugin.mps index d1ec25672a3..ae51704b814 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.smodule.sandbox/models/com/mbeddr/mpsutil/smodule/sandbox/plugin.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.smodule.sandbox/models/com/mbeddr/mpsutil/smodule/sandbox/plugin.mps @@ -25,6 +25,7 @@ + @@ -120,6 +121,7 @@ + @@ -163,6 +165,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.targetchooser/com.mbeddr.mpsutil.targetchooser.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.targetchooser/com.mbeddr.mpsutil.targetchooser.msd index ce971266bbc..577c07fe860 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.targetchooser/com.mbeddr.mpsutil.targetchooser.msd +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.targetchooser/com.mbeddr.mpsutil.targetchooser.msd @@ -20,6 +20,7 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 215c4c45-ba99-49f5-9ab7-4b6901a63cfd(MPS.Generator) a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime) + 98b3b6eb-9d60-4e29-9afb-762ac8948292(jetbrains.mps.ide.refactoring.platform) @@ -53,6 +54,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.traceExplorer/models/com.mbeddr.mpsutil.traceExplorer.plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.traceExplorer/models/com.mbeddr.mpsutil.traceExplorer.plugin.mps index 4a977b08ff7..c4ffcfcf95e 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.traceExplorer/models/com.mbeddr.mpsutil.traceExplorer.plugin.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.traceExplorer/models/com.mbeddr.mpsutil.traceExplorer.plugin.mps @@ -54,7 +54,8 @@ - + + @@ -2301,7 +2302,7 @@ - + @@ -3998,6 +3999,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4008,7 +4094,7 @@ - + @@ -4048,8 +4134,8 @@ - - + + @@ -4062,7 +4148,7 @@ - + @@ -4325,8 +4411,8 @@ - - + + @@ -4773,7 +4859,7 @@ - + @@ -4789,8 +4875,8 @@ - - + + @@ -4827,10 +4913,11 @@ - + + @@ -4840,8 +4927,8 @@ - - + + @@ -4920,6 +5007,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -4932,7 +5042,7 @@ - + @@ -5127,8 +5237,8 @@ - - + + @@ -5583,7 +5693,7 @@ - + @@ -5693,8 +5803,8 @@ - - + + @@ -5707,7 +5817,7 @@ - + @@ -5772,8 +5882,8 @@ - - + + @@ -5826,7 +5936,7 @@ - + @@ -5941,8 +6051,8 @@ - - + + @@ -5955,7 +6065,7 @@ - + @@ -6150,8 +6260,8 @@ - - + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.typesystem.rt/models/com/mbeddr/mpsutil/typesystem/trace/rt/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.typesystem.rt/models/com/mbeddr/mpsutil/typesystem/trace/rt/plugin.mps index ffc23e4e108..9dffc875ffb 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.typesystem.rt/models/com/mbeddr/mpsutil/typesystem/trace/rt/plugin.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.typesystem.rt/models/com/mbeddr/mpsutil/typesystem/trace/rt/plugin.mps @@ -24,8 +24,9 @@ + + - @@ -45,6 +46,7 @@ + @@ -344,6 +346,7 @@ + @@ -605,15 +608,30 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.xmlImport/models/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.xmlImport/models/plugin.mps index a0a45abb27f..4907adf2f91 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.xmlImport/models/plugin.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.xmlImport/models/plugin.mps @@ -47,6 +47,7 @@ + @@ -397,6 +398,7 @@ + @@ -2467,6 +2469,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.xmodel.actions/com.mbeddr.mpsutil.xmodel.actions.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.xmodel.actions/com.mbeddr.mpsutil.xmodel.actions.msd deleted file mode 100644 index 50e3f2ac987..00000000000 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.xmodel.actions/com.mbeddr.mpsutil.xmodel.actions.msd +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - 742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform) - c5eeb6dc-2f3d-45ae-a7be-929daeb6bda1(de.itemis.mps.hacks.xmodelgen) - b401a680-8325-4110-8fd3-84331ff25bef(jetbrains.mps.lang.generator) - 8f6725be-608d-433b-98fd-844f816eb05f(jetbrains.mps.ide.make) - 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) - 7ab1a6fa-0a11-4b95-9e48-75f363d6cb00(jetbrains.mps.lang.generator.plan) - 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) - 215c4c45-ba99-49f5-9ab7-4b6901a63cfd(MPS.Generator) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.xmodel.actions/models/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.xmodel.actions/models/plugin.mps deleted file mode 100644 index 4784f8cc610..00000000000 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.xmodel.actions/models/plugin.mps +++ /dev/null @@ -1,1373 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.mpsutil/solutions/doc.com.mbeddr.mpsutil.multilingual/doc.com.mbeddr.mpsutil.multilingual.msd b/code/languages/com.mbeddr.mpsutil/solutions/doc.com.mbeddr.mpsutil.multilingual/doc.com.mbeddr.mpsutil.multilingual.msd index 42ea7f37637..6502c3e2a58 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/doc.com.mbeddr.mpsutil.multilingual/doc.com.mbeddr.mpsutil.multilingual.msd +++ b/code/languages/com.mbeddr.mpsutil/solutions/doc.com.mbeddr.mpsutil.multilingual/doc.com.mbeddr.mpsutil.multilingual.msd @@ -36,6 +36,7 @@ + @@ -64,7 +65,6 @@ - diff --git a/code/languages/com.mbeddr.mpsutil/solutions/org.apache.batik/lib/batik-all-1.12.jar b/code/languages/com.mbeddr.mpsutil/solutions/org.apache.batik/lib/batik-all-1.12.jar deleted file mode 100644 index 142c1dd2cc2..00000000000 Binary files a/code/languages/com.mbeddr.mpsutil/solutions/org.apache.batik/lib/batik-all-1.12.jar and /dev/null differ diff --git a/code/languages/com.mbeddr.mpsutil/solutions/org.apache.batik/org.apache.batik.msd b/code/languages/com.mbeddr.mpsutil/solutions/org.apache.batik/org.apache.batik.msd deleted file mode 100644 index d942bb79628..00000000000 --- a/code/languages/com.mbeddr.mpsutil/solutions/org.apache.batik/org.apache.batik.msd +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) - 96569509-ecfc-4944-b6c9-075faf02fe2c(org.xml) - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.mpsutil/solutions/org.xml/org.xml.msd b/code/languages/com.mbeddr.mpsutil/solutions/org.xml/org.xml.msd deleted file mode 100644 index f3ad355b97b..00000000000 --- a/code/languages/com.mbeddr.mpsutil/solutions/org.xml/org.xml.msd +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) - - - - - - - - - - - - - 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 a48cae490ef..b3863b102f3 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 @@ -6,7 +6,7 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/test.com.mbeddr.mpsutil.logicalChild.msd b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/test.com.mbeddr.mpsutil.logicalChild.msd index aae193373af..335840bbccf 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/test.com.mbeddr.mpsutil.logicalChild.msd +++ b/code/languages/com.mbeddr.mpsutil/solutions/test.com.mbeddr.mpsutil.logicalChild/test.com.mbeddr.mpsutil.logicalChild.msd @@ -6,7 +6,7 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual.concept.sandbox/test.ts.mpsutil.multilingual.concept.sandbox.mpl b/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual.concept.sandbox/test.ts.mpsutil.multilingual.concept.sandbox.mpl index 2500197c0e5..ab57afe7e25 100644 --- a/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual.concept.sandbox/test.ts.mpsutil.multilingual.concept.sandbox.mpl +++ b/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual.concept.sandbox/test.ts.mpsutil.multilingual.concept.sandbox.mpl @@ -60,7 +60,6 @@ - diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual/test.ts.mpsutil.multilingual.msd b/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual/test.ts.mpsutil.multilingual.msd index 41148fea8d0..b946e41bbcc 100644 --- a/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual/test.ts.mpsutil.multilingual.msd +++ b/code/languages/com.mbeddr.mpsutil/tests/test.ts.mpsutil.multilingual/test.ts.mpsutil.multilingual.msd @@ -60,7 +60,6 @@ - diff --git a/code/languages/com.mbeddr.xmodel/.mps/encodings.xml b/code/languages/com.mbeddr.xmodel/.mps/encodings.xml deleted file mode 100644 index 97626ba4544..00000000000 --- a/code/languages/com.mbeddr.xmodel/.mps/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/code/languages/com.mbeddr.xmodel/.mps/libraries.xml b/code/languages/com.mbeddr.xmodel/.mps/libraries.xml deleted file mode 100644 index e6de0288101..00000000000 --- a/code/languages/com.mbeddr.xmodel/.mps/libraries.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/code/languages/com.mbeddr.xmodel/.mps/migration.xml b/code/languages/com.mbeddr.xmodel/.mps/migration.xml deleted file mode 100644 index 64a93943bdc..00000000000 --- a/code/languages/com.mbeddr.xmodel/.mps/migration.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/code/languages/com.mbeddr.xmodel/.mps/misc.xml b/code/languages/com.mbeddr.xmodel/.mps/misc.xml deleted file mode 100644 index 8e3bf350fcd..00000000000 --- a/code/languages/com.mbeddr.xmodel/.mps/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/code/languages/com.mbeddr.xmodel/.mps/modules.xml b/code/languages/com.mbeddr.xmodel/.mps/modules.xml deleted file mode 100644 index 1c133cad645..00000000000 --- a/code/languages/com.mbeddr.xmodel/.mps/modules.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/code/languages/com.mbeddr.xmodel/.mps/vcs.xml b/code/languages/com.mbeddr.xmodel/.mps/vcs.xml deleted file mode 100644 index b4275b6f039..00000000000 --- a/code/languages/com.mbeddr.xmodel/.mps/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/code/languages/com.mbeddr.xmodel/.mps/version.xml b/code/languages/com.mbeddr.xmodel/.mps/version.xml deleted file mode 100644 index 48d71a1e6cc..00000000000 --- a/code/languages/com.mbeddr.xmodel/.mps/version.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/code/languages/com.mbeddr.xmodel/_spreferences/CodeReviewPreferences/models/com.mbeddr.xmodel.__spreferences.CodeReviewPreferences.mps b/code/languages/com.mbeddr.xmodel/_spreferences/CodeReviewPreferences/models/com.mbeddr.xmodel.__spreferences.CodeReviewPreferences.mps deleted file mode 100644 index 8a75ca8fcff..00000000000 --- a/code/languages/com.mbeddr.xmodel/_spreferences/CodeReviewPreferences/models/com.mbeddr.xmodel.__spreferences.CodeReviewPreferences.mps +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.xmodel/_spreferences/CodeReviewPreferences/module.msd b/code/languages/com.mbeddr.xmodel/_spreferences/CodeReviewPreferences/module.msd deleted file mode 100644 index e911791fd1a..00000000000 --- a/code/languages/com.mbeddr.xmodel/_spreferences/CodeReviewPreferences/module.msd +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.xmodel/_spreferences/PlatformTemplates/models/com.mbeddr.xmodel.__spreferences.PlatformTemplates.mps b/code/languages/com.mbeddr.xmodel/_spreferences/PlatformTemplates/models/com.mbeddr.xmodel.__spreferences.PlatformTemplates.mps deleted file mode 100644 index aad8dc03c0d..00000000000 --- a/code/languages/com.mbeddr.xmodel/_spreferences/PlatformTemplates/models/com.mbeddr.xmodel.__spreferences.PlatformTemplates.mps +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.xmodel/_spreferences/PlatformTemplates/module.msd b/code/languages/com.mbeddr.xmodel/_spreferences/PlatformTemplates/module.msd deleted file mode 100644 index 0a04695b99e..00000000000 --- a/code/languages/com.mbeddr.xmodel/_spreferences/PlatformTemplates/module.msd +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.xmodel/_spreferences/TypeSizeConfiguration/models/com.mbeddr.xmodel.__spreferences.TypeSizeConfiguration.mps b/code/languages/com.mbeddr.xmodel/_spreferences/TypeSizeConfiguration/models/com.mbeddr.xmodel.__spreferences.TypeSizeConfiguration.mps deleted file mode 100644 index e53e2c377f5..00000000000 --- a/code/languages/com.mbeddr.xmodel/_spreferences/TypeSizeConfiguration/models/com.mbeddr.xmodel.__spreferences.TypeSizeConfiguration.mps +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.xmodel/_spreferences/TypeSizeConfiguration/module.msd b/code/languages/com.mbeddr.xmodel/_spreferences/TypeSizeConfiguration/module.msd deleted file mode 100644 index f6c85bb2bc4..00000000000 --- a/code/languages/com.mbeddr.xmodel/_spreferences/TypeSizeConfiguration/module.msd +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.plan/com.mbeddr.xmodel.plan.msd b/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.plan/com.mbeddr.xmodel.plan.msd deleted file mode 100644 index 5f5b02e3abd..00000000000 --- a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.plan/com.mbeddr.xmodel.plan.msd +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.plan/models/genplan.mps b/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.plan/models/genplan.mps deleted file mode 100644 index 2f815ebbbe0..00000000000 --- a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.plan/models/genplan.mps +++ /dev/null @@ -1,472 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/com.mbeddr.xmodel.tests.msd b/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/com.mbeddr.xmodel.tests.msd deleted file mode 100644 index 82ca8304269..00000000000 --- a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/com.mbeddr.xmodel.tests.msd +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - ba2ac496-8745-40ba-babe-060b0c8daaad(com.mbeddr.xmodel.plan) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/components.lib.mps b/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/components.lib.mps deleted file mode 100644 index a02d5b47b31..00000000000 --- a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/components.lib.mps +++ /dev/null @@ -1,320 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/components.user.mps b/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/components.user.mps deleted file mode 100644 index aef8562d9de..00000000000 --- a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/components.user.mps +++ /dev/null @@ -1,297 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/simple.lib.mps b/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/simple.lib.mps deleted file mode 100644 index db8106a61db..00000000000 --- a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/simple.lib.mps +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/simple.user.mps b/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/simple.user.mps deleted file mode 100644 index 2888c8a1e51..00000000000 --- a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/simple.user.mps +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/unittestlang.lib.mps b/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/unittestlang.lib.mps deleted file mode 100644 index 3d81ae57e5e..00000000000 --- a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/unittestlang.lib.mps +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/unittestlang.user.mps b/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/unittestlang.user.mps deleted file mode 100644 index f656cc26cee..00000000000 --- a/code/languages/com.mbeddr.xmodel/solutions/com.mbeddr.xmodel.tests/models/unittestlang.user.mps +++ /dev/null @@ -1,153 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/tests/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.postprocessGeneratedFiles.testlang/test.com.mbeddr.mpsutil.postprocessGeneratedFiles.testlang.mpl b/code/tests/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.postprocessGeneratedFiles.testlang/test.com.mbeddr.mpsutil.postprocessGeneratedFiles.testlang.mpl index 034e2836a84..6263e684844 100644 --- a/code/tests/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.postprocessGeneratedFiles.testlang/test.com.mbeddr.mpsutil.postprocessGeneratedFiles.testlang.mpl +++ b/code/tests/com.mbeddr.mpsutil/languages/test.com.mbeddr.mpsutil.postprocessGeneratedFiles.testlang/test.com.mbeddr.mpsutil.postprocessGeneratedFiles.testlang.mpl @@ -61,6 +61,7 @@ + diff --git a/subprojects/com.mbeddr/build.gradle b/subprojects/com.mbeddr/build.gradle index 111cdbcfb50..08290a0b73c 100755 --- a/subprojects/com.mbeddr/build.gradle +++ b/subprojects/com.mbeddr/build.gradle @@ -9,7 +9,7 @@ plugins { apply plugin: 'download-jbr' downloadJbr { - jbrVersion = '17.0.8.1-b1000.32' + jbrVersion = '17.0.11-b1207.30' } // path variables // If mpsHomeDir is set explicitly, skip the MPS resolution step and use the explicit path (which may be relative from diff --git a/tools/BigProject/.mps/migration.xml b/tools/BigProject/.mps/migration.xml index d62e30e5767..5524d8e35bc 100644 --- a/tools/BigProject/.mps/migration.xml +++ b/tools/BigProject/.mps/migration.xml @@ -11,6 +11,7 @@ - + + \ No newline at end of file