diff --git a/.teamcity/Mbeddr2_Mbeddr/project-config.xml b/.teamcity/Mbeddr2_Mbeddr/project-config.xml index d4d8d1a93bb..fe899077014 100644 --- a/.teamcity/Mbeddr2_Mbeddr/project-config.xml +++ b/.teamcity/Mbeddr2_Mbeddr/project-config.xml @@ -9,7 +9,7 @@ **/*.zip=>%teamcity.build.checkoutDir%/artifacts]]> - + diff --git a/.teamcity/Mbeddr2_Mbeddr_Package/buildTypes/Mbeddr2_Mbeddr_Package_TriggerPackageing.xml b/.teamcity/Mbeddr2_Mbeddr_Package/buildTypes/Mbeddr2_Mbeddr_Package_TriggerPackageing.xml index ac2c57263c6..cb206386492 100644 --- a/.teamcity/Mbeddr2_Mbeddr_Package/buildTypes/Mbeddr2_Mbeddr_Package_TriggerPackageing.xml +++ b/.teamcity/Mbeddr2_Mbeddr_Package/buildTypes/Mbeddr2_Mbeddr_Package_TriggerPackageing.xml @@ -13,13 +13,12 @@ ++:master]]> - diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.acsl.assertions.gen/com.mbeddr.analyses.acsl.assertions.gen.mpl b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.acsl.assertions.gen/com.mbeddr.analyses.acsl.assertions.gen.mpl index 3911dacc115..fe2a92b08c0 100644 --- a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.acsl.assertions.gen/com.mbeddr.analyses.acsl.assertions.gen.mpl +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.acsl.assertions.gen/com.mbeddr.analyses.acsl.assertions.gen.mpl @@ -33,7 +33,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -103,7 +103,6 @@ - @@ -144,7 +143,7 @@ 2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design) - + @@ -156,7 +155,7 @@ - + @@ -203,7 +202,6 @@ - diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.acsl.assertions.gen/generator/template/main@generator.mps b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.acsl.assertions.gen/generator/template/main@generator.mps index 6933798647c..6993cb5897f 100644 --- a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.acsl.assertions.gen/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.acsl.assertions.gen/generator/template/main@generator.mps @@ -5,14 +5,14 @@ - - + + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.acsl.assertions.gen/models/editor.mps b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.acsl.assertions.gen/models/editor.mps index 3419c2e135d..4b83ae59b1a 100644 --- a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.acsl.assertions.gen/models/editor.mps +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.acsl.assertions.gen/models/editor.mps @@ -2,7 +2,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.acsl.cbmc.gen/com.mbeddr.analyses.acsl.cbmc.gen.mpl b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.acsl.cbmc.gen/com.mbeddr.analyses.acsl.cbmc.gen.mpl index cd1f7ee3059..30efce7d7d2 100644 --- a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.acsl.cbmc.gen/com.mbeddr.analyses.acsl.cbmc.gen.mpl +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.acsl.cbmc.gen/com.mbeddr.analyses.acsl.cbmc.gen.mpl @@ -34,7 +34,6 @@ fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) - @@ -42,14 +41,17 @@ - + + + + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.acsl.cbmc.gen/generator/template/main@generator.mps b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.acsl.cbmc.gen/generator/template/main@generator.mps index 034b398991d..ee6ef9497b9 100644 --- a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.acsl.cbmc.gen/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.acsl.cbmc.gen/generator/template/main@generator.mps @@ -21,9 +21,9 @@ - + @@ -68,7 +68,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.acsl/com.mbeddr.analyses.acsl.mpl b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.acsl/com.mbeddr.analyses.acsl.mpl index ed4d6871af4..ff9afce1e89 100644 --- a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.acsl/com.mbeddr.analyses.acsl.mpl +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.acsl/com.mbeddr.analyses.acsl.mpl @@ -28,14 +28,9 @@ - - - - - - + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.acsl/generator/template/main@generator.mps b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.acsl/generator/template/main@generator.mps index c5f723f301a..b2d07db493f 100644 --- a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.acsl/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.acsl/generator/template/main@generator.mps @@ -14,11 +14,11 @@ - + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.concurrency/com.mbeddr.analyses.cbmc.concurrency.mpl b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.concurrency/com.mbeddr.analyses.cbmc.concurrency.mpl index c4b31bb7941..272e2e2671e 100644 --- a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.concurrency/com.mbeddr.analyses.cbmc.concurrency.mpl +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.concurrency/com.mbeddr.analyses.cbmc.concurrency.mpl @@ -31,7 +31,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.concurrency/generator/template/main@generator.mps b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.concurrency/generator/template/main@generator.mps index 1876bc05072..12a773ce072 100644 --- a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.concurrency/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.concurrency/generator/template/main@generator.mps @@ -7,7 +7,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.core/com.mbeddr.analyses.cbmc.core.mpl b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.core/com.mbeddr.analyses.cbmc.core.mpl index 86530d81d87..70d51c2244e 100644 --- a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.core/com.mbeddr.analyses.cbmc.core.mpl +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.core/com.mbeddr.analyses.cbmc.core.mpl @@ -39,7 +39,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.core/generator/template/dead_code@generator.mps b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.core/generator/template/dead_code@generator.mps index c785af92a1c..13efde0a2d2 100644 --- a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.core/generator/template/dead_code@generator.mps +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.core/generator/template/dead_code@generator.mps @@ -25,10 +25,10 @@ - + @@ -40,8 +40,8 @@ - + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.core/generator/template/main@generator.mps b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.core/generator/template/main@generator.mps index 19075725fd6..d51eb9cdb82 100644 --- a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.core/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.core/generator/template/main@generator.mps @@ -9,7 +9,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.statemachines.experimental/com.mbeddr.analyses.cbmc.statemachines.experimental.mpl b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.statemachines.experimental/com.mbeddr.analyses.cbmc.statemachines.experimental.mpl index af21ef5a562..b4d0cf20eae 100644 --- a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.statemachines.experimental/com.mbeddr.analyses.cbmc.statemachines.experimental.mpl +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.statemachines.experimental/com.mbeddr.analyses.cbmc.statemachines.experimental.mpl @@ -36,7 +36,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.statemachines.experimental/generator/template/main@generator.mps b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.statemachines.experimental/generator/template/main@generator.mps index 74454f48cb8..e4f407e8745 100644 --- a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.statemachines.experimental/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.statemachines.experimental/generator/template/main@generator.mps @@ -13,7 +13,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.statemachines/com.mbeddr.analyses.cbmc.statemachines.mpl b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.statemachines/com.mbeddr.analyses.cbmc.statemachines.mpl index 6db51956edb..d7b9e193e77 100644 --- a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.statemachines/com.mbeddr.analyses.cbmc.statemachines.mpl +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.statemachines/com.mbeddr.analyses.cbmc.statemachines.mpl @@ -34,7 +34,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.statemachines/generator/template/main@generator.mps b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.statemachines/generator/template/main@generator.mps index f4f00fb04d9..7f922c50432 100644 --- a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.statemachines/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.statemachines/generator/template/main@generator.mps @@ -9,7 +9,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.testsgen/com.mbeddr.analyses.cbmc.testsgen.mpl b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.testsgen/com.mbeddr.analyses.cbmc.testsgen.mpl index 8429734b51b..d515020fa44 100644 --- a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.testsgen/com.mbeddr.analyses.cbmc.testsgen.mpl +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.testsgen/com.mbeddr.analyses.cbmc.testsgen.mpl @@ -25,7 +25,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.verification_case/com.mbeddr.analyses.cbmc.verification_case.mpl b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.verification_case/com.mbeddr.analyses.cbmc.verification_case.mpl index 3a9833be449..4f20c87c450 100644 --- a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.verification_case/com.mbeddr.analyses.cbmc.verification_case.mpl +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.verification_case/com.mbeddr.analyses.cbmc.verification_case.mpl @@ -31,7 +31,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.verification_case/generator/template/main@generator.mps b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.verification_case/generator/template/main@generator.mps index b18e31b020a..c5a5972263c 100644 --- a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.verification_case/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.verification_case/generator/template/main@generator.mps @@ -25,10 +25,10 @@ - + @@ -37,11 +37,11 @@ + + + - - - diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc/cbmc.mpl b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc/cbmc.mpl index 12de5d830b9..0a0510e59af 100644 --- a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc/cbmc.mpl +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc/cbmc.mpl @@ -44,7 +44,7 @@ - + @@ -190,7 +190,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc/generator/template/nondet@generator.mps b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc/generator/template/nondet@generator.mps index 0be457e171d..b727cbde217 100644 --- a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc/generator/template/nondet@generator.mps +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc/generator/template/nondet@generator.mps @@ -21,10 +21,10 @@ - + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc/generator/template/stubbing@generator.mps b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc/generator/template/stubbing@generator.mps index 69f311123dc..c75a0c5277a 100644 --- a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc/generator/template/stubbing@generator.mps +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc/generator/template/stubbing@generator.mps @@ -24,10 +24,10 @@ - + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc/languageModels/typesystem.mps b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc/languageModels/typesystem.mps index a98afb5ce8a..1f4001dc124 100644 --- a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc/languageModels/typesystem.mps +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc/languageModels/typesystem.mps @@ -8,9 +8,9 @@ - + @@ -102,7 +102,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/com.mbeddr.analyses.fm.base.mpl b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/com.mbeddr.analyses.fm.base.mpl new file mode 100644 index 00000000000..cd21404df21 --- /dev/null +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/com.mbeddr.analyses.fm.base.mpl @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + c34744c1-dc64-4da4-9850-885dee7d4a0c(com.mbeddr.analyses.sat4j.fm) + + + 2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/generator/template/main@generator.mps b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/generator/template/main@generator.mps new file mode 100644 index 00000000000..a04e48ea18c --- /dev/null +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/generator/template/main@generator.mps @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/models/behavior.mps b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/models/behavior.mps new file mode 100644 index 00000000000..04f127dda7c --- /dev/null +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/models/behavior.mps @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/models/constraints.mps b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/models/constraints.mps new file mode 100644 index 00000000000..77afae8ec2d --- /dev/null +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/models/constraints.mps @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/models/editor.mps b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/models/editor.mps new file mode 100644 index 00000000000..44270a94342 --- /dev/null +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/models/editor.mps @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/models/plugin.mps b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/models/plugin.mps new file mode 100644 index 00000000000..589933b031e --- /dev/null +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/models/plugin.mps @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/models/structure.mps b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/models/structure.mps new file mode 100644 index 00000000000..64217f39d41 --- /dev/null +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/models/structure.mps @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/models/typesystem.mps b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/models/typesystem.mps new file mode 100644 index 00000000000..10808004490 --- /dev/null +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/models/typesystem.mps @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.lantest/com.mbeddr.analyses.lantest.mpl b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.lantest/com.mbeddr.analyses.lantest.mpl index 24e16b8d7b1..658087d4d96 100644 --- a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.lantest/com.mbeddr.analyses.lantest.mpl +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.lantest/com.mbeddr.analyses.lantest.mpl @@ -19,7 +19,6 @@ fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) - @@ -29,7 +28,6 @@ - diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.lantest/generator/template/main@generator.mps b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.lantest/generator/template/main@generator.mps index 339811fff9b..ab8cde6d990 100644 --- a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.lantest/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.lantest/generator/template/main@generator.mps @@ -2,10 +2,7 @@ - - - diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.lantest/languageAccessories/com/mbeddr/core/lantest/utils.mps b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.lantest/languageAccessories/com/mbeddr/core/lantest/utils.mps index 436a292646a..d8ddc74f0bc 100644 --- a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.lantest/languageAccessories/com/mbeddr/core/lantest/utils.mps +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.lantest/languageAccessories/com/mbeddr/core/lantest/utils.mps @@ -143,7 +143,6 @@ - @@ -351,6 +350,18 @@ + + + + + + + + + + + + @@ -371,7 +382,11 @@ - + + + + + @@ -428,7 +443,14 @@ - + + + + + + + + @@ -532,6 +554,11 @@ + + + + + @@ -550,7 +577,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.lantest/languageModels/behavior.mps b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.lantest/languageModels/behavior.mps index 8a2aeeb8388..812fcd7b00f 100644 --- a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.lantest/languageModels/behavior.mps +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.lantest/languageModels/behavior.mps @@ -3,6 +3,7 @@ + @@ -16,9 +17,17 @@ + + + + + + + + @@ -33,10 +42,19 @@ + + + + + + + + + @@ -47,60 +65,172 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -148,7 +278,7 @@ - + @@ -159,23 +289,96 @@ - - - - - - - + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -221,5 +424,426 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.lantest/languageModels/editor.mps b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.lantest/languageModels/editor.mps index afbd2f39622..075a7e91561 100644 --- a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.lantest/languageModels/editor.mps +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.lantest/languageModels/editor.mps @@ -38,10 +38,10 @@ - + - + @@ -49,5 +49,23 @@ + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.lantest/languageModels/structure.mps b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.lantest/languageModels/structure.mps index a1569936d1b..bd0060c41c2 100644 --- a/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.lantest/languageModels/structure.mps +++ b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.lantest/languageModels/structure.mps @@ -13,6 +13,7 @@ + @@ -48,7 +49,7 @@ - + @@ -57,5 +58,26 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.lantest.pluginSolution/com.mbeddr.analyses.lantest.pluginSolution.msd b/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.lantest.pluginSolution/com.mbeddr.analyses.lantest.pluginSolution.msd index 2abe3d08328..27f5044864b 100644 --- a/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.lantest.pluginSolution/com.mbeddr.analyses.lantest.pluginSolution.msd +++ b/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.lantest.pluginSolution/com.mbeddr.analyses.lantest.pluginSolution.msd @@ -20,6 +20,9 @@ 2d7fadf5-33f6-4e80-a78f-0f739add2bde(com.mbeddr.core.buildconfig) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) 6d11763d-483d-4b2b-8efc-09336c1b0001(com.mbeddr.core.modules) + 4ac576d1-143d-4250-b299-9dfff325fcb9(com.mbeddr.mpsutil.lantest.rt) + 5ef691b5-60ce-4ece-a04e-25e642dfa128(com.mbeddr.mpsutil.lantest) + 564e97d6-8fb7-41f5-bfc1-c7ed376efd62(com.mbeddr.ext.statemachines) @@ -60,12 +63,18 @@ + + + + + + diff --git a/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.lantest.pluginSolution/models/com/mbeddr/analyses/lantest/pluginSolution/generator.mps b/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.lantest.pluginSolution/models/com/mbeddr/analyses/lantest/pluginSolution/generator.mps index 46aac76e956..ad164b8d068 100644 --- a/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.lantest.pluginSolution/models/com/mbeddr/analyses/lantest/pluginSolution/generator.mps +++ b/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.lantest.pluginSolution/models/com/mbeddr/analyses/lantest/pluginSolution/generator.mps @@ -36,6 +36,8 @@ + + @@ -46,7 +48,6 @@ - @@ -253,7 +254,6 @@ - @@ -308,9 +308,6 @@ - - - @@ -318,7 +315,6 @@ - @@ -330,11 +326,10 @@ - + - @@ -355,17 +350,21 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -486,13 +485,21 @@ - - - + + + - - + + + + + + + + + + @@ -777,8 +784,8 @@ - - + + @@ -814,247 +821,229 @@ - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + - - - - + + + + - - - + + + - - - + + + - - + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + - - @@ -1421,6 +1410,19 @@ + + + + + + + + + + + + + @@ -1473,6 +1475,21 @@ + + + + + + + + + + + + + + + @@ -1549,28 +1566,19 @@ - - - - - - - - - - - - - - - - + + + + + + + @@ -1584,53 +1592,20 @@ - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - @@ -1727,9 +1702,18 @@ + + + + + + + + + - + @@ -1743,6 +1727,21 @@ + + + + + + + + + + + + + + + @@ -1771,32 +1770,37 @@ - - - - + + + + - - - - + + - - - - + + + + + + + + + + - - - - + + + + + - - + + @@ -1832,7 +1836,23 @@ - + + + + + + + + + + + + + + + + + @@ -1844,6 +1864,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1855,41 +1931,52 @@ + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + - - + + - - - - - - + + + + @@ -1906,6 +1993,12 @@ + + + + + + diff --git a/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.lantest.pluginSolution/models/com/mbeddr/analyses/lantest/pluginSolution/plugin.mps b/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.lantest.pluginSolution/models/com/mbeddr/analyses/lantest/pluginSolution/plugin.mps index 41f8a49fd06..e998f981d34 100644 --- a/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.lantest.pluginSolution/models/com/mbeddr/analyses/lantest/pluginSolution/plugin.mps +++ b/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.lantest.pluginSolution/models/com/mbeddr/analyses/lantest/pluginSolution/plugin.mps @@ -13,8 +13,16 @@ + + + + + + + + @@ -38,6 +46,8 @@ + + @@ -51,23 +61,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -80,10 +135,20 @@ + + + + + + + + + + @@ -93,41 +158,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - + + @@ -176,6 +308,7 @@ + @@ -194,5 +327,527 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.lantest.pluginSolution/models/com/mbeddr/analyses/lantest/pluginSolution/semantic_checker.mps b/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.lantest.pluginSolution/models/com/mbeddr/analyses/lantest/pluginSolution/semantic_checker.mps new file mode 100644 index 00000000000..943f663ab7b --- /dev/null +++ b/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.lantest.pluginSolution/models/com/mbeddr/analyses/lantest/pluginSolution/semantic_checker.mps @@ -0,0 +1,413 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.lantest.pluginSolution/models/com/mbeddr/analyses/lantest/pluginSolution/semantic_checker_generic.mps b/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.lantest.pluginSolution/models/com/mbeddr/analyses/lantest/pluginSolution/semantic_checker_generic.mps new file mode 100644 index 00000000000..891deeae9f6 --- /dev/null +++ b/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.lantest.pluginSolution/models/com/mbeddr/analyses/lantest/pluginSolution/semantic_checker_generic.mps @@ -0,0 +1,263 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.lantest.pluginSolution/models/com/mbeddr/analyses/lantest/pluginSolution/semantic_checker_statemachines.mps b/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.lantest.pluginSolution/models/com/mbeddr/analyses/lantest/pluginSolution/semantic_checker_statemachines.mps new file mode 100644 index 00000000000..671eab390b4 --- /dev/null +++ b/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.lantest.pluginSolution/models/com/mbeddr/analyses/lantest/pluginSolution/semantic_checker_statemachines.mps @@ -0,0 +1,420 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.sat4j.fm.pluginSolution/models/com/mbeddr/analyses/sat4j/fm/pluginSolution/plugin.mps b/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.sat4j.fm.pluginSolution/models/com/mbeddr/analyses/sat4j/fm/pluginSolution/plugin.mps index 357d32e1e75..239f1db18b5 100644 --- a/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.sat4j.fm.pluginSolution/models/com/mbeddr/analyses/sat4j/fm/pluginSolution/plugin.mps +++ b/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.sat4j.fm.pluginSolution/models/com/mbeddr/analyses/sat4j/fm/pluginSolution/plugin.mps @@ -233,17 +233,25 @@ + + + + + + - - - + + - - + + + + + @@ -679,8 +687,8 @@ - - + + @@ -743,20 +751,8 @@ - - - - - - - - - - - - - - + + @@ -1017,8 +1013,8 @@ - - + + @@ -1082,20 +1078,8 @@ - - - - - - - - - - - - - - + + @@ -1157,43 +1141,47 @@ - - - - + + + + - - + + + + - - - - - - - - + + + + + + + + - - - + + + + + - + - + - + - + diff --git a/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.sat4j.fm/com.mbeddr.analyses.sat4j.fm.msd b/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.sat4j.fm/com.mbeddr.analyses.sat4j.fm.msd index 2323fcee4b5..9eacedb4ce4 100644 --- a/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.sat4j.fm/com.mbeddr.analyses.sat4j.fm.msd +++ b/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.sat4j.fm/com.mbeddr.analyses.sat4j.fm.msd @@ -18,6 +18,7 @@ 61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions) 6d11763d-483d-4b2b-8efc-09336c1b0001(com.mbeddr.core.modules) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) + ab679a62-68ab-4874-8f77-b33548ab054f(com.mbeddr.analyses.fm.base) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) @@ -30,10 +31,12 @@ + + diff --git a/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.sat4j.fm/models/com/mbeddr/analyses/sat4j/fm/analyses.mps b/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.sat4j.fm/models/com/mbeddr/analyses/sat4j/fm/analyses.mps index ff82e8fcc9a..236c2d5bb8f 100644 --- a/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.sat4j.fm/models/com/mbeddr/analyses/sat4j/fm/analyses.mps +++ b/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.sat4j.fm/models/com/mbeddr/analyses/sat4j/fm/analyses.mps @@ -96,6 +96,7 @@ + @@ -170,6 +171,9 @@ + + + @@ -191,6 +195,7 @@ + @@ -3433,6 +3438,262 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4079,8 +4340,8 @@ - - + + @@ -4123,14 +4384,14 @@ - - + + - - + + @@ -4228,8 +4489,8 @@ - - + + @@ -4961,261 +5222,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6001,6 +6007,9 @@ + + + @@ -6405,5 +6414,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.sat4j.fm/models/com/mbeddr/analyses/sat4j/fm/model.mps b/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.sat4j.fm/models/com/mbeddr/analyses/sat4j/fm/model.mps index 126fb7a226c..c5d76a597ac 100644 --- a/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.sat4j.fm/models/com/mbeddr/analyses/sat4j/fm/model.mps +++ b/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.sat4j.fm/models/com/mbeddr/analyses/sat4j/fm/model.mps @@ -6,18 +6,25 @@ + + + + + + + @@ -41,6 +48,7 @@ + @@ -59,6 +67,10 @@ + + + + @@ -81,6 +93,15 @@ + + + + + + + + + @@ -153,20 +174,81 @@ - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -174,60 +256,87 @@ - - - - + + - - - + - + - + - - - - - - - - - - - + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -251,8 +360,8 @@ - - + + diff --git a/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.sat4j.fm/models/com/mbeddr/analyses/sat4j/fm/plugin.mps b/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.sat4j.fm/models/com/mbeddr/analyses/sat4j/fm/plugin.mps new file mode 100644 index 00000000000..e8a119c256a --- /dev/null +++ b/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.sat4j.fm/models/com/mbeddr/analyses/sat4j/fm/plugin.mps @@ -0,0 +1,211 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.sat4j.fm/models/com/mbeddr/analyses/sat4j/fm/testing.mps b/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.sat4j.fm/models/com/mbeddr/analyses/sat4j/fm/testing.mps index 66fa831c75d..b2004956e4d 100644 --- a/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.sat4j.fm/models/com/mbeddr/analyses/sat4j/fm/testing.mps +++ b/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.sat4j.fm/models/com/mbeddr/analyses/sat4j/fm/testing.mps @@ -12,8 +12,8 @@ - + @@ -40,6 +40,10 @@ + + + + @@ -73,6 +77,9 @@ + + + @@ -80,6 +87,7 @@ + @@ -549,14 +557,28 @@ - - - + + + + + - - - - + + + + + + + + + + + + + + + + @@ -670,8 +692,8 @@ - - + + diff --git a/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.lantest.testdata/models/com/mbeddr/lantest/testdata/_language_testing_paper.mps b/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.lantest.testdata/models/com/mbeddr/lantest/testdata/_language_testing_paper.mps new file mode 100644 index 00000000000..b68c1c689b3 --- /dev/null +++ b/code/languages/com.mbeddr.analyses/solutions/com.mbeddr.lantest.testdata/models/com/mbeddr/lantest/testdata/_language_testing_paper.mps @@ -0,0 +1,400 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.acsl.testcode/models/acsl_to_asserts.mps b/code/languages/com.mbeddr.analyses/tests/test.analyses.acsl.testcode/models/acsl_to_asserts.mps index 0399e2ad66d..b42bba63175 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.acsl.testcode/models/acsl_to_asserts.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.acsl.testcode/models/acsl_to_asserts.mps @@ -7,10 +7,10 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.acsl.testcode/test.analyses.acsl.testcode.msd b/code/languages/com.mbeddr.analyses/tests/test.analyses.acsl.testcode/test.analyses.acsl.testcode.msd index 01c3324ad52..a52de303682 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.acsl.testcode/test.analyses.acsl.testcode.msd +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.acsl.testcode/test.analyses.acsl.testcode.msd @@ -23,7 +23,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.acsl.ts/test.analyses.acsl.ts.msd b/code/languages/com.mbeddr.analyses/tests/test.analyses.acsl.ts/test.analyses.acsl.ts.msd index b721f20b23b..8f0ef89fd1b 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.acsl.ts/test.analyses.acsl.ts.msd +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.acsl.ts/test.analyses.acsl.ts.msd @@ -14,9 +14,6 @@ - - - @@ -24,7 +21,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.base.testcode/test.analyses.base.testcode.msd b/code/languages/com.mbeddr.analyses/tests/test.analyses.base.testcode/test.analyses.base.testcode.msd index a33637e841f..70b84d83f0b 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.base.testcode/test.analyses.base.testcode.msd +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.base.testcode/test.analyses.base.testcode.msd @@ -17,7 +17,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/advanced_verification_condition.mps b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/advanced_verification_condition.mps index 26a91821226..56e4de36c49 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/advanced_verification_condition.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/advanced_verification_condition.mps @@ -9,7 +9,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/assertion.mps b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/assertion.mps index 2f5d4ada558..41520fe2733 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/assertion.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/assertion.mps @@ -9,8 +9,8 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/cbmc_arguments.mps b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/cbmc_arguments.mps index 24c218a1e5c..46bd248579d 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/cbmc_arguments.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/cbmc_arguments.mps @@ -10,8 +10,8 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/cbmc_error.mps b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/cbmc_error.mps index 655a79387e5..68d85783541 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/cbmc_error.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/cbmc_error.mps @@ -9,8 +9,8 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/comparison_with_other_tools.mps b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/comparison_with_other_tools.mps index 5cad0daf7c7..1b495d56457 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/comparison_with_other_tools.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/comparison_with_other_tools.mps @@ -11,8 +11,8 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/dead_code.mps b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/dead_code.mps index 662827db357..e54213cbb65 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/dead_code.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/dead_code.mps @@ -9,7 +9,6 @@ - @@ -32,6 +31,7 @@ + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/expressions.mps b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/expressions.mps index 8fb27f88713..b3c2cca0188 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/expressions.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/expressions.mps @@ -9,7 +9,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/external_c_files.mps b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/external_c_files.mps index 2f9eacafd75..77648ad2a91 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/external_c_files.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/external_c_files.mps @@ -9,8 +9,8 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/harness.mps b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/harness.mps index 7daee650ed4..3bb7838a8da 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/harness.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/harness.mps @@ -11,8 +11,8 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/loops_unwinding.mps b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/loops_unwinding.mps index 43972a7a548..cddb4b00186 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/loops_unwinding.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/loops_unwinding.mps @@ -9,8 +9,8 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/partial_loops.mps b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/partial_loops.mps index 25f4efe5a6a..85178426ed7 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/partial_loops.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/partial_loops.mps @@ -9,8 +9,8 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/ppc.mps b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/ppc.mps index 41c9d8d2bc5..6b103c951dd 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/ppc.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/ppc.mps @@ -12,8 +12,8 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/protocol_extended_component.mps b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/protocol_extended_component.mps index d86bcf09beb..b9a42257a3b 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/protocol_extended_component.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/protocol_extended_component.mps @@ -10,7 +10,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/protocol_smoke.mps b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/protocol_smoke.mps index a754d83e8d7..34a8509b499 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/protocol_smoke.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/protocol_smoke.mps @@ -11,8 +11,8 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/protocol_unwinding_loops.mps b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/protocol_unwinding_loops.mps index 1eb65e45f3c..b0f3de17974 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/protocol_unwinding_loops.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/protocol_unwinding_loops.mps @@ -10,8 +10,8 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/robustness.mps b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/robustness.mps index 99088548cbe..653a62e73d7 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/robustness.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/robustness.mps @@ -11,8 +11,8 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/statemachines.mps b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/statemachines.mps index e51874331b3..480bc55545b 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/statemachines.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/statemachines.mps @@ -9,9 +9,9 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/statemachines_complex.mps b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/statemachines_complex.mps index b6bc48f4527..73dfc87e9f0 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/statemachines_complex.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/statemachines_complex.mps @@ -12,8 +12,8 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/test/analyses/cbmc/testcode/counterexample/mbeddr/statemachines.mps b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/test/analyses/cbmc/testcode/counterexample/mbeddr/statemachines.mps index d1b457e8892..8a6b1076182 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/test/analyses/cbmc/testcode/counterexample/mbeddr/statemachines.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/test/analyses/cbmc/testcode/counterexample/mbeddr/statemachines.mps @@ -256,6 +256,9 @@ + + + @@ -1408,5 +1411,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/verification_config.mps b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/verification_config.mps index e4a89c51d4d..5d4a63f8bd1 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/verification_config.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/models/verification_config.mps @@ -11,8 +11,8 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/testcode.msd b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/testcode.msd index 19fb381aa44..3a06824d8c9 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/testcode.msd +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode/testcode.msd @@ -34,7 +34,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode_analyses_config/testcode_analyses_config.msd b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode_analyses_config/testcode_analyses_config.msd index 7da3cad1a4a..8520e301a71 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode_analyses_config/testcode_analyses_config.msd +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testcode_analyses_config/testcode_analyses_config.msd @@ -29,7 +29,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testsgen.testcode/test.analyses.cbmc.testsgen.testcode.msd b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testsgen.testcode/test.analyses.cbmc.testsgen.testcode.msd index da4bd47086d..d109dc70caf 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testsgen.testcode/test.analyses.cbmc.testsgen.testcode.msd +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.testsgen.testcode/test.analyses.cbmc.testsgen.testcode.msd @@ -23,7 +23,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.ts/test.analyses.cbmc.ts.msd b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.ts/test.analyses.cbmc.ts.msd index 2df88422916..9187e8184cc 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.ts/test.analyses.cbmc.ts.msd +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc.ts/test.analyses.cbmc.ts.msd @@ -26,7 +26,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc/models/test/analyses/cbmc/counterexample/mbeddr/statemachines@tests.mps b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc/models/test/analyses/cbmc/counterexample/mbeddr/statemachines@tests.mps index 6d89d47296c..96e0b216060 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc/models/test/analyses/cbmc/counterexample/mbeddr/statemachines@tests.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc/models/test/analyses/cbmc/counterexample/mbeddr/statemachines@tests.mps @@ -20,6 +20,7 @@ + @@ -1367,5 +1368,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc/models/test/analyses/cbmc/ppc@tests.mps b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc/models/test/analyses/cbmc/ppc@tests.mps index 577179d2043..fe27828af46 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc/models/test/analyses/cbmc/ppc@tests.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.cbmc/models/test/analyses/cbmc/ppc@tests.mps @@ -532,7 +532,7 @@ - + @@ -784,7 +784,7 @@ - + @@ -1031,7 +1031,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.stan.ts/models/test/analyses/stan/ts/z3_expressions_translator@tests.mps b/code/languages/com.mbeddr.analyses/tests/test.analyses.stan.ts/models/test/analyses/stan/ts/z3_expressions_translator@tests.mps index 098e65bc47f..f7acef74b49 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.stan.ts/models/test/analyses/stan/ts/z3_expressions_translator@tests.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.stan.ts/models/test/analyses/stan/ts/z3_expressions_translator@tests.mps @@ -9,7 +9,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.stan.ts/test.analyses.stan.ts.msd b/code/languages/com.mbeddr.analyses/tests/test.analyses.stan.ts/test.analyses.stan.ts.msd index b668aebfed8..752393b9df7 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.stan.ts/test.analyses.stan.ts.msd +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.stan.ts/test.analyses.stan.ts.msd @@ -23,7 +23,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.var.testcode/models/test/analyses/var/testcode/cm.mps b/code/languages/com.mbeddr.analyses/tests/test.analyses.var.testcode/models/test/analyses/var/testcode/cm.mps index bffa297abd7..7d8864876f8 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.var.testcode/models/test/analyses/var/testcode/cm.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.var.testcode/models/test/analyses/var/testcode/cm.mps @@ -3,7 +3,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.var.testcode/models/test/analyses/var/testcode/fm.mps b/code/languages/com.mbeddr.analyses/tests/test.analyses.var.testcode/models/test/analyses/var/testcode/fm.mps index 10ff71b2c54..59a0ee7aea4 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.var.testcode/models/test/analyses/var/testcode/fm.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.var.testcode/models/test/analyses/var/testcode/fm.mps @@ -3,7 +3,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.var.testcode/models/test/analyses/var/testcode/var_c.mps b/code/languages/com.mbeddr.analyses/tests/test.analyses.var.testcode/models/test/analyses/var/testcode/var_c.mps index aa72c90b9a4..d87eba095de 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.var.testcode/models/test/analyses/var/testcode/var_c.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.var.testcode/models/test/analyses/var/testcode/var_c.mps @@ -7,8 +7,8 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.var.testcode/test.analyses.var.testcode.msd b/code/languages/com.mbeddr.analyses/tests/test.analyses.var.testcode/test.analyses.var.testcode.msd index a62de4d6343..2038a321a05 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.var.testcode/test.analyses.var.testcode.msd +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.var.testcode/test.analyses.var.testcode.msd @@ -15,7 +15,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analyses.var/models/test/analyses/var/var_c@tests.mps b/code/languages/com.mbeddr.analyses/tests/test.analyses.var/models/test/analyses/var/var_c@tests.mps index aed50c9a6b2..690cb5e4773 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analyses.var/models/test/analyses/var/var_c@tests.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analyses.var/models/test/analyses/var/var_c@tests.mps @@ -1487,8 +1487,8 @@ - - + + @@ -1517,8 +1517,8 @@ - - + + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analysis.formsera/formsera.msd b/code/languages/com.mbeddr.analyses/tests/test.analysis.formsera/formsera.msd index deea0d6e489..054637f5891 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analysis.formsera/formsera.msd +++ b/code/languages/com.mbeddr.analyses/tests/test.analysis.formsera/formsera.msd @@ -28,7 +28,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analysis.formsera/models/contracts.mps b/code/languages/com.mbeddr.analyses/tests/test.analysis.formsera/models/contracts.mps index bf8c0479e5b..542da2852d8 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analysis.formsera/models/contracts.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analysis.formsera/models/contracts.mps @@ -3,7 +3,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analysis.formsera/models/dec_tab.mps b/code/languages/com.mbeddr.analyses/tests/test.analysis.formsera/models/dec_tab.mps index 0ae549e3f9d..833877bbeda 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analysis.formsera/models/dec_tab.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analysis.formsera/models/dec_tab.mps @@ -4,7 +4,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analysis.formsera/models/protocol.mps b/code/languages/com.mbeddr.analyses/tests/test.analysis.formsera/models/protocol.mps index 3a23c8a4316..45a58386e92 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analysis.formsera/models/protocol.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analysis.formsera/models/protocol.mps @@ -3,7 +3,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analysis.nfm/models/function_verification.mps b/code/languages/com.mbeddr.analyses/tests/test.analysis.nfm/models/function_verification.mps index 19c3272b892..2ab6bc0800c 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analysis.nfm/models/function_verification.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analysis.nfm/models/function_verification.mps @@ -11,7 +11,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analysis.nfm/models/simple_contracts.mps b/code/languages/com.mbeddr.analyses/tests/test.analysis.nfm/models/simple_contracts.mps index 50af626cc29..3bb61675a67 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analysis.nfm/models/simple_contracts.mps +++ b/code/languages/com.mbeddr.analyses/tests/test.analysis.nfm/models/simple_contracts.mps @@ -10,7 +10,7 @@ - + diff --git a/code/languages/com.mbeddr.analyses/tests/test.analysis.nfm/nfm.msd b/code/languages/com.mbeddr.analyses/tests/test.analysis.nfm/nfm.msd index e94d5497841..8ef0e332287 100644 --- a/code/languages/com.mbeddr.analyses/tests/test.analysis.nfm/nfm.msd +++ b/code/languages/com.mbeddr.analyses/tests/test.analysis.nfm/nfm.msd @@ -27,7 +27,7 @@ - + diff --git a/code/languages/com.mbeddr.build/.mps/libraries.xml b/code/languages/com.mbeddr.build/.mps/libraries.xml index b693af15b64..22f7ae6c0bd 100644 --- a/code/languages/com.mbeddr.build/.mps/libraries.xml +++ b/code/languages/com.mbeddr.build/.mps/libraries.xml @@ -15,7 +15,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 old mode 100755 new mode 100644 index e6151828b0a..b4c1f2231f4 --- 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 @@ -2402,6 +2402,12 @@ + + + + + + @@ -9925,6 +9931,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10008,6 +10043,12 @@ + + + + + + diff --git a/code/languages/com.mbeddr.core/_spreferences/PlatformTemplates/module.msd b/code/languages/com.mbeddr.core/_spreferences/PlatformTemplates/module.msd index bbaf58bbe98..b415961459c 100644 --- a/code/languages/com.mbeddr.core/_spreferences/PlatformTemplates/module.msd +++ b/code/languages/com.mbeddr.core/_spreferences/PlatformTemplates/module.msd @@ -10,7 +10,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 7af058e0e91..694922c0687 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 @@ -2,7 +2,7 @@ - + diff --git a/code/languages/com.mbeddr.core/_spreferences/TypeSizeConfiguration/module.msd b/code/languages/com.mbeddr.core/_spreferences/TypeSizeConfiguration/module.msd index 0ce79e03409..f47c89b6078 100644 --- a/code/languages/com.mbeddr.core/_spreferences/TypeSizeConfiguration/module.msd +++ b/code/languages/com.mbeddr.core/_spreferences/TypeSizeConfiguration/module.msd @@ -9,7 +9,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 798abc4b9ca..4904a4985cc 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 @@ -21,7 +21,7 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/generator/template/com/mbeddr/core/pointers/generator/template/main@generator.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/generator/template/com/mbeddr/core/pointers/generator/template/main@generator.mps index 8b22174d77f..4bb9bd289a7 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/generator/template/com/mbeddr/core/pointers/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/generator/template/com/mbeddr/core/pointers/generator/template/main@generator.mps @@ -9,8 +9,8 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/editor.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/editor.mps index e260541788e..ee1b20f0327 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/editor.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/editor.mps @@ -130,6 +130,9 @@ + + + @@ -148,6 +151,7 @@ + @@ -213,6 +217,7 @@ + @@ -225,6 +230,8 @@ + + @@ -278,6 +285,19 @@ + + + + + + + + + + + + + @@ -618,9 +638,6 @@ - - - @@ -630,11 +647,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -655,41 +701,62 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + - - - - - - - - @@ -698,6 +765,9 @@ + + + @@ -1188,5 +1258,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps index a96ce5e7e3a..03618f988f3 100755 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps @@ -250,7 +250,7 @@ - + @@ -5234,6 +5234,9 @@ + + + @@ -5617,9 +5620,6 @@ - - - @@ -6281,13 +6281,13 @@ - - + + - - + + @@ -6296,72 +6296,85 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - + + + + + + - - + + + + + + + + + + - - - - - + + + + + - + - + - - - + + + - + @@ -12243,10 +12256,10 @@ - + @@ -17553,6 +17566,9 @@ + + + @@ -17569,9 +17585,6 @@ - - - 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 b7589920867..786899292e1 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 @@ -32,7 +32,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 be2e5946071..261e8c5d1b4 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 @@ -30,7 +30,7 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/generator/template/main@generator.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/generator/template/main@generator.mps index ed641f13d3b..e29c143d3f3 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.embedded/generator/template/main@generator.mps @@ -19,11 +19,11 @@ - + 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 98e3df1b101..6cc21d68fe3 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 @@ -1,5 +1,5 @@ - + @@ -23,7 +23,7 @@ - + @@ -105,6 +105,7 @@ 984f0332-8a86-4f5c-9184-03eae96b5d16(com.mbeddr.core.expressions.runtime) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) 7ac49bcb-77fb-4f0f-9036-e31b86b854b2(com.mbeddr.mpsutil.grammarcells.runtime) + 61c69711-ed61-4850-81d9-7714ff227fb0(com.mbeddr.core.expressions) 2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design) diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/generator/template/main@generator.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/generator/template/main@generator.mps index f425bfbf463..87bc561864f 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/generator/template/main@generator.mps @@ -4,8 +4,8 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/behavior.mps index 1ea1c81ac9b..2e9b7c0c137 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/behavior.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/behavior.mps @@ -6808,6 +6808,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16917,6 +16976,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -17422,6 +17532,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -21883,5 +22021,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/dataFlow.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/dataFlow.mps index 10402bce65e..8575a0c5af4 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/dataFlow.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/dataFlow.mps @@ -474,6 +474,22 @@ + + + + + + + + + + + + + + + + @@ -559,5 +575,21 @@ + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/editor.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/editor.mps index 02c710aeb7e..451dacd6589 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/editor.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/editor.mps @@ -1402,6 +1402,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2093,6 +2127,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/migration.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/migration.mps index 9aabf004dba..79ae59cefd2 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/migration.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/migration.mps @@ -11,8 +11,8 @@ + - @@ -30,6 +30,9 @@ + + + @@ -53,6 +56,10 @@ + + + + @@ -96,6 +103,24 @@ + + + + + + + + + + + + + + + + + + @@ -107,6 +132,9 @@ + + + @@ -272,5 +300,180 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 d4355f3b04f..2386b04d347 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 @@ -10,6 +10,7 @@ + @@ -435,6 +436,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -1212,6 +1234,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/textGen.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/textGen.mps index fe82230f3c6..ee5bad9a795 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/textGen.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/textGen.mps @@ -76,7 +76,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -509,6 +509,24 @@ + + + + + + + + + + + + + + + + + + @@ -1218,5 +1236,23 @@ + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/typesystem.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/typesystem.mps index 31758e753b1..9e1b48c307c 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/typesystem.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/typesystem.mps @@ -2,10 +2,10 @@ - - - - + + + + @@ -121,7 +121,7 @@ - + @@ -2425,6 +2425,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -9569,9 +9617,6 @@ - - - @@ -9582,6 +9627,9 @@ + + + @@ -13249,6 +13297,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -13307,39 +13390,52 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + - - - - - + + + + + + - - - + + + 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 b2702aea8bb..8c19d62008e 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 @@ -20,7 +20,7 @@ - + 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 2c8ee7aa223..b6b66bf7b88 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 @@ -46,7 +46,7 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/generator/template/main@generator.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/generator/template/main@generator.mps index 62216c3e690..087b9a38454 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules.gen/generator/template/main@generator.mps @@ -108,7 +108,7 @@ - + @@ -5894,6 +5894,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/generator/template/addReturnToClosure@generator.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/generator/template/addReturnToClosure@generator.mps index 207df637ca3..b9559a2a055 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/generator/template/addReturnToClosure@generator.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/generator/template/addReturnToClosure@generator.mps @@ -7,8 +7,8 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/generator/template/main@generator.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/generator/template/main@generator.mps index 728d28775c7..a37607aa79b 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/generator/template/main@generator.mps @@ -11,8 +11,8 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/textGen.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/textGen.mps index 8fdd533cd1d..46c7c6b7261 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/textGen.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/textGen.mps @@ -137,10 +137,18 @@ + + + + + + + + @@ -1240,9 +1248,18 @@ - - - + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/typesystem.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/typesystem.mps index 1b07508e281..13b61e621aa 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/typesystem.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/typesystem.mps @@ -204,6 +204,7 @@ + @@ -2835,7 +2836,7 @@ - + @@ -2849,7 +2850,7 @@ - + @@ -2858,7 +2859,7 @@ - + @@ -2867,82 +2868,157 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - + - - - + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - + + + + + + + + + + + + + + + - - - - - - + + + + + + - - + + - - - - - - - - + + + + + + + + - - - - + + + @@ -2950,14 +3026,14 @@ - + - + @@ -2973,13 +3049,13 @@ - - - - + + + + - - + + @@ -2988,7 +3064,7 @@ - + @@ -3002,23 +3078,22 @@ - - - - - + + + + - - - - + + + + - + - - + + @@ -3027,13 +3102,13 @@ - - - - + + + + - - + + @@ -3043,8 +3118,8 @@ - - + + @@ -3062,8 +3137,8 @@ - - + + @@ -3082,8 +3157,8 @@ - - + + @@ -3105,7 +3180,7 @@ - + @@ -3117,29 +3192,16 @@ - - - - - - - - - - - - - - - - + + + - + - + @@ -3149,14 +3211,23 @@ - + - - + + + + + + + + + + + @@ -3165,7 +3236,7 @@ - + @@ -3175,7 +3246,7 @@ - + @@ -3192,7 +3263,7 @@ - + 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 a1fda6bf110..67383677a3d 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 @@ -29,7 +29,7 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/generator/template/main@generator.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/generator/template/main@generator.mps index 4c3f559857e..0396ba99a51 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/generator/template/main@generator.mps @@ -8,8 +8,8 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/intentions.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/intentions.mps index 430496b19f4..1f9021a0443 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/intentions.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/intentions.mps @@ -13,9 +13,9 @@ - + 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 58bb4fe3f7a..ed4c7e751ce 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 @@ -20,7 +20,7 @@ - + @@ -115,7 +115,7 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/generator/template/main@generator.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/generator/template/main@generator.mps index c2ecba7a750..1c330a278e7 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/generator/template/main@generator.mps @@ -43,18 +43,21 @@ - - + + + + + @@ -73,6 +76,7 @@ + @@ -94,10 +98,11 @@ + - + @@ -130,6 +135,11 @@ + + + + + @@ -443,6 +453,7 @@ + @@ -589,96 +600,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -706,282 +627,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -3880,7 +3530,7 @@ - + @@ -4098,6 +3748,238 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4393,6 +4275,19 @@ + + + + + + + + + + + + + @@ -4429,18 +4324,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4469,16 +4403,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4501,6 +4474,19 @@ + + + + + + + + + + + + + @@ -4528,6 +4514,19 @@ + + + + + + + + + + + + + @@ -4550,6 +4549,19 @@ + + + + + + + + + + + + + @@ -4816,6 +4828,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4861,6 +4904,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4969,25 +5079,29 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4995,6 +5109,11 @@ + + + + + @@ -5131,7 +5250,6 @@ - diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageAccessories/com/mbeddr/core/unittest/messages.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageAccessories/com/mbeddr/core/unittest/messages.mps index d7ea13b1b70..23207648797 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageAccessories/com/mbeddr/core/unittest/messages.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageAccessories/com/mbeddr/core/unittest/messages.mps @@ -134,6 +134,7 @@ + @@ -445,18 +446,21 @@ + + + @@ -554,6 +558,9 @@ + + + @@ -2272,6 +2279,25 @@ + + + + + + + + + + + + + + + + + + + @@ -2798,29 +2824,466 @@ - - + + - - + + - - + + - + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + - - + + + + + + + + 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 3096ba0c874..08d430e0bc2 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 @@ -251,6 +251,9 @@ + + + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/typesystem.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/typesystem.mps index b364874f2b2..bbf4829965b 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/typesystem.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/languageModels/typesystem.mps @@ -74,6 +74,9 @@ + + + @@ -83,6 +86,7 @@ + @@ -1158,5 +1162,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 523f388b3bb..6d14e112ed4 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 @@ -33,7 +33,7 @@ - + @@ -183,7 +183,7 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/generator/template/main@generator.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/generator/template/main@generator.mps index dc885724a89..2df7278d568 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/generator/template/main@generator.mps @@ -15,8 +15,8 @@ - + @@ -101,7 +101,7 @@ - + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/typesystem.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/typesystem.mps index b422bbbcee0..f97043be4b3 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/typesystem.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/languageModels/typesystem.mps @@ -4,7 +4,7 @@ - + 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 85a5575c58a..8a17264be2f 100755 --- 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 @@ -29,7 +29,7 @@ - + @@ -267,7 +267,7 @@ - + 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 b61af29543b..b0e7c708fd0 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 @@ -12,7 +12,7 @@ - + diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/models/com/mbeddr/core/posix.mps b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/models/com/mbeddr/core/posix.mps index f95f8b4c800..7e13c150cf0 100644 --- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/models/com/mbeddr/core/posix.mps +++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/models/com/mbeddr/core/posix.mps @@ -7,8 +7,8 @@ - + diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/models/com/mbeddr/core/stdlib.mps b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/models/com/mbeddr/core/stdlib.mps index 07e00be11f3..aeb7bb61e51 100644 --- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/models/com/mbeddr/core/stdlib.mps +++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/models/com/mbeddr/core/stdlib.mps @@ -2,14 +2,14 @@ - - - - - - - - + + + + + + + + @@ -1795,6 +1795,26 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/models/com/mbeddr/core/sys.mps b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/models/com/mbeddr/core/sys.mps index ad9938b6ce4..3c29f27849d 100644 --- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/models/com/mbeddr/core/sys.mps +++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/models/com/mbeddr/core/sys.mps @@ -7,8 +7,8 @@ - + diff --git a/code/languages/com.mbeddr.core/tests/aLibrary/aLibrary.msd b/code/languages/com.mbeddr.core/tests/aLibrary/aLibrary.msd index 03ef39537d9..01314b296cb 100644 --- a/code/languages/com.mbeddr.core/tests/aLibrary/aLibrary.msd +++ b/code/languages/com.mbeddr.core/tests/aLibrary/aLibrary.msd @@ -21,7 +21,7 @@ - + diff --git a/code/languages/com.mbeddr.core/tests/test.editor.core/models/test/editor/core/actions@tests.mps b/code/languages/com.mbeddr.core/tests/test.editor.core/models/test/editor/core/actions@tests.mps index 489f9db94d0..6637df21f45 100644 --- a/code/languages/com.mbeddr.core/tests/test.editor.core/models/test/editor/core/actions@tests.mps +++ b/code/languages/com.mbeddr.core/tests/test.editor.core/models/test/editor/core/actions@tests.mps @@ -3,7 +3,6 @@ - @@ -14,6 +13,7 @@ + @@ -3700,8 +3700,13 @@ - - + + + + + + + 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 b352fc7c459..193710864c7 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 @@ -24,7 +24,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 adb918a1a8c..a8ec6bb098c 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 @@ -20,7 +20,7 @@ - + diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/lib/expressions.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/lib/expressions.mps index 1e203c602a3..4fb4606768c 100644 --- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/lib/expressions.mps +++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/lib/expressions.mps @@ -6,11 +6,11 @@ - - - - - + + + + + @@ -842,16 +842,13 @@ - - - + + + - - - - + @@ -867,14 +864,11 @@ - - + + + - - - - @@ -894,14 +888,11 @@ - - + + + - - - - @@ -914,14 +905,11 @@ - - + + + - - - - 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 f15af77f9e0..04857d71856 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 @@ -21,7 +21,7 @@ - + diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core.checks/models/bitwise_operators@tests.mps b/code/languages/com.mbeddr.core/tests/test.ts.core.checks/models/bitwise_operators@tests.mps index 768359babb2..6bec54150d8 100644 --- a/code/languages/com.mbeddr.core/tests/test.ts.core.checks/models/bitwise_operators@tests.mps +++ b/code/languages/com.mbeddr.core/tests/test.ts.core.checks/models/bitwise_operators@tests.mps @@ -9,9 +9,9 @@ - + diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core.checks/models/test/ts/core/checks/zero_literals@tests.mps b/code/languages/com.mbeddr.core/tests/test.ts.core.checks/models/test/ts/core/checks/zero_literals@tests.mps index ed4e5d98f14..6ef72227fec 100644 --- a/code/languages/com.mbeddr.core/tests/test.ts.core.checks/models/test/ts/core/checks/zero_literals@tests.mps +++ b/code/languages/com.mbeddr.core/tests/test.ts.core.checks/models/test/ts/core/checks/zero_literals@tests.mps @@ -7,7 +7,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 db90ab5ff63..2b8e3c5684b 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 @@ -15,7 +15,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 722e96629fc..a7fe8367eee 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 @@ -20,7 +20,7 @@ - + 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 9e672f21eaa..c41a89e333c 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 @@ -22,7 +22,7 @@ - + diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core.performance/models/test/ts/core/performance/tests@tests.mps b/code/languages/com.mbeddr.core/tests/test.ts.core.performance/models/test/ts/core/performance/tests@tests.mps index 9022405e583..113f889577a 100644 --- a/code/languages/com.mbeddr.core/tests/test.ts.core.performance/models/test/ts/core/performance/tests@tests.mps +++ b/code/languages/com.mbeddr.core/tests/test.ts.core.performance/models/test/ts/core/performance/tests@tests.mps @@ -11,9 +11,9 @@ - + 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 82a183e0d20..a0b26232b98 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 @@ -18,7 +18,7 @@ - + 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 2c5765b7bda..d235d329581 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 @@ -35,7 +35,7 @@ - + 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 185532b8f20..01d95eaeafd 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 @@ -2,15 +2,15 @@ - - - - - - - - - + + + + + + + + + @@ -24,15 +24,15 @@ - - - + - + + + @@ -104,7 +104,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 03bce52d9f4..1111bcf3f15 100755 --- 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 @@ -29,15 +29,7 @@ fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) - - - - - - - - @@ -46,17 +38,13 @@ - - - - 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 d0e9ea2b215..354519fabec 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 @@ -40,8 +40,10 @@ + + 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 1ef8feec68b..c6171b48700 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 @@ -34,6 +34,7 @@ + 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 7cfd3f4a62a..187f650cbdb 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 @@ -20,11 +20,15 @@ + + + + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lantest/com.mbeddr.mpsutil.lantest.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lantest/com.mbeddr.mpsutil.lantest.mpl index 4d2bb0eb541..c103ec4d3bd 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lantest/com.mbeddr.mpsutil.lantest.mpl +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lantest/com.mbeddr.mpsutil.lantest.mpl @@ -51,6 +51,10 @@ 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) 4ac576d1-143d-4250-b299-9dfff325fcb9(com.mbeddr.mpsutil.lantest.rt) + c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure) + 7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel) + 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) + 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design) @@ -83,9 +87,16 @@ + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lantest/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lantest/languageModels/behavior.mps index b2c316582a4..6bfeb2d2d8b 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lantest/languageModels/behavior.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lantest/languageModels/behavior.mps @@ -13,6 +13,11 @@ + + + + + @@ -34,6 +39,8 @@ + + @@ -50,18 +57,23 @@ + + + + + @@ -93,6 +105,12 @@ + + + + + + @@ -104,6 +122,9 @@ + + + @@ -113,6 +134,14 @@ + + + + + + + + @@ -123,6 +152,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -133,27 +200,11 @@ - - - - - - - - - - + + - - - - - - - - - - + + @@ -189,6 +240,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -221,6 +376,7 @@ + @@ -262,6 +418,7 @@ + @@ -276,12 +433,37 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -293,6 +475,7 @@ + @@ -309,6 +492,7 @@ + @@ -403,5 +587,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lantest/languageModels/constraints.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lantest/languageModels/constraints.mps index e3b07814a17..7b332013f8d 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lantest/languageModels/constraints.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lantest/languageModels/constraints.mps @@ -10,12 +10,10 @@ + - - - @@ -98,21 +96,36 @@ + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -121,84 +134,101 @@ - - - - - - - - + + + + + + + + + - + - - - - - - + + + + + + - + - + - - + + - - + + - + - - + + - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lantest/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lantest/languageModels/editor.mps index f65b58a2c62..9aa01f12505 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lantest/languageModels/editor.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lantest/languageModels/editor.mps @@ -16,11 +16,18 @@ + + + + + + + @@ -100,24 +107,31 @@ - - + + - - - - - - - - - - - - + + + - + + + + + + + + + + + + + + + + + @@ -145,19 +159,48 @@ + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + @@ -191,24 +234,22 @@ + - - - - - - - - + + + + + @@ -239,5 +280,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lantest/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lantest/languageModels/structure.mps index 66b52b20c92..9694dcf5285 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lantest/languageModels/structure.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.lantest/languageModels/structure.mps @@ -6,11 +6,19 @@ + - + + + + + + + + @@ -42,6 +50,7 @@ + @@ -78,6 +87,24 @@ + + + + + + + + + + + + + + + + + + @@ -86,10 +113,9 @@ - - - - + + + @@ -98,6 +124,7 @@ + @@ -112,25 +139,28 @@ + - - - - - - + + + + + + + + @@ -168,5 +198,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.lantest.pluginSolution/models/com/mbeddr/mpsutil/lantest/pluginSolution/plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.lantest.pluginSolution/models/com/mbeddr/mpsutil/lantest/pluginSolution/plugin.mps index 9b6ce21fa0d..2980dbdd4ac 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.lantest.pluginSolution/models/com/mbeddr/mpsutil/lantest/pluginSolution/plugin.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.lantest.pluginSolution/models/com/mbeddr/mpsutil/lantest/pluginSolution/plugin.mps @@ -60,6 +60,7 @@ + @@ -141,13 +142,14 @@ - + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.lantest.rt/models/com/mbeddr/mpsutil/lantest/rt/gen.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.lantest.rt/models/com/mbeddr/mpsutil/lantest/rt/gen.mps index 74a50c69fb5..3e23843f587 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.lantest.rt/models/com/mbeddr/mpsutil/lantest/rt/gen.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.lantest.rt/models/com/mbeddr/mpsutil/lantest/rt/gen.mps @@ -47,7 +47,14 @@ - + + + + + + + + @@ -59,10 +66,13 @@ + + + @@ -76,11 +86,6 @@ - - - - - @@ -105,10 +110,6 @@ - - - - @@ -127,7 +128,10 @@ - + + + + @@ -166,6 +170,7 @@ + @@ -216,6 +221,7 @@ + @@ -239,6 +245,9 @@ + + + @@ -254,7 +263,6 @@ - @@ -262,6 +270,9 @@ + + + @@ -270,6 +281,7 @@ + @@ -303,9 +315,7 @@ - - - + @@ -322,6 +332,12 @@ + + + + + + @@ -342,9 +358,6 @@ - - - @@ -355,18 +368,24 @@ + + + + + + + + + - - - - + @@ -440,6 +459,9 @@ + + + @@ -450,491 +472,324 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + - - - - - - - - - - + + + + - - - - - + + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + - - - + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - + + + + - - + + - - - - - + + + - + @@ -1455,19 +1310,6 @@ - - - - - - - - - - - - - @@ -1487,6 +1329,18 @@ + + + + + + + + + + + + @@ -1536,30 +1390,43 @@ - + - + - - - - + + + + + - + - + + + + + + + + + + + + + @@ -1623,23 +1490,18 @@ - - - - - - - - + + + - - + + - - + + @@ -1686,14 +1548,32 @@ - - + + - + + + + + + + + + + + + + + + + + + + @@ -1713,6 +1593,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1764,36 +1688,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1819,11 +1713,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + @@ -1878,24 +1844,6 @@ - - - - - - - - - - - - - - - - - - @@ -1905,696 +1853,54 @@ - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - + + + - - - - - - - + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - @@ -2634,6 +1940,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -2658,7 +1985,7 @@ - + @@ -2667,104 +1994,1539 @@ + + + + + + + - - - - + + - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - + + + + - - - - - - + + + + + - - - - - - - - - + + + + + - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2797,7 +3559,7 @@ - + @@ -3107,9 +3869,12 @@ - - - + + + + + + @@ -3688,21 +4453,109 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - + + - + @@ -3899,7 +4752,7 @@ - + @@ -4079,6 +4932,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4098,7 +4977,7 @@ - + @@ -4179,11 +5058,8 @@ - - - - - + + @@ -4206,6 +5082,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4393,7 +5334,7 @@ - + @@ -4462,7 +5403,7 @@ - + @@ -4501,24 +5442,40 @@ - + - - - - + + + + + + + + + - - + + + + - - - - + + + + + + + + + + + + + @@ -4536,6 +5493,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4647,7 +5669,7 @@ - + @@ -4758,13 +5780,25 @@ + + + + + + + + + + + + - + @@ -4777,7 +5811,7 @@ - + @@ -4813,16 +5847,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -4839,685 +5899,569 @@ + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - + + + - + + - - - + + + - + - - - + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - + - - + + - + - - - - + + + + - + - + - - + + - - - - + + + - + + - - - - + + + + - + - + - - - + + - + + - - - - - + + + + + - + - + - + - - - + + + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - + + + + + + + + + - - + + + + + + + - - + + - + - + - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - + - - + + + + + + + + - - + + + + + - - - - - + + + + + + + + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - + + + + - - - - - - - - - - + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + - - + + - - - - - - + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - + + + + + + + + - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - + + + + + + + + - - - - - - - + + + + + + + + - - + + - - - - - - + + - - + + - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - + + + - + + - + - + @@ -5539,9 +6483,20 @@ - - - + + + + + + + + + + + + + + @@ -5733,7 +6688,11 @@ - + + + + + @@ -5752,7 +6711,7 @@ - + @@ -5762,25 +6721,11 @@ - - - - - - - - - - - - - - - - + + - - + + @@ -5793,32 +6738,60 @@ - - - + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -5828,25 +6801,11 @@ - - - - - - - - - - - - - - - - + + - - + + @@ -5859,9 +6818,6 @@ - - - @@ -5898,31 +6854,31 @@ + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + - - - + + + @@ -5930,22 +6886,27 @@ + + + + + - + - + - + @@ -5961,6 +6922,13 @@ + + + + + + + @@ -5969,7 +6937,7 @@ - + @@ -6035,7 +7003,7 @@ - + @@ -6059,11 +7027,9 @@ - - - - - + + + @@ -6080,24 +7046,37 @@ + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + + + + @@ -6119,30 +7098,17 @@ - - - - - - - + + + - - - - - - - - - - + + + + - - - @@ -6167,7 +7133,6 @@ - @@ -6310,11 +7275,9 @@ - - - - - + + + @@ -6325,30 +7288,20 @@ - - + + + + + + + + - - - - - - - - - - - - - - - - @@ -6364,8 +7317,8 @@ - - + + @@ -6379,8 +7332,8 @@ - - + + @@ -6430,8 +7383,8 @@ - - + + @@ -6446,9 +7399,17 @@ + + + + + + + + - + @@ -6522,11 +7483,55 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6591,141 +7596,227 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - + + + + + + - - - - - - - + + + - - - - - + + + + @@ -6751,68 +7842,11 @@ - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -6936,5 +7970,492 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.lantest.rt/models/com/mbeddr/mpsutil/lantest/rt/saver.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.lantest.rt/models/com/mbeddr/mpsutil/lantest/rt/saver.mps index a2c6a2fb60f..6933dc19a36 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.lantest.rt/models/com/mbeddr/mpsutil/lantest/rt/saver.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.lantest.rt/models/com/mbeddr/mpsutil/lantest/rt/saver.mps @@ -13,6 +13,7 @@ + @@ -29,7 +30,6 @@ - @@ -85,7 +85,7 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.lantest.rt/models/com/mbeddr/mpsutil/lantest/rt/seed.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.lantest.rt/models/com/mbeddr/mpsutil/lantest/rt/seed.mps index 6fbd1c6d237..6e0dfaf4389 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.lantest.rt/models/com/mbeddr/mpsutil/lantest/rt/seed.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.lantest.rt/models/com/mbeddr/mpsutil/lantest/rt/seed.mps @@ -12,6 +12,7 @@ + @@ -35,6 +36,7 @@ + @@ -139,7 +141,6 @@ - @@ -162,7 +163,7 @@ - + @@ -171,10 +172,10 @@ - + - - + + @@ -184,12 +185,12 @@ - + - + @@ -197,9 +198,9 @@ - - - + + + @@ -214,23 +215,86 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -238,6 +302,9 @@ + + + diff --git a/code/plugins/sl-all/diagram/languages/de.itemis.mps.editor.diagram.demolang/de.itemis.mps.editor.diagram.demolang.mpl b/code/plugins/sl-all/diagram/languages/de.itemis.mps.editor.diagram.demolang/de.itemis.mps.editor.diagram.demolang.mpl index 4503675a7b3..65fa177e3cc 100644 --- a/code/plugins/sl-all/diagram/languages/de.itemis.mps.editor.diagram.demolang/de.itemis.mps.editor.diagram.demolang.mpl +++ b/code/plugins/sl-all/diagram/languages/de.itemis.mps.editor.diagram.demolang/de.itemis.mps.editor.diagram.demolang.mpl @@ -19,27 +19,19 @@ fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) - - - - - - - - diff --git a/download.xml b/download.xml index 10983f758df..b3cd24a279a 100644 --- a/download.xml +++ b/download.xml @@ -1,5 +1,4 @@ -