diff --git a/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps b/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps index 95614351..dfd8eaad 100644 --- a/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps +++ b/logic/languages/jetbrains.mps.logic/generator/template/main@generator.mps @@ -101,7 +101,6 @@ - @@ -282,32 +281,93 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + @@ -969,27 +1029,6 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/logic/languages/jetbrains.mps.logic/languageModels/editor.mps b/logic/languages/jetbrains.mps.logic/languageModels/editor.mps index 26a5957a..30a32f08 100644 --- a/logic/languages/jetbrains.mps.logic/languageModels/editor.mps +++ b/logic/languages/jetbrains.mps.logic/languageModels/editor.mps @@ -2417,29 +2417,53 @@ - - - - - + + - - - - - - + + + + + + + + - - + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + @@ -2480,30 +2504,79 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + diff --git a/logic/languages/jetbrains.mps.logic/languageModels/structure.mps b/logic/languages/jetbrains.mps.logic/languageModels/structure.mps index b34f60f1..3c0f40d5 100644 --- a/logic/languages/jetbrains.mps.logic/languageModels/structure.mps +++ b/logic/languages/jetbrains.mps.logic/languageModels/structure.mps @@ -205,6 +205,7 @@ + @@ -403,6 +404,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/logic/languages/jetbrains.mps.logic/languageModels/typesystem.mps b/logic/languages/jetbrains.mps.logic/languageModels/typesystem.mps index 0ff8b2b0..7267fef9 100644 --- a/logic/languages/jetbrains.mps.logic/languageModels/typesystem.mps +++ b/logic/languages/jetbrains.mps.logic/languageModels/typesystem.mps @@ -952,32 +952,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps index daeee10b..caafc75c 100644 --- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps +++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin.mps @@ -20,6 +20,9 @@ + + + @@ -228,7 +231,22 @@ + + + + + + + + + + + + + + + @@ -1161,6 +1179,16 @@ + + + + + + + + + + @@ -1724,5 +1752,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/predicate.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/predicate.mps index 9000363c..982f9770 100644 --- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/predicate.mps +++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/predicate.mps @@ -1188,6 +1188,11 @@ + + + + + @@ -1382,6 +1387,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1499,5 +1534,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/program.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/program.mps index 2eaefc47..0ad77ff7 100644 --- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/program.mps +++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/program.mps @@ -140,6 +140,9 @@ + + + @@ -911,6 +914,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/solver.mps b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/solver.mps index d9a9fb6a..7e03eabb 100644 --- a/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/solver.mps +++ b/logic/languages/jetbrains.mps.logic/runtime/models/jetbrains/mps/logic/builtin/solver.mps @@ -108,6 +108,8 @@ + + @@ -4779,5 +4781,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +