From 46624a9f9e851dba84357943fcd34ed8f09e1e58 Mon Sep 17 00:00:00 2001 From: Domenik Pavletic Date: Thu, 17 Dec 2015 15:05:45 +0100 Subject: [PATCH 01/49] brackets for ArrayTypes appear on left side --- .../languageModels/editor.mps | 130 +++++++++++++----- 1 file changed, 93 insertions(+), 37 deletions(-) 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..994575e599d 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 @@ + @@ -221,10 +226,10 @@ - + @@ -278,6 +283,19 @@ + + + + + + + + + + + + + @@ -618,9 +636,6 @@ - - - @@ -630,11 +645,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -655,41 +699,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - From c43793720adbf6aa33d53f08bc17702144ac69f0 Mon Sep 17 00:00:00 2001 From: Domenik Pavletic Date: Thu, 17 Dec 2015 16:06:35 +0100 Subject: [PATCH 02/49] fixed broken ArrayType-related editor tests --- .../models/test/editor/core/actions@tests.mps | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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..4a7d5bba6a9 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 @@ -3700,8 +3700,13 @@ - - + + + + + + + From 18b192f432ec9e98a66d04b687ab37d5e24d68f7 Mon Sep 17 00:00:00 2001 From: Domenik Pavletic Date: Thu, 17 Dec 2015 16:07:40 +0100 Subject: [PATCH 03/49] core: possibility to create ArrayType from right side of baseType --- .../com.mbeddr.core.arrays/languageModels/editor.mps | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 994575e599d..bc24c4c8029 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 @@ -229,6 +229,7 @@ + @@ -745,6 +746,15 @@ + + + + + + + + + From afe474461f3e929c889959edab5fb8add863bf72 Mon Sep 17 00:00:00 2001 From: Domenik Pavletic Date: Thu, 24 Dec 2015 11:23:32 +0100 Subject: [PATCH 04/49] mbeddr's ArrayType is default --- .../languageModels/editor.mps | 97 +++++++++++++++++++ 1 file changed, 97 insertions(+) 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 bc24c4c8029..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 @@ -226,6 +226,7 @@ + @@ -764,6 +765,9 @@ + + + @@ -1254,5 +1258,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 42bf0e675c5998408e6c1217d1d37e5906ee1ebe Mon Sep 17 00:00:00 2001 From: danielratiu Date: Thu, 24 Dec 2015 22:31:37 +0100 Subject: [PATCH 05/49] first steps with the semantic checker --- .../lantest/pluginSolution/generator.mps | 526 +++++++++++------- 1 file changed, 328 insertions(+), 198 deletions(-) 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..0c7d38242c6 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,7 @@ + @@ -46,6 +47,7 @@ + @@ -275,6 +277,9 @@ + + + @@ -299,13 +304,6 @@ - - - - - - - @@ -333,6 +331,7 @@ + @@ -814,242 +813,206 @@ - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + - - - - + + + + - - - + + + - - - + + + - - + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + - - + + + + + @@ -1421,6 +1384,19 @@ + + + + + + + + + + + + + @@ -1473,6 +1449,21 @@ + + + + + + + + + + + + + + + @@ -1784,19 +1775,32 @@ - - - - + + + + + + + + + + - - - - + + + + + - - + + + + + + + + @@ -1908,5 +1912,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 6a854a98213ee61faa395e0116aabcfc05c4caf8 Mon Sep 17 00:00:00 2001 From: danielratiu Date: Sun, 27 Dec 2015 00:14:49 +0100 Subject: [PATCH 06/49] small improvements --- .../com/mbeddr/mpsutil/lantest/rt/gen.mps | 588 +++++++++--------- 1 file changed, 294 insertions(+), 294 deletions(-) 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..dde4f5e85db 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,6 +47,7 @@ + @@ -59,6 +60,7 @@ + @@ -105,10 +107,6 @@ - - - - @@ -216,6 +214,7 @@ + @@ -322,6 +321,12 @@ + + + + + + @@ -545,37 +550,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -662,246 +636,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + @@ -1896,6 +1671,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2027,29 +1829,16 @@ - - - - - - - - - - - - - - - - - - - + + - - - + + + + + + + @@ -2100,7 +1889,7 @@ - + @@ -2160,14 +1949,92 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2273,6 +2140,16 @@ + + + + + + + + + + @@ -2284,8 +2161,24 @@ - + + + + + + + + + + + + + + + + + @@ -2297,6 +2190,16 @@ + + + + + + + + + + @@ -2310,6 +2213,22 @@ + + + + + + + + + + + + + + + + @@ -2324,6 +2243,18 @@ + + + + + + + + + + + + @@ -2349,6 +2280,22 @@ + + + + + + + + + + + + + + + + @@ -2575,6 +2522,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 2b5cdb2c80be4fab21e56775b634b541c658e9a7 Mon Sep 17 00:00:00 2001 From: danielratiu Date: Thu, 31 Dec 2015 15:29:38 +0100 Subject: [PATCH 07/49] major improvements of the generator --- .../com.mbeddr.mpsutil.lantest.mpl | 1 + .../languageModels/behavior.mps | 116 +- .../languageModels/constraints.mps | 140 +- .../languageModels/editor.mps | 26 +- .../languageModels/structure.mps | 27 +- .../mpsutil/lantest/pluginSolution/plugin.mps | 4 +- .../com/mbeddr/mpsutil/lantest/rt/gen.mps | 2251 ++++++++++------- .../com/mbeddr/mpsutil/lantest/rt/seed.mps | 107 +- 8 files changed, 1685 insertions(+), 987 deletions(-) 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..1fd5f091755 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,7 @@ 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) 2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design) 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..7bd749d6666 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 @@ -34,6 +34,7 @@ + @@ -93,6 +94,12 @@ + + + + + + @@ -104,6 +111,9 @@ + + + @@ -113,6 +123,14 @@ + + + + + + + + @@ -123,6 +141,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -133,27 +189,11 @@ - - - - - - - - - - + + - - - - - - - - - - + + @@ -262,6 +302,7 @@ + @@ -276,12 +317,37 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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..1731610403c 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,6 +10,7 @@ + @@ -98,9 +99,13 @@ + + + + @@ -122,83 +127,126 @@ + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - + + + + + + - + - + - - + + - - + + - + - - + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + - - + + + + + + + + + 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..a057bb9eec0 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 @@ -191,19 +191,16 @@ + - - - - - - - - + + + + @@ -239,5 +236,18 @@ + + + + + + + + + + + + + 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..97b4cd7a49f 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 @@ -7,7 +7,7 @@ - + @@ -112,16 +112,17 @@ + - - - - - - + + + + + + @@ -168,5 +169,17 @@ + + + + + + + + + + + + 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 dde4f5e85db..cc6f3924a03 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 @@ -48,6 +48,7 @@ + @@ -65,6 +66,7 @@ + @@ -1323,6 +1325,16 @@ + + + + + + + + + + @@ -1419,6 +1431,22 @@ + + + + + + + + + + + + + + + + @@ -1550,11 +1578,8 @@ - - - - - + + @@ -1594,11 +1619,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + @@ -1653,51 +1730,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1707,703 +1739,152 @@ - - - - - + + + + + - - - - - - - - - - - - - - - - - + + + + - - + + - - - - - - - - - - - - + + + + - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -2411,110 +1892,313 @@ - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + - - - - - - - + + + + - - + + - - - - + + + + - + - - - + + + + + + + + + + + + + + + - - - - - + + + + + - - + + - + - - + + - + @@ -2522,153 +2206,872 @@ - - - + + + - + - - - - - - - - - - + + + - - - - - - + + + + + + + + + + + + + + + + - - + + + + + + + + + - - + + - - - + + + - - + + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + - - + + + + + + + + + + + + - - - + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + - + @@ -2687,8 +3090,8 @@ - - + + @@ -3701,6 +4104,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ + + + From ea4a3089ed271dfb43fd37e59e36a4acfd0401e0 Mon Sep 17 00:00:00 2001 From: danielratiu Date: Thu, 31 Dec 2015 15:32:49 +0100 Subject: [PATCH 08/49] major improvements in the generation and checking of models --- ...mbeddr.analyses.lantest.pluginSolution.msd | 3 + .../lantest/pluginSolution/generator.mps | 186 ++++- .../lantest/pluginSolution/plugin.mps | 704 +++++++++++++++++- 3 files changed, 862 insertions(+), 31 deletions(-) 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..45b7a7aa4bb 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,8 @@ 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) @@ -66,6 +68,7 @@ + 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 0c7d38242c6..eebb7aacc0d 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 @@ -57,10 +57,6 @@ - - - - @@ -304,6 +300,13 @@ + + + + + + + @@ -354,17 +357,21 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -485,13 +492,21 @@ - - - + + + - - + + + + + + + + + + @@ -776,8 +791,8 @@ - - + + @@ -1015,9 +1030,27 @@ - - + + + + + + + + + + + + + + + + + + + + @@ -1540,7 +1573,6 @@ - @@ -1836,7 +1868,23 @@ - + + + + + + + + + + + + + + + + + @@ -1848,6 +1896,16 @@ + + + + + + + + + + @@ -1859,6 +1917,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -1886,6 +1967,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1910,6 +2038,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..4a610744189 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,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - + + @@ -176,6 +314,7 @@ + @@ -194,5 +333,560 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From d1e253ad8c0cd4e0b773670b6bae9206d45a9105 Mon Sep 17 00:00:00 2001 From: danielratiu Date: Fri, 1 Jan 2016 20:51:07 +0100 Subject: [PATCH 09/49] small fix --- .../languageModels/behavior.mps | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) 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..bc3f260cb8e 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 @@ -194,7 +194,7 @@ - + @@ -17422,6 +17422,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + From c459ab4729a2344ebc5b99062b6e6203a9ae13e7 Mon Sep 17 00:00:00 2001 From: danielratiu Date: Sun, 3 Jan 2016 16:23:57 +0100 Subject: [PATCH 10/49] added renderReadable for ternary expression --- .../languageModels/behavior.mps | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) 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 bc3f260cb8e..928ad7f5915 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 49b7977ac5cedb34a4d304328fb137201dd2e7d1 Mon Sep 17 00:00:00 2001 From: danielratiu Date: Sun, 3 Jan 2016 16:38:32 +0100 Subject: [PATCH 11/49] major improvements and fixes in models synthesis --- .../com/mbeddr/mpsutil/lantest/rt/gen.mps | 553 ++++++++++++++---- 1 file changed, 444 insertions(+), 109 deletions(-) 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 cc6f3924a03..61b29aa4f52 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 @@ -240,6 +240,9 @@ + + + @@ -362,10 +365,19 @@ + + + + + + + + + @@ -447,6 +459,9 @@ + + + @@ -521,38 +536,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -639,6 +622,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -703,6 +717,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -1516,6 +1554,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2543,7 +2607,28 @@ - + + + + + + + + + + + + + + + + + + + + + + @@ -2579,6 +2664,22 @@ + + + + + + + + + + + + + + + + @@ -2723,40 +2824,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2769,6 +2836,7 @@ + @@ -4570,6 +4638,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4670,11 +4764,8 @@ - - - - - + + @@ -4697,6 +4788,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5138,7 +5294,7 @@ - + @@ -5470,11 +5626,6 @@ - - - - - @@ -5485,20 +5636,23 @@ - - + + - - + + - + - + + + + @@ -6030,11 +6184,6 @@ - - - - - @@ -6304,6 +6453,11 @@ + + + + + @@ -6610,30 +6764,17 @@ - - - - - - - + + + - - - - - - - - - - + + + + - - - @@ -7427,5 +7568,199 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 06940c0e31f80586e100dfac4f0994052cb912d9 Mon Sep 17 00:00:00 2001 From: danielratiu Date: Sun, 3 Jan 2016 16:40:15 +0100 Subject: [PATCH 12/49] many improvements in language testing --- .../com.mbeddr.analyses.lantest.mpl | 1 + .../languageModels/behavior.mps | 296 ++++++++++++ .../languageModels/editor.mps | 6 + .../languageModels/structure.mps | 11 + ...mbeddr.analyses.lantest.pluginSolution.msd | 6 + .../lantest/pluginSolution/generator.mps | 135 +----- .../pluginSolution/semantic_checker.mps | 413 +++++++++++++++++ .../semantic_checker_generic.mps | 263 +++++++++++ .../semantic_checker_statemachines.mps | 420 ++++++++++++++++++ 9 files changed, 1419 insertions(+), 132 deletions(-) create mode 100644 code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.lantest.pluginSolution/models/com/mbeddr/analyses/lantest/pluginSolution/semantic_checker.mps create mode 100644 code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.lantest.pluginSolution/models/com/mbeddr/analyses/lantest/pluginSolution/semantic_checker_generic.mps create mode 100644 code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.lantest.pluginSolution/models/com/mbeddr/analyses/lantest/pluginSolution/semantic_checker_statemachines.mps 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..e2f5bc43410 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 @@ -20,6 +20,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..71a8ee6e00a 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,6 +17,10 @@ + + + + @@ -33,7 +38,13 @@ + + + + + + @@ -47,13 +58,29 @@ + + + + + + + + + + + + + + + + @@ -63,44 +90,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -221,5 +307,215 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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..94091e17452 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 @@ -49,5 +49,11 @@ + + + + + + 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..993146a1a3b 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 @@ + @@ -57,5 +58,15 @@ + + + + + + + + + + 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 45b7a7aa4bb..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 @@ -22,6 +22,7 @@ 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) @@ -62,8 +63,13 @@ + + + + + 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 eebb7aacc0d..3196df483a5 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 @@ -37,6 +37,7 @@ + @@ -47,7 +48,6 @@ - @@ -273,9 +273,6 @@ - - - @@ -1809,8 +1806,8 @@ - - + + @@ -2046,131 +2043,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 6ebf1ac5f89da1d8f029a449deda4a75ddac22b2 Mon Sep 17 00:00:00 2001 From: danielratiu Date: Sun, 3 Jan 2016 23:15:01 +0100 Subject: [PATCH 13/49] some more fixes in synthethising of models --- .../com/mbeddr/mpsutil/lantest/rt/gen.mps | 476 +++--------------- 1 file changed, 56 insertions(+), 420 deletions(-) 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 61b29aa4f52..d731901e16b 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 @@ -258,7 +258,6 @@ - @@ -307,9 +306,6 @@ - - - @@ -352,9 +348,6 @@ - - - @@ -382,6 +375,7 @@ + @@ -3578,9 +3572,12 @@ - - - + + + + + + @@ -5294,7 +5291,7 @@ - + @@ -5766,392 +5763,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7159,6 +6770,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7256,29 +6907,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -7361,6 +6989,14 @@ + + + + + + + + From 9376e0ece1e625acc50dcc3030a31241f4d84a48 Mon Sep 17 00:00:00 2001 From: Tamas Szabo Date: Mon, 4 Jan 2016 22:52:44 +0100 Subject: [PATCH 14/49] core: fixes NPE in file chooser dialog #accent-2059 --- .../languageModels/intentions.mps | 80 +++++++++++++------ 1 file changed, 56 insertions(+), 24 deletions(-) diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/intentions.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/intentions.mps index 68ccdc7ec1c..09828af0d59 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/intentions.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/intentions.mps @@ -92,6 +92,7 @@ + @@ -1147,38 +1148,69 @@ - - - - - - - - - - - + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + - - - - - - From 6610373c59ffba4e32dbb3c2e977763b9d773964 Mon Sep 17 00:00:00 2001 From: danielratiu Date: Mon, 4 Jan 2016 23:58:04 +0100 Subject: [PATCH 15/49] new test --- .../counterexample/mbeddr/statemachines.mps | 116 ++++++++++++ .../mbeddr/statemachines@tests.mps | 175 ++++++++++++++++++ 2 files changed, 291 insertions(+) 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/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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From be0015824837ab8f5ce1c04b8445327b7531d687 Mon Sep 17 00:00:00 2001 From: Tamas Szabo Date: Tue, 5 Jan 2016 13:05:02 +0100 Subject: [PATCH 16/49] core: fixes main function signature check #accent-2058 --- .../languageModels/typesystem.mps | 287 +++++++++++------- 1 file changed, 179 insertions(+), 108 deletions(-) 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 @@ - + From 438a207559ef7710f188958304edded44feab57a Mon Sep 17 00:00:00 2001 From: danielratiu Date: Tue, 5 Jan 2016 22:35:25 +0100 Subject: [PATCH 17/49] small fixes --- .../com/mbeddr/mpsutil/lantest/rt/gen.mps | 280 ++++++++++-------- 1 file changed, 162 insertions(+), 118 deletions(-) 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 d731901e16b..310fb996aea 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 @@ -2658,21 +2658,6 @@ - - - - - - - - - - - - - - - @@ -2748,6 +2733,21 @@ + + + + + + + + + + + + + + + @@ -2764,6 +2764,15 @@ + + + + + + + + + @@ -3061,8 +3070,6 @@ - - @@ -3079,6 +3086,7 @@ + @@ -3097,6 +3105,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -5106,7 +5135,7 @@ - + @@ -5145,7 +5174,7 @@ - + @@ -6874,129 +6903,144 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + - - - - + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + - - - - - - - + + + - - - - - + + + + - - - - - - - - From 67cb9be337a5052cdd10ffb63052c9910d4496bb Mon Sep 17 00:00:00 2001 From: danielratiu Date: Wed, 6 Jan 2016 00:29:21 +0100 Subject: [PATCH 18/49] improvements in language testing --- .../languageModels/behavior.mps | 61 + .../languageModels/editor.mps | 95 +- .../languageModels/structure.mps | 61 + .../com/mbeddr/mpsutil/lantest/rt/gen.mps | 1184 ++++++++++------- .../com/mbeddr/mpsutil/lantest/rt/saver.mps | 4 +- 5 files changed, 911 insertions(+), 494 deletions(-) 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 7bd749d6666..40bd2f5410b 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,7 @@ + @@ -57,12 +58,14 @@ + + @@ -261,6 +264,7 @@ + @@ -359,6 +363,7 @@ + @@ -375,6 +380,7 @@ + @@ -469,5 +475,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 a057bb9eec0..64e86840943 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 @@ + + + + + + + @@ -145,19 +152,48 @@ + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + @@ -206,6 +242,7 @@ + @@ -249,5 +286,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 97b4cd7a49f..e941e2088c2 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 @@ -11,6 +11,13 @@ + + + + + + + @@ -42,6 +49,7 @@ + @@ -78,6 +86,12 @@ + + + + + + @@ -86,6 +100,10 @@ + + + + @@ -98,6 +116,7 @@ + @@ -127,11 +146,13 @@ + + @@ -181,5 +202,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 310fb996aea..fa4cff078b6 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 @@ -166,6 +166,7 @@ + @@ -376,10 +377,6 @@ - - - - @@ -1296,6 +1293,18 @@ + + + + + + + + + + + + @@ -1351,7 +1360,9 @@ - + + + @@ -1574,6 +1585,24 @@ + + + + + + + + + + + + + + + + + + @@ -1642,6 +1671,9 @@ + + + @@ -1699,7 +1731,9 @@ - + + + @@ -1707,6 +1741,25 @@ + + + + + + + + + + + + + + + + + + + @@ -1835,117 +1888,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -2144,6 +2091,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -2213,117 +2180,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -2403,6 +2264,166 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2434,11 +2455,8 @@ - - - - - + + @@ -2449,11 +2467,8 @@ - - - - - + + @@ -2532,7 +2547,7 @@ - + @@ -2542,8 +2557,8 @@ - - + + @@ -2601,27 +2616,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -2840,6 +2834,15 @@ + + + + + + + + + @@ -2853,17 +2856,19 @@ - - - + + + - - - - + + + - - + + + + + @@ -2933,6 +2938,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2945,7 +2998,71 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2958,24 +3075,26 @@ - - - - - - - - + + + + + + + - - - + + + + - - - - - + + + + + + + @@ -3023,13 +3142,6 @@ - - - - - - - @@ -5431,13 +5543,25 @@ + + + + + + + + + + + + - + @@ -5450,7 +5574,7 @@ - + @@ -5486,16 +5610,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -5512,268 +5662,341 @@ + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - + + + - + + - - - + + + - + - - - + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - + - - + + - + - - - - + + + + - + - + - - + + - - - - + + + - + + - - - - + + + + - + - + - - - + + - + + - - - - - + + + + + - + - + - + - - - + + + - - + - - + + + - - - + + + - + - - - + + + - - - + + + - + - + - + - - + + - - - - - - + + + + + + - - - + + + - - + + - - + + - + - + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - + - - + + - - - - - + + + + - + + - + - - - - - + + + + + - - + + - - + + - - + + @@ -5781,26 +6004,27 @@ - - + - - + + + - + - - - + + + - + + - + @@ -6048,23 +6272,6 @@ - - - - - - - - - - - - - - - - - @@ -6073,23 +6280,31 @@ - - - + + + + + + + + + + + - - - + + + @@ -6119,23 +6334,6 @@ - - - - - - - - - - - - - - - - - @@ -6144,9 +6342,6 @@ - - - @@ -6183,6 +6378,17 @@ + + + + + + + + + + + @@ -6190,17 +6396,17 @@ - + - - - - + + + + @@ -6217,7 +6423,7 @@ - + @@ -6607,17 +6813,17 @@ - + - - - - + + + + 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 @@ - + From ca2d4b0190985d57a775e72b0c73d4a6dc6aaeb3 Mon Sep 17 00:00:00 2001 From: danielratiu Date: Wed, 6 Jan 2016 00:30:31 +0100 Subject: [PATCH 19/49] improvements in language testing --- .../com/mbeddr/core/lantest/utils.mps | 35 ++++++++++++++++--- 1 file changed, 31 insertions(+), 4 deletions(-) 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 @@ - + From 20a08f0f2ac26457654a4edcf5aa681d46c51116 Mon Sep 17 00:00:00 2001 From: danielratiu Date: Wed, 6 Jan 2016 00:54:04 +0100 Subject: [PATCH 20/49] clean-up --- .../com.mbeddr.mpsutil.lantest.mpl | 10 ++++ .../languageModels/behavior.mps | 60 +++++++++++++++++++ .../languageModels/constraints.mps | 18 ------ .../languageModels/editor.mps | 24 +++----- .../languageModels/structure.mps | 12 ++-- .../com/mbeddr/mpsutil/lantest/rt/gen.mps | 17 +++--- 6 files changed, 93 insertions(+), 48 deletions(-) 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 1fd5f091755..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 @@ -52,6 +52,9 @@ 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) @@ -84,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 40bd2f5410b..43df4f8d8d2 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 @@ -14,6 +14,10 @@ + + + + @@ -36,6 +40,7 @@ + @@ -52,6 +57,9 @@ + + + @@ -232,6 +240,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 1731610403c..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 @@ -14,9 +14,6 @@ - - - @@ -110,21 +107,6 @@ - - - - - - - - - - - - - - - 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 64e86840943..a0f5f41a72e 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 @@ -107,24 +107,18 @@ - - + + - - - - - - - - - - - - + + + + + + - + 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 e941e2088c2..31e1e49db21 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,6 +6,7 @@ + @@ -92,6 +93,12 @@ + + + + + + @@ -104,11 +111,6 @@ - - - - - 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 fa4cff078b6..684591cd6fc 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 @@ -1381,10 +1381,10 @@ - + - + @@ -1532,14 +1532,14 @@ - - + + - + @@ -3088,11 +3088,8 @@ - - - - - + + From 4c45ed281e06753f88dca66d38a3801c9aa7671d Mon Sep 17 00:00:00 2001 From: danielratiu Date: Thu, 7 Jan 2016 09:11:00 +0100 Subject: [PATCH 21/49] clean-up --- .../com/mbeddr/mpsutil/lantest/rt/gen.mps | 1724 +++++++++-------- 1 file changed, 886 insertions(+), 838 deletions(-) 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 684591cd6fc..127718a4119 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 @@ -80,11 +80,6 @@ - - - - - @@ -463,284 +458,244 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + - - - - - - + + + + + + - - - + + + + + + - - - - - + + + + + + - - - + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - + + + + + + - - - - - - - + + + + + + + + - - - - - - - + + + + + + - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - - - + + + - - - - - - - - + + + - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - + + + + - - - - - - - - + + - - - - + + + + + + + + + + - @@ -2490,125 +2445,228 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + - - + + + - - - - - - - - - - - - + + + + + + - - - + + + - - - - - - - - - - - - - + + - - - - - - + + + + + + - - - - + + + @@ -2616,644 +2674,618 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - + + + - - - - + + + + + + - - + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + + - - - - + + + + + + + + + + + - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + - - - - + + + + + + + + - - - - - - - - - - + + + + + + + + + + + - - + + - - - + + + + + + - - - - - - + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - + + + + - + - - + + - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - + + + - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - + + + + + + + + + - - - - + + + + + + + + + + + - - - - - - + + + + + - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - + + + + - - + + + + + + + @@ -5288,19 +5320,35 @@ - - - - + + + + + + + + + - - + + + + - - - - + + + + + + + + + + + + + From 51c431ee210472efa20e5f6a4eea036f29dbc606 Mon Sep 17 00:00:00 2001 From: danielratiu Date: Thu, 7 Jan 2016 11:18:45 +0100 Subject: [PATCH 22/49] saving models whose checking caused exceptions in the type-system --- .../languageModels/editor.mps | 13 +- .../languageModels/structure.mps | 4 + .../com/mbeddr/mpsutil/lantest/rt/gen.mps | 547 ++++++++++++++---- 3 files changed, 451 insertions(+), 113 deletions(-) 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 a0f5f41a72e..86885bdcae3 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 @@ -325,8 +325,17 @@ - - + + + + + + + + + + + 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 31e1e49db21..f20b7d0cd45 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 @@ -237,6 +237,10 @@ + + + + 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 127718a4119..92d173ba56f 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 @@ -49,6 +49,11 @@ + + + + + @@ -122,7 +127,10 @@ - + + + + @@ -261,6 +269,9 @@ + + + @@ -269,6 +280,7 @@ + @@ -458,6 +470,13 @@ + + + + + + + @@ -1714,7 +1733,6 @@ - @@ -2860,20 +2878,6 @@ - - - - - - - - - - - - - - @@ -2887,21 +2891,7 @@ - - - - - - - - - - - - - - - + @@ -3161,18 +3151,28 @@ - - - - - + + + + + + + + + + + + + + + - - - - - + + + + + @@ -3195,102 +3195,120 @@ - - - - - + + + + - - - - - + + - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - + + + + + + + + + - - - - - + + + + - - + + + + + - - - - + + + + + + + + + - - - - - - - + + + + + + + + + + + @@ -7693,5 +7711,312 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 0afd6348f427f97a219935514529743e13bbad95 Mon Sep 17 00:00:00 2001 From: danielratiu Date: Thu, 7 Jan 2016 11:31:54 +0100 Subject: [PATCH 23/49] added new runtime exception --- .../testdata/_language_testing_paper.mps | 400 ++++++++++++++++++ 1 file changed, 400 insertions(+) create mode 100644 code/languages/com.mbeddr.analyses/solutions/com.mbeddr.lantest.testdata/models/com/mbeddr/lantest/testdata/_language_testing_paper.mps 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 481445b223654a5bee4ca443a7d0c78072460efa Mon Sep 17 00:00:00 2001 From: Kolja Dummann Date: Thu, 7 Jan 2016 16:32:26 +0100 Subject: [PATCH 24/49] new RX download link --- download.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/download.xml b/download.xml index 02eed9d23aa..9f67f984df1 100644 --- a/download.xml +++ b/download.xml @@ -1,7 +1,6 @@ - - + From 4743908c54661cf5605c4f46458b9ffae7db1e95 Mon Sep 17 00:00:00 2001 From: Kolja Dummann Date: Thu, 7 Jan 2016 16:20:56 +0100 Subject: [PATCH 25/49] don't use posix stuff on windows --- .../generator/template/main@generator.mps | 396 ++++++++++++++++- .../com/mbeddr/core/unittest/messages.mps | 409 +++++++++++++++++- 2 files changed, 770 insertions(+), 35 deletions(-) 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..d092a034190 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,22 @@ + - + + + + @@ -73,6 +77,7 @@ + @@ -94,6 +99,7 @@ + @@ -130,6 +136,11 @@ + + + + + @@ -443,6 +454,7 @@ + @@ -981,7 +993,7 @@ - + @@ -3880,7 +3892,7 @@ - + @@ -4098,6 +4110,238 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4816,6 +5060,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4861,6 +5136,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4969,25 +5311,29 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4995,6 +5341,11 @@ + + + + + @@ -5131,7 +5482,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..cf9ef3dab43 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 @@ -445,18 +445,21 @@ + + + @@ -2272,6 +2275,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -2798,29 +2822,390 @@ - - + + - - + + - - + + - + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + - - + + + + + + + + From 6578530decdb1147170e2b1c9fa146c4c1168284 Mon Sep 17 00:00:00 2001 From: Kolja Dummann Date: Thu, 7 Jan 2016 17:37:05 +0100 Subject: [PATCH 26/49] core: removed deprecated generator for unit tests and fix #1265 --- .../generator/template/main@generator.mps | 362 ------------------ 1 file changed, 362 deletions(-) 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 d092a034190..726c5bb05a3 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 @@ -44,7 +44,6 @@ - @@ -601,96 +600,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -718,277 +627,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From c03a90ac8fc8dfcde4b8686f67fbbd17c61a5787 Mon Sep 17 00:00:00 2001 From: Kolja Dummann Date: Fri, 8 Jan 2016 10:22:13 +0100 Subject: [PATCH 27/49] Revert "deleted int2bool and bool2int" This reverts commit bbdca12f5fffe11c99632d000d1563e927904d7b. --- .../languageModels/behavior.mps | 53 +++++++- .../languageModels/dataFlow.mps | 16 +++ .../languageModels/editor.mps | 34 ++++++ .../languageModels/structure.mps | 14 +++ .../languageModels/textGen.mps | 22 +++- .../languageModels/typesystem.mps | 114 +++++++++++++----- .../test/ex/core/lib/expressions.mps | 51 +++----- .../test.ts.core/models/tests1@tests.mps | 28 ++--- 8 files changed, 248 insertions(+), 84 deletions(-) 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 928ad7f5915..1899aaf3132 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 @@ -194,7 +194,7 @@ - + @@ -21970,5 +21970,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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..4ef9bd05296 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 @@ -559,5 +559,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..0ed7c955685 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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..babff401cee 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 @@ -435,6 +435,20 @@ + + + + + + + + + + + + + + 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..31a48ccdaf0 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 @@ - + @@ -1218,5 +1218,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..c3945051ec8 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 @@ - + @@ -9569,9 +9569,6 @@ - - - @@ -9582,6 +9579,9 @@ + + + @@ -13249,6 +13249,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -13307,39 +13342,52 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + - - - - - + + + + + + - - - + + + 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..8600f1ccd40 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 @@ - - - - - + + + + + @@ -241,6 +241,9 @@ + + + @@ -263,10 +266,6 @@ - - - - @@ -842,16 +841,12 @@ - - - + + - - - - + @@ -867,14 +862,10 @@ - - + + - - - - @@ -894,14 +885,10 @@ - - + + - - - - @@ -914,14 +901,10 @@ - - + + - - - - 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 @@ - + From 7b9dadac91db3d3a8bb8deb69196e350ad7a4f0d Mon Sep 17 00:00:00 2001 From: Kolja Dummann Date: Fri, 8 Jan 2016 10:30:45 +0100 Subject: [PATCH 28/49] Revert "removed casts for int2bool and bool2int" This reverts commit 7ea73b1a054d3b61f400e8041c23c49971fc6341. --- .../languageModels/behavior.mps | 104 ++++++++++++------ .../languageModels/dataFlow.mps | 34 ++++-- .../languageModels/editor.mps | 34 ++++++ .../languageModels/structure.mps | 14 +++ .../languageModels/textGen.mps | 38 +++++-- .../languageModels/typesystem.mps | 102 ++++++++++++----- 6 files changed, 247 insertions(+), 79 deletions(-) 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 1899aaf3132..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 @@ -16976,6 +16976,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -21970,43 +22021,30 @@ - + - - - - - - - - - - - - - - - + + - - - - + + + + - - - + + + - - - - - + + + + + - + @@ -22014,11 +22052,11 @@ - - + + - - + + 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 4ef9bd05296..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,16 +575,16 @@ - + - - - - - - - - + + + + + + + + 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 0ed7c955685..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 @@ -2127,6 +2127,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 babff401cee..634d3777213 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 @@ -1226,6 +1226,20 @@ + + + + + + + + + + + + + + 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 31a48ccdaf0..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 @@ -509,6 +509,24 @@ + + + + + + + + + + + + + + + + + + @@ -1218,17 +1236,17 @@ - + - - - - - - - - - + + + + + + + + + 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 c3945051ec8..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 @@ -2425,6 +2425,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -13342,52 +13390,52 @@ - - + + - - - - - - + + + + + + - - - - + + + + - + - - - - - + + + + + - - + + - - - - + + + + - - - + + + From 881e12e2ef8822737a4e5cb2bb381ebf3c1d5dca Mon Sep 17 00:00:00 2001 From: Kolja Dummann Date: Fri, 8 Jan 2016 10:37:43 +0100 Subject: [PATCH 29/49] core: add migration bool2int and int2bool --- .../com.mbeddr.build/.mps/libraries.xml | 2 +- .../models/com/mbeddr/build/build.mps | 6 + .../PlatformTemplates/module.msd | 2 +- .../__spreferences/TypeSizeConfiguration.mps | 2 +- .../TypeSizeConfiguration/module.msd | 2 +- .../com.mbeddr.core.arrays/arrays.mpl | 2 +- .../generator/template/main@generator.mps | 2 +- .../buildconfig.mpl | 2 +- .../com.mbeddr.core.embedded/embedded.mpl | 2 +- .../generator/template/main@generator.mps | 2 +- .../expressions.mpl | 5 +- .../generator/template/main@generator.mps | 2 +- .../languageModels/migration.mps | 205 +++++++++++++++++- .../languageModels/structure.mps | 15 ++ .../languages/com.mbeddr.core.make/make.mpl | 2 +- .../com.mbeddr.core.modules.gen/gen.mpl | 2 +- .../template/addReturnToClosure@generator.mps | 2 +- .../generator/template/main@generator.mps | 2 +- .../com.mbeddr.core.modules/modules.mpl | 2 +- .../generator/template/main@generator.mps | 2 +- .../languageModels/intentions.mps | 2 +- .../languages/com.mbeddr.core.udt/udt.mpl | 4 +- .../generator/template/main@generator.mps | 2 +- .../com.mbeddr.core.unittest/unittest.mpl | 4 +- .../generator/template/main@generator.mps | 4 +- .../languageModels/typesystem.mps | 2 +- .../languages/com.mbeddr.core.util/util.mpl | 4 +- .../com.mbeddr.core.stdlib.msd | 2 +- .../models/com/mbeddr/core/posix.mps | 2 +- .../models/com/mbeddr/core/stdlib.mps | 2 +- .../models/com/mbeddr/core/sys.mps | 2 +- .../tests/aLibrary/aLibrary.msd | 2 +- .../models/test/editor/core/actions@tests.mps | 2 +- .../test.editor.core/test.editor.core.msd | 2 +- .../tests/test.ex.core/core.msd | 2 +- .../test/ex/core/lib/expressions.mps | 29 ++- .../test.ex.errorreporting/errorreporting.msd | 2 +- .../models/bitwise_operators@tests.mps | 2 +- .../ts/core/checks/zero_literals@tests.mps | 2 +- .../test.ts.core.checks.msd | 2 +- .../tests/test.ts.core.dataflow/dataflow.msd | 2 +- .../test.ts.core.extended.msd | 2 +- .../test/ts/core/performance/tests@tests.mps | 2 +- .../test.ts.core.performance.msd | 2 +- .../tests/test.ts.core/core.msd | 2 +- 45 files changed, 289 insertions(+), 59 deletions(-) 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 index e6151828b0a..f6395aa9960 100755 --- 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 @@ + + + + + + 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.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/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 634d3777213..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 @@ + @@ -448,6 +449,13 @@ + + + + + + + @@ -1239,6 +1247,13 @@ + + + + + + + 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/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/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..7200438cbe9 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 @@ -16,9 +16,9 @@ - + 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 519e0532154..c75dc453a12 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 @@ -8,8 +8,8 @@ - + 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 4a7d5bba6a9..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 @@ + 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 8600f1ccd40..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 @@ -8,9 +8,9 @@ - + @@ -241,9 +241,6 @@ - - - @@ -266,6 +263,10 @@ + + + + @@ -841,8 +842,9 @@ - - + + + @@ -862,8 +864,9 @@ - - + + + @@ -885,8 +888,9 @@ - - + + + @@ -901,8 +905,9 @@ - - + + + 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 @@ - + From 49cf1f0c4a6d7b13245c1932992861061bd5649b Mon Sep 17 00:00:00 2001 From: danielratiu Date: Fri, 8 Jan 2016 12:33:24 +0100 Subject: [PATCH 30/49] improvements --- .../com/mbeddr/mpsutil/lantest/rt/gen.mps | 275 +++++++++++------- 1 file changed, 174 insertions(+), 101 deletions(-) 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 92d173ba56f..4cc5269473b 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 @@ -314,6 +314,7 @@ + @@ -1235,19 +1236,6 @@ - - - - - - - - - - - - - @@ -1328,30 +1316,19 @@ - + - + - - - + + - - + + - - - - - - - - - - @@ -1427,39 +1404,18 @@ - - - - - - - - + + + - - + + - - - - - - - - - - - - - - - - - - + + @@ -1628,36 +1584,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2403,6 +2329,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2415,8 +2402,8 @@ - - + + @@ -2440,8 +2427,8 @@ - - + + @@ -2452,8 +2439,8 @@ - - + + @@ -2642,6 +2629,22 @@ + + + + + + + + + + + + + + + + @@ -2693,8 +2696,13 @@ - - + + + + + + + @@ -2833,7 +2841,7 @@ - + @@ -3156,8 +3164,8 @@ - - + + @@ -3270,8 +3278,8 @@ - - + + @@ -5384,6 +5392,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 3a40e1802b9e5e57a86832998d39a70928454602 Mon Sep 17 00:00:00 2001 From: danielratiu Date: Fri, 8 Jan 2016 12:35:20 +0100 Subject: [PATCH 31/49] various improvements in lantest --- .../com.mbeddr.analyses.lantest.mpl | 3 - .../generator/template/main@generator.mps | 3 - .../languageModels/behavior.mps | 142 ++++++++- .../languageModels/editor.mps | 4 +- .../languageModels/structure.mps | 2 +- .../lantest/pluginSolution/generator.mps | 274 ++++++++---------- .../lantest/pluginSolution/plugin.mps | 59 +--- 7 files changed, 258 insertions(+), 229 deletions(-) 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 e2f5bc43410..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,8 +19,6 @@ fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) - - @@ -30,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/languageModels/behavior.mps b/code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.lantest/languageModels/behavior.mps index 71a8ee6e00a..ddcc8675ad7 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 @@ -21,9 +21,11 @@ + + @@ -58,20 +60,27 @@ + + + + + + + @@ -86,6 +95,8 @@ + + @@ -121,10 +132,14 @@ + + + + @@ -154,7 +169,7 @@ - + @@ -184,7 +199,12 @@ + + + + + @@ -234,7 +254,7 @@ - + @@ -245,23 +265,68 @@ - - - - - - - + + + + + + + + + + - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -517,5 +582,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 94091e17452..0bd6dca7add 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 @@ - + - + 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 993146a1a3b..aabfe4ad53e 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 @@ -49,7 +49,7 @@ - + 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 3196df483a5..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 @@ -48,7 +48,6 @@ - @@ -57,6 +56,10 @@ + + + + @@ -251,7 +254,6 @@ - @@ -306,9 +308,6 @@ - - - @@ -316,7 +315,6 @@ - @@ -328,12 +326,10 @@ - - + - @@ -1570,27 +1566,19 @@ - - - - - - - - - - - - - - - + + + + + + + @@ -1604,53 +1592,20 @@ - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - @@ -1747,9 +1702,18 @@ + + + + + + + + + - + @@ -1763,6 +1727,21 @@ + + + + + + + + + + + + + + + @@ -1791,15 +1770,13 @@ - - - - + + + + - - - - + + @@ -1819,17 +1796,11 @@ - + - - - - - - - - + + @@ -1893,6 +1864,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1943,82 +1960,23 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - + + + + 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 4a610744189..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 @@ -166,7 +166,6 @@ - @@ -217,7 +216,6 @@ - @@ -232,9 +230,6 @@ - - - @@ -248,7 +243,6 @@ - @@ -356,19 +350,16 @@ - - - - - - - - - - + + + + + - + + + @@ -656,38 +647,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + From 543958a13a9a9cdf1407568533bcc9d708015d3f Mon Sep 17 00:00:00 2001 From: Kolja Dummann Date: Fri, 8 Jan 2016 12:41:46 +0100 Subject: [PATCH 32/49] core: fix bug in local variable handling for c90 compatible code --- .../generator/template/main@generator.mps | 142 +++++++++++++++++- 1 file changed, 141 insertions(+), 1 deletion(-) 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 0c73e32bfb4bd58274623905c7c15e75f465ae8e Mon Sep 17 00:00:00 2001 From: Kolja Dummann Date: Fri, 8 Jan 2016 12:46:22 +0100 Subject: [PATCH 33/49] core: limit the number of tests per binary to 256. This is done to prevent problems with c90 compilers. If this becomes a limitation in real world programs we can lift that limit. --- .../generator/template/main@generator.mps | 130 ++++++++++++++++++ .../com/mbeddr/core/unittest/messages.mps | 3 + .../languageModels/typesystem.mps | 41 ++++++ 3 files changed, 174 insertions(+) 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 7200438cbe9..5a6f6bad446 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 @@ -4426,18 +4426,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4466,12 +4505,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4498,6 +4563,19 @@ + + + + + + + + + + + + + @@ -4525,6 +4603,19 @@ + + + + + + + + + + + + + @@ -4547,6 +4638,19 @@ + + + + + + + + + + + + + @@ -4566,6 +4670,19 @@ + + + + + + + + + + + + + @@ -4605,6 +4722,19 @@ + + + + + + + + + + + + + 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..1c79ff55e00 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 @@ -559,6 +559,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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 245d8f5ff848e97330978f8fc773d8daad969264 Mon Sep 17 00:00:00 2001 From: danielratiu Date: Fri, 8 Jan 2016 12:55:46 +0100 Subject: [PATCH 34/49] tests are fixed --- .../models/test/analyses/cbmc/ppc@tests.mps | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 @@ - + From f19d2b53a5f50b9bf1f18a5198cd0c26609fe2f0 Mon Sep 17 00:00:00 2001 From: "kolja.dummann" Date: Fri, 8 Jan 2016 15:20:39 +0100 Subject: [PATCH 35/49] TeamCity change in 'mbeddr' project: project parameters were changed --- .teamcity/Mbeddr2_Mbeddr/project-config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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]]> - + From 723d4752cd332e3e6ebf79b00d32014c03ca18b7 Mon Sep 17 00:00:00 2001 From: "kolja.dummann" Date: Fri, 8 Jan 2016 15:46:02 +0100 Subject: [PATCH 36/49] TeamCity change in 'mbeddr :: Package' project: triggers of 'Trigger Packageing' build configuration were updated --- .../buildTypes/Mbeddr2_Mbeddr_Package_TriggerPackageing.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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]]> - From dd35a38c11ddbc665eba469034750544bff2e5bc Mon Sep 17 00:00:00 2001 From: danielratiu Date: Fri, 8 Jan 2016 22:12:57 +0100 Subject: [PATCH 37/49] performed migrations --- .../com.mbeddr.analyses.acsl.assertions.gen.mpl | 10 ++++------ .../generator/template/main@generator.mps | 4 ++-- .../models/editor.mps | 2 +- .../com.mbeddr.analyses.acsl.cbmc.gen.mpl | 6 ++++-- .../generator/template/main@generator.mps | 4 ++-- .../com.mbeddr.analyses.acsl.mpl | 7 +------ .../generator/template/main@generator.mps | 2 +- .../com.mbeddr.analyses.cbmc.concurrency.mpl | 2 +- .../generator/template/main@generator.mps | 2 +- .../com.mbeddr.analyses.cbmc.core.mpl | 2 +- .../generator/template/dead_code@generator.mps | 4 ++-- .../generator/template/main@generator.mps | 2 +- ...mbeddr.analyses.cbmc.statemachines.experimental.mpl | 2 +- .../generator/template/main@generator.mps | 2 +- .../com.mbeddr.analyses.cbmc.statemachines.mpl | 2 +- .../generator/template/main@generator.mps | 2 +- .../com.mbeddr.analyses.cbmc.testsgen.mpl | 2 +- .../com.mbeddr.analyses.cbmc.verification_case.mpl | 2 +- .../generator/template/main@generator.mps | 8 ++++---- .../languages/com.mbeddr.analyses.cbmc/cbmc.mpl | 4 ++-- .../generator/template/nondet@generator.mps | 2 +- .../generator/template/stubbing@generator.mps | 2 +- .../languageModels/typesystem.mps | 4 ++-- .../models/acsl_to_asserts.mps | 2 +- .../test.analyses.acsl.testcode.msd | 2 +- .../test.analyses.acsl.ts/test.analyses.acsl.ts.msd | 5 +---- .../test.analyses.base.testcode.msd | 2 +- .../models/advanced_verification_condition.mps | 2 +- .../test.analyses.cbmc.testcode/models/assertion.mps | 2 +- .../models/cbmc_arguments.mps | 2 +- .../test.analyses.cbmc.testcode/models/cbmc_error.mps | 2 +- .../models/comparison_with_other_tools.mps | 2 +- .../test.analyses.cbmc.testcode/models/dead_code.mps | 2 +- .../test.analyses.cbmc.testcode/models/expressions.mps | 2 +- .../models/external_c_files.mps | 2 +- .../test.analyses.cbmc.testcode/models/harness.mps | 2 +- .../models/loops_unwinding.mps | 2 +- .../models/partial_loops.mps | 2 +- .../tests/test.analyses.cbmc.testcode/models/ppc.mps | 2 +- .../models/protocol_extended_component.mps | 2 +- .../models/protocol_smoke.mps | 2 +- .../models/protocol_unwinding_loops.mps | 2 +- .../test.analyses.cbmc.testcode/models/robustness.mps | 2 +- .../models/statemachines.mps | 2 +- .../models/statemachines_complex.mps | 2 +- .../models/verification_config.mps | 2 +- .../tests/test.analyses.cbmc.testcode/testcode.msd | 2 +- .../testcode_analyses_config.msd | 2 +- .../test.analyses.cbmc.testsgen.testcode.msd | 2 +- .../test.analyses.cbmc.ts/test.analyses.cbmc.ts.msd | 2 +- .../stan/ts/z3_expressions_translator@tests.mps | 2 +- .../test.analyses.stan.ts/test.analyses.stan.ts.msd | 2 +- .../models/test/analyses/var/testcode/cm.mps | 2 +- .../models/test/analyses/var/testcode/fm.mps | 2 +- .../models/test/analyses/var/testcode/var_c.mps | 2 +- .../test.analyses.var.testcode.msd | 2 +- .../tests/test.analysis.formsera/formsera.msd | 2 +- .../tests/test.analysis.formsera/models/contracts.mps | 2 +- .../tests/test.analysis.formsera/models/dec_tab.mps | 2 +- .../tests/test.analysis.formsera/models/protocol.mps | 2 +- .../test.analysis.nfm/models/function_verification.mps | 2 +- .../test.analysis.nfm/models/simple_contracts.mps | 2 +- .../tests/test.analysis.nfm/nfm.msd | 2 +- 63 files changed, 77 insertions(+), 85 deletions(-) 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/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/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.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.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 @@ - + From b49d88011144c9192616986107d8ea3d718af1e3 Mon Sep 17 00:00:00 2001 From: danielratiu Date: Sat, 9 Jan 2016 23:40:48 +0100 Subject: [PATCH 38/49] improvements in language testing --- .../languageModels/behavior.mps | 224 +++++++++++++++++- .../languageModels/editor.mps | 12 + .../languageModels/structure.mps | 11 + .../languageModels/behavior.mps | 52 ++++ .../languageModels/editor.mps | 13 + .../languageModels/structure.mps | 6 + .../com/mbeddr/mpsutil/lantest/rt/gen.mps | 222 +++++++++++------ 7 files changed, 462 insertions(+), 78 deletions(-) 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 ddcc8675ad7..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 @@ -21,6 +21,8 @@ + + @@ -50,6 +52,9 @@ + + + @@ -169,6 +174,7 @@ + @@ -176,6 +182,9 @@ + + + @@ -186,6 +195,9 @@ + + + @@ -202,11 +214,23 @@ + + + + + + + + + + + + @@ -291,13 +315,41 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -633,5 +685,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 0bd6dca7add..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 @@ -55,5 +55,17 @@ + + + + + + + + + + + + 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 aabfe4ad53e..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 @@ -68,5 +68,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 43df4f8d8d2..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 @@ -292,6 +292,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 86885bdcae3..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 @@ -120,6 +120,19 @@ + + + + + + + + + + + + + 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 f20b7d0cd45..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 @@ -99,6 +99,12 @@ + + + + + + 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 4cc5269473b..9af53476bb5 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 @@ -54,7 +54,7 @@ - + @@ -1341,6 +1341,18 @@ + + + + + + + + + + + + @@ -1474,6 +1486,24 @@ + + + + + + + + + + + + + + + + + + @@ -2329,36 +2359,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2375,8 +2375,8 @@ - - + + @@ -2389,7 +2389,6 @@ - @@ -2399,17 +2398,47 @@ - - - - - + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + @@ -2426,21 +2455,16 @@ - - - - - - - + + - - + + @@ -3164,8 +3188,8 @@ - - + + @@ -3216,7 +3240,7 @@ - + @@ -3277,13 +3301,8 @@ - - - - - - - + + @@ -7280,22 +7299,81 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 0657cacc909cf3a682f6bf1553007ec59cd9a6c6 Mon Sep 17 00:00:00 2001 From: danielratiu Date: Sun, 10 Jan 2016 00:16:44 +0100 Subject: [PATCH 39/49] small improvements --- .../com/mbeddr/mpsutil/lantest/rt/gen.mps | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) 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 9af53476bb5..26fc5f72452 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 @@ -2491,6 +2491,14 @@ + + + + + + + + @@ -7967,20 +7975,6 @@ - - - - - - - - - - - - - - From aee04ac78ba5f3387e52eb2a36b1be88588395c9 Mon Sep 17 00:00:00 2001 From: danielratiu Date: Sun, 10 Jan 2016 23:38:48 +0100 Subject: [PATCH 40/49] improvements --- .../com/mbeddr/mpsutil/lantest/rt/gen.mps | 256 ++++++++++++++---- 1 file changed, 201 insertions(+), 55 deletions(-) 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 26fc5f72452..27afb3415a6 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 @@ -535,6 +535,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -557,6 +578,16 @@ + + + + + + + + + + @@ -569,11 +600,21 @@ - + + + + + + + + + + + @@ -586,11 +627,21 @@ - + + + + + + + + + + + @@ -603,11 +654,21 @@ - + + + + + + + + + + + @@ -620,12 +681,22 @@ - + + + + + + + + + + + @@ -643,7 +714,7 @@ - + @@ -657,6 +728,16 @@ + + + + + + + + + + @@ -673,7 +754,7 @@ - + @@ -703,19 +784,11 @@ - - - - - - - - - - - + + + @@ -6038,6 +6111,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6429,9 +6608,6 @@ - - - @@ -6491,9 +6667,6 @@ - - - @@ -6966,9 +7139,6 @@ - - - @@ -7163,10 +7333,6 @@ - - - - @@ -7409,20 +7575,6 @@ - - - - - - - - - - - - - - @@ -7513,10 +7665,6 @@ - - - - @@ -7532,21 +7680,19 @@ + - + - + - + - + - - - From 62f6c08e38d71fe6a8960d76e71b84a3406a5aa6 Mon Sep 17 00:00:00 2001 From: danielratiu Date: Sun, 10 Jan 2016 23:53:14 +0100 Subject: [PATCH 41/49] small improvement --- .../com/mbeddr/mpsutil/lantest/rt/gen.mps | 82 +++++++++++-------- 1 file changed, 48 insertions(+), 34 deletions(-) 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 27afb3415a6..22d16d54659 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 @@ -6120,7 +6120,12 @@ - + + + + + + @@ -6170,49 +6175,58 @@ - - - - - - - - - - - - - - + + + + + + - - - - - - - + + + + + + + + - - - - - + + + + + + + + + + + + + - - + + + + + + + + + + + + + - - + + - - - From da74a46650abc8a00b7fa95bda71baf5072519d1 Mon Sep 17 00:00:00 2001 From: Kolja Dummann Date: Mon, 11 Jan 2016 11:32:15 +0100 Subject: [PATCH 42/49] core: add fileno to stdlib --- .../models/com/mbeddr/core/stdlib.mps | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) 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 519e0532154..32cce02e7e1 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 @@ -1795,6 +1795,26 @@ + + + + + + + + + + + + + + + + + + + + From 3313711f4a88b61699a4f84f9b1f1782c52a7f31 Mon Sep 17 00:00:00 2001 From: Kolja Dummann Date: Mon, 11 Jan 2016 11:32:34 +0100 Subject: [PATCH 43/49] core: fix output redirection bug when tests where run on windows --- .../com/mbeddr/core/unittest/messages.mps | 81 ++++++++++++++++++- 1 file changed, 78 insertions(+), 3 deletions(-) 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 cf9ef3dab43..d6606ad3c93 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 @@ + @@ -2284,15 +2285,13 @@ - - - + @@ -2951,6 +2950,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3019,6 +3050,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 5d9f0f911394216456e042d8c4d9a7ca26388b53 Mon Sep 17 00:00:00 2001 From: danielratiu Date: Mon, 11 Jan 2016 13:02:26 +0100 Subject: [PATCH 44/49] aggressively prune non-valid models --- .../com/mbeddr/mpsutil/lantest/rt/gen.mps | 784 ++++++++++-------- 1 file changed, 459 insertions(+), 325 deletions(-) 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 22d16d54659..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 @@ -66,6 +66,7 @@ + @@ -3558,7 +3559,7 @@ - + @@ -4554,7 +4555,7 @@ - + @@ -4751,7 +4752,7 @@ - + @@ -4976,7 +4977,7 @@ - + @@ -5333,7 +5334,7 @@ - + @@ -5960,7 +5961,7 @@ - + @@ -6111,201 +6112,103 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - + + - - - - - + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - + + + + + + - - - - - - - - - - + + - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + - - + + + + @@ -6339,20 +6242,187 @@ - - - - - + + + + + + - - + + + + - - + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6371,10 +6441,19 @@ + + + + + + + + + - + @@ -6382,7 +6461,7 @@ - + @@ -6404,6 +6483,22 @@ + + + + + + + + + + + + + + + + @@ -6593,7 +6688,11 @@ - + + + + + @@ -6612,7 +6711,7 @@ - + @@ -6622,6 +6721,12 @@ + + + + + + @@ -6650,8 +6755,23 @@ + + + + + + + + + + + + + + + - + @@ -6671,7 +6791,7 @@ - + @@ -6681,6 +6801,12 @@ + + + + + + @@ -6742,28 +6868,17 @@ - - - - - - - - - - - - - - - - + + + + + - - - + + + @@ -6771,22 +6886,27 @@ + + + + + - + - + - + @@ -6802,6 +6922,13 @@ + + + + + + + @@ -6810,7 +6937,7 @@ - + @@ -6876,7 +7003,7 @@ - + @@ -6900,11 +7027,9 @@ - - - - - + + + @@ -6921,24 +7046,37 @@ + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + + + + @@ -6967,7 +7105,7 @@ - + @@ -6995,7 +7133,6 @@ - @@ -7138,11 +7275,9 @@ - - - - - + + + @@ -7153,27 +7288,20 @@ + + + + + + + + + - - - - - - - - - - - - - - - - @@ -7189,8 +7317,8 @@ - - + + @@ -7204,8 +7332,8 @@ - - + + @@ -7255,8 +7383,8 @@ - - + + @@ -7271,9 +7399,17 @@ + + + + + + + + - + @@ -7347,6 +7483,14 @@ + + + + + + + + @@ -7591,9 +7735,50 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7657,62 +7842,11 @@ - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + From def754b0105bf4233078aadd8dcbe2338ead3975 Mon Sep 17 00:00:00 2001 From: Kolja Dummann Date: Mon, 11 Jan 2016 14:22:59 +0100 Subject: [PATCH 45/49] core: workaround for NOOP until we have compiler specific generators --- .../languageModels/textGen.mps | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) 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 @@ - - - + + + + + + + + + + + + From 3f78206d0026547f1111b19fcf1ccf555afd30e6 Mon Sep 17 00:00:00 2001 From: Kolja Dummann Date: Mon, 21 Dec 2015 10:10:09 +0100 Subject: [PATCH 46/49] core: get correct path for packages modules The SolutionPathUtil would have returned a wrong path if the node it was working on was packaged in a compiled module. It now returns the root path in the jar in this case. --- .../languageModels/behavior.mps | 113 ++++++++++-------- 1 file changed, 63 insertions(+), 50 deletions(-) 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 ca0b85dba21..d9d92b917f6 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 @@ -6281,13 +6281,13 @@ - - + + - - + + @@ -6296,72 +6296,85 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - + + + + + + - - + + + + + + + + + + - - - - - + + + + + - + - + - - - + + + - + From 9011697f9a64cff8a4e87cef4a9a4a0446cb0af8 Mon Sep 17 00:00:00 2001 From: Kolja Dummann Date: Mon, 11 Jan 2016 19:15:08 +0100 Subject: [PATCH 47/49] core: make test helper annotation require unit test framework --- .../com.mbeddr.core.unittest/languageModels/structure.mps | 3 +++ 1 file changed, 3 insertions(+) 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 @@ + + + From 35f39ab9ab1e59b4db0d575c66b68e98bb709a00 Mon Sep 17 00:00:00 2001 From: danielratiu Date: Tue, 12 Jan 2016 08:28:43 +0100 Subject: [PATCH 48/49] substantial improvement of variability analyses modularization - plugin mechanism for checking variability use --- .../com.mbeddr.analyses.fm.base.mpl | 96 +++ .../generator/template/main@generator.mps | 26 + .../models/behavior.mps | 11 + .../models/constraints.mps | 11 + .../models/editor.mps | 11 + .../models/plugin.mps | 110 ++++ .../models/structure.mps | 11 + .../models/typesystem.mps | 11 + .../sat4j/fm/pluginSolution/plugin.mps | 104 ++-- .../com.mbeddr.analyses.sat4j.fm.msd | 4 + .../com/mbeddr/analyses/sat4j/fm/analyses.mps | 566 ++++++++++-------- .../com/mbeddr/analyses/sat4j/fm/model.mps | 189 ++++-- .../com/mbeddr/analyses/sat4j/fm/plugin.mps | 211 +++++++ .../com/mbeddr/analyses/sat4j/fm/testing.mps | 42 +- .../models/test/analyses/var/var_c@tests.mps | 8 +- 15 files changed, 1036 insertions(+), 375 deletions(-) create mode 100644 code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/com.mbeddr.analyses.fm.base.mpl create mode 100644 code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/generator/template/main@generator.mps create mode 100644 code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/models/behavior.mps create mode 100644 code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/models/constraints.mps create mode 100644 code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/models/editor.mps create mode 100644 code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/models/plugin.mps create mode 100644 code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/models/structure.mps create mode 100644 code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.fm.base/models/typesystem.mps create mode 100644 code/languages/com.mbeddr.analyses/solutions/com.mbeddr.analyses.sat4j.fm/models/com/mbeddr/analyses/sat4j/fm/plugin.mps 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/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..3d8d73d1741 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 @@ + + @@ -48,6 +51,7 @@ + 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/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 @@ - - + + From 9003d0a48d3306970880726bf529ddb346647c42 Mon Sep 17 00:00:00 2001 From: danielratiu Date: Tue, 12 Jan 2016 08:33:13 +0100 Subject: [PATCH 49/49] fixing the build --- .../models/com/mbeddr/build/build.mps | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) mode change 100755 => 100644 code/languages/com.mbeddr.build/solutions/com.mbeddr.build/models/com/mbeddr/build/build.mps 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 f6395aa9960..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 @@ -9931,6 +9931,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10014,6 +10043,12 @@ + + + + + +