From f3010743c1c88b1dd558644b5f9c3d74b56d5485 Mon Sep 17 00:00:00 2001 From: Fedor Isakov Date: Wed, 4 Oct 2023 13:04:08 +0200 Subject: [PATCH] Migration: FixExpandMacroTemplate --- .mps/migration.xml | 2 +- .../jetbrains.mps.lang.coderules.mpl | 2 +- .../languageModels/constraints.mps | 2 +- .../languageModels/findUsages.mps | 2 +- .../jetbrains.mps.lang.coderules.analysis.mps | 8 +- .../languageModels/migration.mps | 332 +++++++++++++++++- .../languageModels/structure.mps | 2 +- .../languageModels/util.mps | 6 +- .../jetbrains.mps.lang.coderules.eval.mps | 10 +- ...ns.mps.lang.coderules.program.analysis.mps | 8 +- .../jetbrains.mps.lang.coderules.program.mps | 8 +- .../jetbrains.mps.lang.coderules.terms.mps | 6 +- .../generator/template/main@generator.mps | 12 +- .../models/plugin.mps | 2 +- ...ps.lang.typechecking.generator.genutil.mps | 6 +- .../generator/template/main@generator.mps | 36 +- .../jetbrains.mps.lang.typechecking.mpl | 2 +- .../models/behavior.mps | 4 +- .../models/constraints.mps | 10 +- .../models/editor.mps | 12 +- ...etbrains.mps.lang.typechecking.actions.mps | 2 +- ...rains.mps.lang.typechecking.intentions.mps | 4 +- ...brains.mps.lang.typechecking.migration.mps | 6 +- .../models/plugin.mps | 2 +- .../models/structure.mps | 2 +- .../models/typesystem.mps | 6 +- ...ng.types.generator.templates@generator.mps | 12 +- .../generator/template/main@generator.mps | 8 +- .../languageModels/behavior.mps | 6 +- .../languageModels/constraints.mps | 8 +- .../languageModels/intentions.mps | 4 +- .../languageModels/migration.mps | 8 +- .../languageModels/structure.mps | 2 +- .../languageModels/typesystem.mps | 4 +- .../models/jetbrains.mps.logic.dataform.mps | 8 +- .../models/jetbrains.mps.logic.predicate.mps | 8 +- .../jetbrains.mps.logic.unification.mps | 8 +- .../jetbrains.mps.typechecking.annotation.mpl | 2 +- .../languageModels/editor.mps | 4 +- .../languageModels/intentions.mps | 6 +- ...ains.mps.typechecking.annotation.types.mps | 4 +- .../languageModels/structure.mps | 2 +- .../generator/template/main@generator.mps | 2 +- .../jetbrains.mps.typechecking.testlang.mpl | 2 +- .../models/behavior.mps | 4 +- .../models/constraints.mps | 2 +- .../models/editor.mps | 18 +- .../models/structure.mps | 2 +- .../models/types.mps | 8 +- .../jetbrains.mps.coderules.ideaplugin.mps | 10 +- ...tbrains.mps.coderules.runtime.memoizer.mps | 8 +- ...jetbrains.mps.coderules.runtime.result.mps | 8 +- .../jetbrains.mps.coderules.aspect@tests.mps | 8 +- .../jetbrains.mps.coderules.plugin@tests.mps | 6 +- .../models/modelcheck@tests.mps | 10 +- ...ains.mps.coderules.testhelper.testutil.mps | 10 +- ...brains.mps.coderules.typechecking.test.msd | 2 +- ...ins.mps.coderules.incrementality@tests.mps | 12 +- ...tbrains.mps.coderules.scheduling@tests.mps | 12 +- ...rains.mps.coderules.typechecking@tests.mps | 14 +- ...les.typechecking.testlang.sandbox.test.mps | 2 +- ...ins.mps.coderules.typechecking.service.mps | 10 +- .../models/plugin.mps | 14 +- .../jetbrains.mps.coderules/models/plugin.mps | 8 +- .../models/service.mps | 10 +- .../models/plugin.mps | 14 +- .../models/service.mps | 8 +- .../jetbrains.mps.lang.coderules.aspect.mps | 110 +++--- .../jetbrains.mps.lang.coderules.template.mps | 12 +- .../jetbrains.mps.lang.controlflow.aspect.mps | 6 +- ....lang.descriptor.aspects.types@genplan.mps | 2 +- ...jetbrains.mps.lang.typechecking.aspect.mps | 6 +- .../mps/logic/test/logical@tests.mps | 8 +- .../jetbrains/mps/logic/test/unification.mps | 8 +- .../mps/logic/test/unification@tests.mps | 6 +- ...uageExt2.generator.templates@generator.mps | 2 +- .../jetbrains.mps.baseLanguageExt2.mpl | 2 +- ...rains.mps.baseLanguageExt2.controlflow.mps | 8 +- .../generator/template/main@generator.mps | 2 +- .../models/behavior.mps | 4 +- .../models/editor.mps | 8 +- .../models/structure.mps | 2 +- .../models/types.mps | 8 +- .../samples.fitch.firstOrderLogic.mpl | 2 +- .../generator/template/main@generator.mps | 2 +- .../models/behavior.mps | 4 +- .../models/constraints.mps | 4 +- .../models/editor.mps | 16 +- .../models/structure.mps | 2 +- .../models/types.mps | 10 +- .../samples.fitch.herbrandLogic.mpl | 2 +- .../generator/template/main@generator.mps | 2 +- .../models/behavior.mps | 4 +- .../models/constraints.mps | 4 +- .../models/editor.mps | 16 +- .../models/structure.mps | 2 +- .../models/types.mps | 6 +- .../samples.fitch.propositionalLogic.mpl | 2 +- .../generator/template/main@generator.mps | 2 +- .../samples.fitch/models/behavior.mps | 6 +- .../samples.fitch/models/constraints.mps | 6 +- .../languages/samples.fitch/models/editor.mps | 16 +- .../samples.fitch/models/structure.mps | 2 +- .../languages/samples.fitch/models/types.mps | 6 +- .../languages/samples.fitch/samples.fitch.mpl | 2 +- .../models/samples.fitch.build.mps | 4 +- .../models/firstOrderLogic.mps | 4 +- .../models/firstOrderLogic@tests.mps | 8 +- .../models/herbrandLogic.mps | 4 +- .../models/herbrandLogic@tests.mps | 8 +- .../models/propositionalLogic.mps | 4 +- .../models/propositionalLogic@tests.mps | 8 +- .../samples.lambdacalc/models/behavior.mps | 6 +- .../samples.lambdacalc/models/constraints.mps | 6 +- .../samples.lambdacalc/models/editor.mps | 16 +- .../samples.lambdacalc/models/structure.mps | 2 +- .../samples.lambdacalc/models/types.mps | 16 +- .../samples.lambdacalc/samples.lambdacalc.mpl | 2 +- .../models/samples.lamdacalc.build.mps | 4 +- .../models/samples.lambdacalc.demo.mps | 4 +- .../models/samples.lambdacalc.demo@tests.mps | 8 +- .../samples.lambdacalc.incremental@tests.mps | 8 +- .../generator/templates/main@generator.mps | 2 +- .../jetbrains.mps.baseLanguage.blTypesExt.mpl | 2 +- ...ains.mps.baseLanguage.blTypesExt.types.mps | 2 +- ...fiersExt.generator.templates@generator.mps | 2 +- ...brains.mps.baseLanguage.classifiersExt.mpl | 2 +- ....mps.baseLanguage.classifiersExt.types.mps | 28 +- .../generator/templates/main@generator.mps | 2 +- ...jetbrains.mps.baseLanguage.closuresExt.mpl | 2 +- ...ins.mps.baseLanguage.closuresExt.types.mps | 32 +- .../generator/templates/main@generator.mps | 2 +- ...brains.mps.baseLanguage.collectionsExt.mpl | 2 +- ....mps.baseLanguage.collectionsExt.types.mps | 198 +++++++++-- .../generator/templates/main@generator.mps | 2 +- .../jetbrains.mps.baseLanguage.function.mpl | 2 +- ...brains.mps.baseLanguage.function.types.mps | 6 +- .../jetbrains.mps.baseLanguage.javadocExt.mpl | 2 +- ...ains.mps.baseLanguage.javadocExt.types.mps | 4 +- .../generator/templates/main@generator.mps | 2 +- .../jetbrains.mps.baseLanguage.sequence.mpl | 2 +- ...brains.mps.baseLanguage.sequence.types.mps | 6 +- .../generator/templates/main@generator.mps | 2 +- .../jetbrains.mps.baseLanguage.tuplesExt.mpl | 2 +- ...rains.mps.baseLanguage.tuplesExt.types.mps | 28 +- .../jetbrains.mps.baseLanguageExt.mpl | 2 +- .../jetbrains.mps.baseLanguageExt.scripts.mps | 4 +- .../jetbrains.mps.baseLanguageExt.types.mps | 252 +++++++++++-- .../generator/templates/main@generator.mps | 2 +- .../jetbrains.mps.baseLanguageInternalExt.mpl | 2 +- ...ains.mps.baseLanguageInternalExt.types.mps | 18 +- ...s.lang.behaviorExt.templates@generator.mps | 2 +- .../jetbrains.mps.lang.behaviorExt.mpl | 2 +- .../jetbrains.mps.lang.behaviorExt.types.mps | 6 +- .../generator/templates/main@generator.mps | 2 +- .../jetbrains.mps.lang.coderulesExt.mpl | 2 +- .../jetbrains.mps.lang.coderulesExt.types.mps | 28 +- .../generator/templates/main@generator.mps | 2 +- .../jetbrains.mps.lang.constraintsExt.mpl | 2 +- ...etbrains.mps.lang.constraintsExt.types.mps | 8 +- .../generator/templates/main@generator.mps | 2 +- ...ps.lang.generator.generationContextExt.mpl | 2 +- ...g.generator.generationContextExt.types.mps | 20 +- .../generator/templates/main@generator.mps | 2 +- .../jetbrains.mps.lang.generatorExt.mpl | 2 +- .../jetbrains.mps.lang.generatorExt.types.mps | 8 +- ...tternExt.generator.templates@generator.mps | 2 +- .../jetbrains.mps.lang.patternExt.mpl | 2 +- .../jetbrains.mps.lang.patternExt.types.mps | 8 +- .../generator/templates/main@generator.mps | 2 +- .../jetbrains.mps.lang.quotationExt.mpl | 2 +- .../jetbrains.mps.lang.quotationExt.types.mps | 8 +- ...copesExt.generator.templates@generator.mps | 2 +- .../jetbrains.mps.lang.scopesExt.mpl | 2 +- .../jetbrains.mps.lang.scopesExt.types.mps | 4 +- ...criptExt.generator.templates@generator.mps | 2 +- .../jetbrains.mps.lang.scriptExt.mpl | 2 +- .../jetbrains.mps.lang.scriptExt.types.mps | 4 +- ...queryExt.generator.templates@generator.mps | 2 +- .../jetbrains.mps.lang.smodel.queryExt.mpl | 2 +- ...tbrains.mps.lang.smodel.queryExt.types.mps | 6 +- .../generator/templates/main@generator.mps | 2 +- .../jetbrains.mps.lang.smodelExt.mpl | 2 +- .../jetbrains.mps.lang.smodelExt.types.mps | 100 +++++- ....testExt.generator.templates@generator.mps | 2 +- .../jetbrains.mps.lang.testExt.mpl | 2 +- .../jetbrains.mps.lang.testExt.types.mps | 8 +- ...ckingExt.generator.templates@generator.mps | 2 +- .../jetbrains.mps.lang.typecheckingExt.mpl | 2 +- ...tbrains.mps.lang.typecheckingExt.types.mps | 6 +- .../generator/templates/main@generator.mps | 2 +- .../jetbrains.mps.lang.typesystemExt.mpl | 2 +- ...jetbrains.mps.lang.typesystemExt.types.mps | 50 ++- .../generator/templates/main@generator.mps | 2 +- .../jetbrains.mps.logicExt.mpl | 2 +- .../models/jetbrains.mps.logicExt.types.mps | 28 +- ...baseLanguage.closuresExt.test.closures.mps | 6 +- ...nguage.closuresExt.test.closures@tests.mps | 8 +- ...eLanguage.closuresExt.test.collections.mps | 6 +- ...age.closuresExt.test.collections@tests.mps | 8 +- ...nguage.collectionsExt.test.collections.mps | 6 +- ...e.collectionsExt.test.containers@tests.mps | 8 +- ....collectionsExt.test.incremental@tests.mps | 8 +- ...eLanguage.collectionsExt.test.sequence.mps | 4 +- ...age.collectionsExt.test.sequence@tests.mps | 8 +- ...mps.baseLanguage.tuplesExt.test.tuples.mps | 4 +- ...seLanguage.tuplesExt.test.tuples@tests.mps | 8 +- ...mps.baseLanguageExt.test.code.features.mps | 6 +- ...mps.baseLanguageExt.test.code.generics.mps | 6 +- ....mps.baseLanguageExt.test.code.staging.mps | 6 +- ....mps.baseLanguageExt.test.code.thinlet.mps | 6 +- ...ps.baseLanguageExt.test.features@tests.mps | 8 +- ...ps.baseLanguageExt.test.generics@tests.mps | 8 +- ...baseLanguageExt.test.incremental@tests.mps | 10 +- ...mps.baseLanguageExt.test.staging@tests.mps | 8 +- ...mps.baseLanguageExt.test.thinlet@tests.mps | 8 +- ...s.mps.baseLanguageExt.test.types@tests.mps | 12 +- ...ns.mps.lang.smodelExt.test.types@tests.mps | 8 +- .../models/bounds@tests.mps | 8 +- .../models/helloWorld@tests.mps | 8 +- ...ecking.samples.baseLanguage.bounds.bad.mps | 6 +- ...pechecking.samples.baseLanguage.bounds.mps | 6 +- ...ecking.samples.baseLanguage.helloWorld.mps | 6 +- ...ecking.samples.baseLanguage.hugeSample.mps | 6 +- 224 files changed, 1639 insertions(+), 743 deletions(-) diff --git a/.mps/migration.xml b/.mps/migration.xml index 9e6a7784..65112394 100644 --- a/.mps/migration.xml +++ b/.mps/migration.xml @@ -30,6 +30,6 @@ - + \ No newline at end of file diff --git a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl index ae93bd54..fee895c5 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl +++ b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl @@ -1,5 +1,5 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps index 59ecf68d..4b8da84d 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps @@ -2370,7 +2370,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/findUsages.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/findUsages.mps index 5aff7094..45dd06cf 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/findUsages.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/findUsages.mps @@ -107,7 +107,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps index db220263..3cf1365c 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps @@ -47,7 +47,7 @@ - + @@ -149,7 +149,7 @@ - + @@ -166,7 +166,7 @@ - + @@ -277,7 +277,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps index 0ac35f8f..4de210be 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps @@ -42,7 +42,11 @@ + + + + @@ -62,6 +66,7 @@ + @@ -95,7 +100,7 @@ - + @@ -163,14 +168,22 @@ + + + + + + + + @@ -178,13 +191,19 @@ + + + + + + - + @@ -217,7 +236,18 @@ + + + + + + + + + + + @@ -2022,5 +2052,303 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps index cfe47c04..65db8bcf 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps @@ -1784,7 +1784,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/util.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/util.mps index 44af1309..7e940dc5 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/util.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/util.mps @@ -94,7 +94,7 @@ - + @@ -112,7 +112,7 @@ - + @@ -172,7 +172,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps index 8ad03099..3983c9c2 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps @@ -66,7 +66,7 @@ - + @@ -137,7 +137,7 @@ - + @@ -209,7 +209,7 @@ - + @@ -244,7 +244,7 @@ - + @@ -385,7 +385,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.analysis.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.analysis.mps index 7c8046c7..e37361af 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.analysis.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.analysis.mps @@ -27,7 +27,7 @@ - + @@ -124,7 +124,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -150,7 +150,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps index 18b6f396..8405664e 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps @@ -79,7 +79,7 @@ - + @@ -209,7 +209,7 @@ - + @@ -247,7 +247,7 @@ - + @@ -376,7 +376,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.terms.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.terms.mps index 9d23d67d..dd75d1f8 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.terms.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.terms.mps @@ -81,7 +81,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -110,7 +110,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.controlflow/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.controlflow/generator/template/main@generator.mps index 2eeacbe6..efb32c88 100644 --- a/coderules/languages/jetbrains.mps.lang.controlflow/generator/template/main@generator.mps +++ b/coderules/languages/jetbrains.mps.lang.controlflow/generator/template/main@generator.mps @@ -33,7 +33,7 @@ - + @@ -72,7 +72,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -129,7 +129,7 @@ - + @@ -190,7 +190,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.controlflow/models/plugin.mps b/coderules/languages/jetbrains.mps.lang.controlflow/models/plugin.mps index 7d8dde7d..3b4f035e 100644 --- a/coderules/languages/jetbrains.mps.lang.controlflow/models/plugin.mps +++ b/coderules/languages/jetbrains.mps.lang.controlflow/models/plugin.mps @@ -23,7 +23,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/jetbrains.mps.lang.typechecking.generator.genutil.mps b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/jetbrains.mps.lang.typechecking.generator.genutil.mps index 3be2f23d..9dcd44e8 100644 --- a/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/jetbrains.mps.lang.typechecking.generator.genutil.mps +++ b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/jetbrains.mps.lang.typechecking.generator.genutil.mps @@ -73,7 +73,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -136,7 +136,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps index 43023284..ca05e9be 100644 --- a/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps +++ b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps @@ -8,7 +8,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -145,7 +145,7 @@ - + @@ -249,7 +249,7 @@ - + @@ -335,7 +335,7 @@ - + @@ -410,9 +410,6 @@ - - - @@ -427,6 +424,7 @@ + @@ -513,6 +511,12 @@ + + + + + + @@ -2139,8 +2143,8 @@ - - + + @@ -2178,6 +2182,10 @@ + + + + @@ -2185,8 +2193,8 @@ - - + + @@ -2218,6 +2226,10 @@ + + + + diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl b/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl index 311a6216..e6cd6ae8 100644 --- a/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl +++ b/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl @@ -39,7 +39,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps index e94fafab..a6a82879 100644 --- a/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps +++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps @@ -53,7 +53,7 @@ - + @@ -93,7 +93,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps index d372244a..1eb7d37f 100644 --- a/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps +++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps @@ -21,7 +21,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -76,7 +76,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -151,7 +151,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps index 62502b23..2b1467e2 100644 --- a/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps +++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps @@ -16,7 +16,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -54,7 +54,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -96,7 +96,7 @@ - + @@ -154,7 +154,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/jetbrains.mps.lang.typechecking.actions.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/jetbrains.mps.lang.typechecking.actions.mps index bddc22da..1b16277a 100644 --- a/coderules/languages/jetbrains.mps.lang.typechecking/models/jetbrains.mps.lang.typechecking.actions.mps +++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/jetbrains.mps.lang.typechecking.actions.mps @@ -45,7 +45,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/jetbrains.mps.lang.typechecking.intentions.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/jetbrains.mps.lang.typechecking.intentions.mps index 53b57707..0a1c0149 100644 --- a/coderules/languages/jetbrains.mps.lang.typechecking/models/jetbrains.mps.lang.typechecking.intentions.mps +++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/jetbrains.mps.lang.typechecking.intentions.mps @@ -96,7 +96,7 @@ - + @@ -186,7 +186,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/jetbrains.mps.lang.typechecking.migration.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/jetbrains.mps.lang.typechecking.migration.mps index 8ec16f08..724e48d2 100644 --- a/coderules/languages/jetbrains.mps.lang.typechecking/models/jetbrains.mps.lang.typechecking.migration.mps +++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/jetbrains.mps.lang.typechecking.migration.mps @@ -86,7 +86,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -156,7 +156,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/plugin.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/plugin.mps index 27af8f05..b36ea4f5 100644 --- a/coderules/languages/jetbrains.mps.lang.typechecking/models/plugin.mps +++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/plugin.mps @@ -35,7 +35,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps index 5f53ab8d..be859eab 100644 --- a/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps +++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps @@ -44,7 +44,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps index bc014092..190e77ba 100644 --- a/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps +++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps @@ -37,7 +37,7 @@ - + @@ -45,7 +45,7 @@ - + @@ -95,7 +95,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.types/generator/templates/jetbrains.mps.lang.types.generator.templates@generator.mps b/coderules/languages/jetbrains.mps.lang.types/generator/templates/jetbrains.mps.lang.types.generator.templates@generator.mps index 17fcb12c..0dda6974 100644 --- a/coderules/languages/jetbrains.mps.lang.types/generator/templates/jetbrains.mps.lang.types.generator.templates@generator.mps +++ b/coderules/languages/jetbrains.mps.lang.types/generator/templates/jetbrains.mps.lang.types.generator.templates@generator.mps @@ -33,7 +33,7 @@ - + @@ -72,7 +72,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -130,7 +130,7 @@ - + @@ -191,7 +191,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps index d44bda69..5d1ee7f1 100644 --- a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps +++ b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps @@ -68,7 +68,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -143,7 +143,7 @@ - + @@ -248,7 +248,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps index a9392b3a..01361b51 100644 --- a/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps +++ b/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps @@ -68,7 +68,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -133,7 +133,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps index b69eaf39..aa96c622 100644 --- a/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps +++ b/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps @@ -102,7 +102,7 @@ - + @@ -117,7 +117,7 @@ - + @@ -225,7 +225,7 @@ - + @@ -264,7 +264,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/intentions.mps b/coderules/languages/jetbrains.mps.logic/languageModels/intentions.mps index 9b6fcae8..b78c6324 100644 --- a/coderules/languages/jetbrains.mps.logic/languageModels/intentions.mps +++ b/coderules/languages/jetbrains.mps.logic/languageModels/intentions.mps @@ -61,7 +61,7 @@ - + @@ -153,7 +153,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps b/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps index 24bbe7b2..44bc9f3d 100644 --- a/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps +++ b/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps @@ -37,7 +37,7 @@ - + @@ -88,7 +88,7 @@ - + @@ -102,7 +102,7 @@ - + @@ -168,7 +168,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps index 9764e1d6..75352782 100644 --- a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps +++ b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps @@ -67,7 +67,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps index 174058e2..c971deb6 100644 --- a/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps +++ b/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps @@ -90,7 +90,7 @@ - + @@ -206,7 +206,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps index 2dea57ba..5bd961f5 100644 --- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps +++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps @@ -64,7 +64,7 @@ - + @@ -211,7 +211,7 @@ - + @@ -251,7 +251,7 @@ - + @@ -335,7 +335,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps index b8e47023..5afce445 100644 --- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps +++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps @@ -48,7 +48,7 @@ - + @@ -185,7 +185,7 @@ - + @@ -207,7 +207,7 @@ - + @@ -269,7 +269,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.unification.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.unification.mps index 5f01af9f..308e55db 100644 --- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.unification.mps +++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.unification.mps @@ -36,7 +36,7 @@ - + @@ -160,7 +160,7 @@ - + @@ -192,7 +192,7 @@ - + @@ -230,7 +230,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl b/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl index 9bc2042f..d498024c 100644 --- a/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl +++ b/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl @@ -28,7 +28,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/editor.mps b/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/editor.mps index 376dd677..b09fe0c8 100644 --- a/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/editor.mps +++ b/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/editor.mps @@ -57,7 +57,7 @@ - + @@ -93,7 +93,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/intentions.mps b/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/intentions.mps index 83583118..b75b64c9 100644 --- a/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/intentions.mps +++ b/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/intentions.mps @@ -65,7 +65,7 @@ - + @@ -124,7 +124,7 @@ - + @@ -157,7 +157,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/jetbrains.mps.typechecking.annotation.types.mps b/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/jetbrains.mps.typechecking.annotation.types.mps index cce151a5..23a28466 100644 --- a/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/jetbrains.mps.typechecking.annotation.types.mps +++ b/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/jetbrains.mps.typechecking.annotation.types.mps @@ -2,7 +2,7 @@ - + @@ -11,7 +11,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/structure.mps b/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/structure.mps index 3ab3a3cb..d972679c 100644 --- a/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/structure.mps +++ b/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/structure.mps @@ -37,7 +37,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/generator/template/main@generator.mps index d48ac4ff..956285a3 100644 --- a/coderules/languages/jetbrains.mps.typechecking.testlang/generator/template/main@generator.mps +++ b/coderules/languages/jetbrains.mps.typechecking.testlang/generator/template/main@generator.mps @@ -12,7 +12,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl b/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl index dd579fc3..c2b62317 100644 --- a/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl +++ b/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl @@ -75,7 +75,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/behavior.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/behavior.mps index 64f75b12..74f53b06 100644 --- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/behavior.mps +++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/behavior.mps @@ -46,7 +46,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/constraints.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/constraints.mps index dd279fc6..785bcedb 100644 --- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/constraints.mps +++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/constraints.mps @@ -67,7 +67,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/editor.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/editor.mps index ded34197..71254d4d 100644 --- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/editor.mps +++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/editor.mps @@ -16,7 +16,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -58,10 +58,10 @@ - + - + @@ -92,13 +92,13 @@ - + - + @@ -161,7 +161,7 @@ - + @@ -205,7 +205,7 @@ - + @@ -249,7 +249,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/structure.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/structure.mps index 34e10b58..3e5f527b 100644 --- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/structure.mps +++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/structure.mps @@ -39,7 +39,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps index ed719fac..18203bfa 100644 --- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps +++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps @@ -2,7 +2,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -104,7 +104,7 @@ - + @@ -140,7 +140,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models/jetbrains.mps.coderules.ideaplugin.mps b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models/jetbrains.mps.coderules.ideaplugin.mps index c2e2a2a0..8fd41652 100644 --- a/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models/jetbrains.mps.coderules.ideaplugin.mps +++ b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models/jetbrains.mps.coderules.ideaplugin.mps @@ -44,7 +44,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -135,7 +135,7 @@ - + @@ -155,7 +155,7 @@ - + @@ -187,7 +187,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.coderules.runtime/models/jetbrains.mps.coderules.runtime.memoizer.mps b/coderules/solutions/jetbrains.mps.coderules.runtime/models/jetbrains.mps.coderules.runtime.memoizer.mps index 48e72eca..3c9168d6 100644 --- a/coderules/solutions/jetbrains.mps.coderules.runtime/models/jetbrains.mps.coderules.runtime.memoizer.mps +++ b/coderules/solutions/jetbrains.mps.coderules.runtime/models/jetbrains.mps.coderules.runtime.memoizer.mps @@ -20,7 +20,7 @@ - + @@ -104,7 +104,7 @@ - + @@ -125,7 +125,7 @@ - + @@ -142,7 +142,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.coderules.runtime/models/jetbrains.mps.coderules.runtime.result.mps b/coderules/solutions/jetbrains.mps.coderules.runtime/models/jetbrains.mps.coderules.runtime.result.mps index bda7ba45..4b81e49e 100644 --- a/coderules/solutions/jetbrains.mps.coderules.runtime/models/jetbrains.mps.coderules.runtime.result.mps +++ b/coderules/solutions/jetbrains.mps.coderules.runtime/models/jetbrains.mps.coderules.runtime.result.mps @@ -25,7 +25,7 @@ - + @@ -94,7 +94,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -150,7 +150,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.aspect@tests.mps b/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.aspect@tests.mps index a8366e73..14a6bfdf 100644 --- a/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.aspect@tests.mps +++ b/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.aspect@tests.mps @@ -24,7 +24,7 @@ - + @@ -88,7 +88,7 @@ - + @@ -105,7 +105,7 @@ - + @@ -149,7 +149,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.plugin@tests.mps b/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.plugin@tests.mps index d66740f9..b3db67a8 100644 --- a/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.plugin@tests.mps +++ b/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.plugin@tests.mps @@ -67,7 +67,7 @@ - + @@ -81,7 +81,7 @@ - + @@ -118,7 +118,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.coderules.test/models/modelcheck@tests.mps b/coderules/solutions/jetbrains.mps.coderules.test/models/modelcheck@tests.mps index bc391338..b57d7f3c 100644 --- a/coderules/solutions/jetbrains.mps.coderules.test/models/modelcheck@tests.mps +++ b/coderules/solutions/jetbrains.mps.coderules.test/models/modelcheck@tests.mps @@ -61,7 +61,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -181,7 +181,7 @@ - + @@ -256,7 +256,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps b/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps index 1888b6e6..52a773f9 100644 --- a/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps +++ b/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps @@ -67,7 +67,7 @@ - + @@ -185,7 +185,7 @@ - + @@ -211,7 +211,7 @@ - + @@ -272,7 +272,7 @@ - + @@ -326,7 +326,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd index 28d5e23f..f1b37d05 100644 --- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd +++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd @@ -44,7 +44,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps index 447af525..488e8e84 100644 --- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps +++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps @@ -12,7 +12,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -125,7 +125,7 @@ - + @@ -156,7 +156,7 @@ - + @@ -185,7 +185,7 @@ - + @@ -228,7 +228,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.scheduling@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.scheduling@tests.mps index f8da0bc7..f41a992f 100644 --- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.scheduling@tests.mps +++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.scheduling@tests.mps @@ -51,7 +51,7 @@ - + @@ -116,7 +116,7 @@ - + @@ -143,7 +143,7 @@ - + @@ -178,7 +178,7 @@ - + @@ -187,7 +187,7 @@ - + @@ -197,7 +197,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps index b7914b74..9f508e6a 100644 --- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps +++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps @@ -88,7 +88,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -196,7 +196,7 @@ - + @@ -220,7 +220,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -300,7 +300,7 @@ - + @@ -406,7 +406,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.testlang.sandbox/models/jetbrains.mps.coderules.typechecking.testlang.sandbox.test.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.testlang.sandbox/models/jetbrains.mps.coderules.typechecking.testlang.sandbox.test.mps index e144b5bf..3ce3e377 100644 --- a/coderules/solutions/jetbrains.mps.coderules.typechecking.testlang.sandbox/models/jetbrains.mps.coderules.typechecking.testlang.sandbox.test.mps +++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.testlang.sandbox/models/jetbrains.mps.coderules.typechecking.testlang.sandbox.test.mps @@ -20,7 +20,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps index c282d47c..08e78cc0 100644 --- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps +++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps @@ -119,7 +119,7 @@ - + @@ -196,7 +196,7 @@ - + @@ -275,7 +275,7 @@ - + @@ -312,7 +312,7 @@ - + @@ -494,7 +494,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps index 14dd4ea6..228eeb10 100644 --- a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps +++ b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps @@ -176,7 +176,7 @@ - + @@ -237,7 +237,7 @@ - + @@ -325,7 +325,7 @@ - + @@ -403,7 +403,7 @@ - + @@ -444,7 +444,7 @@ - + @@ -553,7 +553,7 @@ - + @@ -614,7 +614,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps index cf78be75..8b33516e 100644 --- a/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps +++ b/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps @@ -86,7 +86,7 @@ - + @@ -230,7 +230,7 @@ - + @@ -260,7 +260,7 @@ - + @@ -316,7 +316,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps index a0209dc3..18d9ea0d 100644 --- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps +++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps @@ -74,7 +74,7 @@ - + @@ -142,7 +142,7 @@ - + @@ -219,7 +219,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -381,7 +381,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps index 3cd2d870..318e087c 100644 --- a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps +++ b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps @@ -81,7 +81,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -198,7 +198,7 @@ - + @@ -218,7 +218,7 @@ - + @@ -263,7 +263,7 @@ - + @@ -276,7 +276,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.controlflow/models/service.mps b/coderules/solutions/jetbrains.mps.controlflow/models/service.mps index 541aedfb..bfffbc0e 100644 --- a/coderules/solutions/jetbrains.mps.controlflow/models/service.mps +++ b/coderules/solutions/jetbrains.mps.controlflow/models/service.mps @@ -36,7 +36,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -124,7 +124,7 @@ - + @@ -164,7 +164,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps index 32ee2d67..00139299 100644 --- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps +++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps @@ -49,7 +49,7 @@ - + @@ -98,7 +98,7 @@ - + @@ -168,7 +168,7 @@ - + @@ -191,7 +191,7 @@ - + @@ -283,7 +283,7 @@ - + @@ -1002,7 +1002,7 @@ - + @@ -1055,7 +1055,7 @@ - + @@ -3464,7 +3464,7 @@ - + @@ -3495,7 +3495,7 @@ - + @@ -4410,7 +4410,7 @@ - + @@ -4419,7 +4419,7 @@ - + @@ -4552,7 +4552,7 @@ - + @@ -4831,7 +4831,7 @@ - + @@ -4854,7 +4854,7 @@ - + @@ -5018,14 +5018,14 @@ - + - + @@ -5036,13 +5036,13 @@ - + - + @@ -5053,13 +5053,13 @@ - + - + @@ -5070,13 +5070,13 @@ - + - + @@ -5088,7 +5088,7 @@ - + @@ -5166,7 +5166,7 @@ - + @@ -5302,7 +5302,7 @@ - + @@ -5399,7 +5399,7 @@ - + @@ -5420,7 +5420,7 @@ - + @@ -5440,14 +5440,14 @@ - + - + @@ -5493,13 +5493,13 @@ - + - + @@ -5510,13 +5510,13 @@ - + - + @@ -5595,7 +5595,7 @@ - + @@ -5610,7 +5610,7 @@ - + @@ -5706,7 +5706,7 @@ - + @@ -5812,7 +5812,7 @@ - + @@ -5908,7 +5908,7 @@ - + @@ -5927,7 +5927,7 @@ - + @@ -5977,7 +5977,7 @@ - + @@ -6005,7 +6005,7 @@ - + @@ -6129,7 +6129,7 @@ - + @@ -6275,7 +6275,7 @@ - + @@ -6290,7 +6290,7 @@ - + @@ -6314,7 +6314,7 @@ - + @@ -6417,12 +6417,12 @@ - + - + @@ -6503,7 +6503,7 @@ - + @@ -6735,13 +6735,13 @@ - + - + @@ -6751,7 +6751,7 @@ - + @@ -6839,13 +6839,13 @@ - + - + @@ -6855,13 +6855,13 @@ - + - + diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps index d9931859..fcc571a2 100644 --- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps +++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps @@ -52,7 +52,7 @@ - + @@ -76,7 +76,7 @@ - + @@ -147,7 +147,7 @@ - + @@ -229,7 +229,7 @@ - + @@ -269,7 +269,7 @@ - + @@ -357,7 +357,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps b/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps index 511d190b..991692a6 100644 --- a/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps +++ b/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps @@ -46,7 +46,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -81,7 +81,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.descriptor.aspects.types@genplan.mps b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.descriptor.aspects.types@genplan.mps index d2522f69..195a19a1 100644 --- a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.descriptor.aspects.types@genplan.mps +++ b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.descriptor.aspects.types@genplan.mps @@ -40,7 +40,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps index 3946bcb4..eefa2861 100644 --- a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps +++ b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps @@ -47,7 +47,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -82,7 +82,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps index bbddfcc0..c9a38bca 100644 --- a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps +++ b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps @@ -52,7 +52,7 @@ - + @@ -164,7 +164,7 @@ - + @@ -192,7 +192,7 @@ - + @@ -277,7 +277,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps index f103c2a7..33470112 100644 --- a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps +++ b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps @@ -30,7 +30,7 @@ - + @@ -114,7 +114,7 @@ - + @@ -129,14 +129,14 @@ - + - + diff --git a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps index f66a16a9..168e1749 100644 --- a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps +++ b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps @@ -99,7 +99,7 @@ - + @@ -123,7 +123,7 @@ - + @@ -203,7 +203,7 @@ - + diff --git a/samples/controlflow/jetbrains.mps.baseLanguageExt2/generator/templates/jetbrains.mps.baseLanguageExt2.generator.templates@generator.mps b/samples/controlflow/jetbrains.mps.baseLanguageExt2/generator/templates/jetbrains.mps.baseLanguageExt2.generator.templates@generator.mps index 556acd88..19c4eea2 100644 --- a/samples/controlflow/jetbrains.mps.baseLanguageExt2/generator/templates/jetbrains.mps.baseLanguageExt2.generator.templates@generator.mps +++ b/samples/controlflow/jetbrains.mps.baseLanguageExt2/generator/templates/jetbrains.mps.baseLanguageExt2.generator.templates@generator.mps @@ -12,7 +12,7 @@ - + diff --git a/samples/controlflow/jetbrains.mps.baseLanguageExt2/jetbrains.mps.baseLanguageExt2.mpl b/samples/controlflow/jetbrains.mps.baseLanguageExt2/jetbrains.mps.baseLanguageExt2.mpl index 71630cf3..5f098d17 100644 --- a/samples/controlflow/jetbrains.mps.baseLanguageExt2/jetbrains.mps.baseLanguageExt2.mpl +++ b/samples/controlflow/jetbrains.mps.baseLanguageExt2/jetbrains.mps.baseLanguageExt2.mpl @@ -69,7 +69,7 @@ - + diff --git a/samples/controlflow/jetbrains.mps.baseLanguageExt2/models/jetbrains.mps.baseLanguageExt2.controlflow.mps b/samples/controlflow/jetbrains.mps.baseLanguageExt2/models/jetbrains.mps.baseLanguageExt2.controlflow.mps index 37f0df9b..c4542528 100644 --- a/samples/controlflow/jetbrains.mps.baseLanguageExt2/models/jetbrains.mps.baseLanguageExt2.controlflow.mps +++ b/samples/controlflow/jetbrains.mps.baseLanguageExt2/models/jetbrains.mps.baseLanguageExt2.controlflow.mps @@ -87,7 +87,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -160,7 +160,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/generator/template/main@generator.mps b/samples/fitch/languages/samples.fitch.firstOrderLogic/generator/template/main@generator.mps index 0d0183c8..02f7c7eb 100644 --- a/samples/fitch/languages/samples.fitch.firstOrderLogic/generator/template/main@generator.mps +++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/generator/template/main@generator.mps @@ -12,7 +12,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/behavior.mps b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/behavior.mps index 2c9b290a..ed282898 100644 --- a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/behavior.mps +++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/behavior.mps @@ -57,7 +57,7 @@ - + @@ -75,7 +75,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/editor.mps b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/editor.mps index 5acac906..63486517 100644 --- a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/editor.mps +++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/editor.mps @@ -54,7 +54,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -111,7 +111,7 @@ - + @@ -125,7 +125,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/structure.mps b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/structure.mps index 27cdbe49..866c4ec8 100644 --- a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/structure.mps +++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/structure.mps @@ -39,7 +39,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps index 894d01cf..dcbe479c 100644 --- a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps +++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps @@ -2,7 +2,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -105,7 +105,7 @@ - + @@ -153,7 +153,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl b/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl index 8525950a..dcf2a3de 100644 --- a/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl +++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl @@ -76,7 +76,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/generator/template/main@generator.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/generator/template/main@generator.mps index db1b6111..3e67415a 100644 --- a/samples/fitch/languages/samples.fitch.herbrandLogic/generator/template/main@generator.mps +++ b/samples/fitch/languages/samples.fitch.herbrandLogic/generator/template/main@generator.mps @@ -12,7 +12,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/models/behavior.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/models/behavior.mps index e37c71d3..11b6e221 100644 --- a/samples/fitch/languages/samples.fitch.herbrandLogic/models/behavior.mps +++ b/samples/fitch/languages/samples.fitch.herbrandLogic/models/behavior.mps @@ -56,7 +56,7 @@ - + @@ -74,7 +74,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/models/constraints.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/models/constraints.mps index 241dc710..f05bdce4 100644 --- a/samples/fitch/languages/samples.fitch.herbrandLogic/models/constraints.mps +++ b/samples/fitch/languages/samples.fitch.herbrandLogic/models/constraints.mps @@ -34,7 +34,7 @@ - + @@ -89,7 +89,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/models/editor.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/models/editor.mps index 0d513107..ee682643 100644 --- a/samples/fitch/languages/samples.fitch.herbrandLogic/models/editor.mps +++ b/samples/fitch/languages/samples.fitch.herbrandLogic/models/editor.mps @@ -19,7 +19,7 @@ - + @@ -45,7 +45,7 @@ - + @@ -80,10 +80,10 @@ - + - + @@ -130,7 +130,7 @@ - + @@ -138,7 +138,7 @@ - + @@ -233,7 +233,7 @@ - + @@ -252,7 +252,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/models/structure.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/models/structure.mps index b7d48c6b..1ddea68d 100644 --- a/samples/fitch/languages/samples.fitch.herbrandLogic/models/structure.mps +++ b/samples/fitch/languages/samples.fitch.herbrandLogic/models/structure.mps @@ -39,7 +39,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps index 25815ce6..e2284a76 100644 --- a/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps +++ b/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps @@ -2,7 +2,7 @@ - + @@ -96,7 +96,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -152,7 +152,7 @@ - + @@ -221,7 +221,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl b/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl index 4d146fc2..9fa6c701 100644 --- a/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl +++ b/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl @@ -77,7 +77,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/generator/template/main@generator.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/generator/template/main@generator.mps index 7397e6ff..fc384c4a 100644 --- a/samples/fitch/languages/samples.fitch.propositionalLogic/generator/template/main@generator.mps +++ b/samples/fitch/languages/samples.fitch.propositionalLogic/generator/template/main@generator.mps @@ -12,7 +12,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/models/behavior.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/behavior.mps index 5251ae16..8ee948fa 100644 --- a/samples/fitch/languages/samples.fitch.propositionalLogic/models/behavior.mps +++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/behavior.mps @@ -50,7 +50,7 @@ - + @@ -68,7 +68,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/models/constraints.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/constraints.mps index 4ebd08ef..668cb776 100644 --- a/samples/fitch/languages/samples.fitch.propositionalLogic/models/constraints.mps +++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/constraints.mps @@ -38,7 +38,7 @@ - + @@ -93,7 +93,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/models/editor.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/editor.mps index f63c0dd7..456ff0ba 100644 --- a/samples/fitch/languages/samples.fitch.propositionalLogic/models/editor.mps +++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/editor.mps @@ -21,7 +21,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -80,10 +80,10 @@ - + - + @@ -125,14 +125,14 @@ - + - + @@ -231,7 +231,7 @@ - + @@ -250,7 +250,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/models/structure.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/structure.mps index dffc9d61..21033b62 100644 --- a/samples/fitch/languages/samples.fitch.propositionalLogic/models/structure.mps +++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/structure.mps @@ -40,7 +40,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps index 50637176..d186514b 100644 --- a/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps +++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps @@ -2,7 +2,7 @@ - + @@ -76,7 +76,7 @@ - + @@ -133,7 +133,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl b/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl index 21ae09ba..357b2db9 100644 --- a/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl +++ b/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl @@ -75,7 +75,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch/generator/template/main@generator.mps b/samples/fitch/languages/samples.fitch/generator/template/main@generator.mps index 6a804044..23d72733 100644 --- a/samples/fitch/languages/samples.fitch/generator/template/main@generator.mps +++ b/samples/fitch/languages/samples.fitch/generator/template/main@generator.mps @@ -12,7 +12,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch/models/behavior.mps b/samples/fitch/languages/samples.fitch/models/behavior.mps index 8a03bb08..402b98ac 100644 --- a/samples/fitch/languages/samples.fitch/models/behavior.mps +++ b/samples/fitch/languages/samples.fitch/models/behavior.mps @@ -63,10 +63,10 @@ - + - + @@ -98,7 +98,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch/models/constraints.mps b/samples/fitch/languages/samples.fitch/models/constraints.mps index f197c120..d8b65510 100644 --- a/samples/fitch/languages/samples.fitch/models/constraints.mps +++ b/samples/fitch/languages/samples.fitch/models/constraints.mps @@ -67,7 +67,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -163,7 +163,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch/models/editor.mps b/samples/fitch/languages/samples.fitch/models/editor.mps index 8bf9070f..a15127ff 100644 --- a/samples/fitch/languages/samples.fitch/models/editor.mps +++ b/samples/fitch/languages/samples.fitch/models/editor.mps @@ -16,7 +16,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -76,12 +76,12 @@ - + - + @@ -105,7 +105,7 @@ - + @@ -116,7 +116,7 @@ - + @@ -194,7 +194,7 @@ - + @@ -260,7 +260,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch/models/structure.mps b/samples/fitch/languages/samples.fitch/models/structure.mps index e4ece676..a44a5f42 100644 --- a/samples/fitch/languages/samples.fitch/models/structure.mps +++ b/samples/fitch/languages/samples.fitch/models/structure.mps @@ -45,7 +45,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch/models/types.mps b/samples/fitch/languages/samples.fitch/models/types.mps index a8eebb35..f1d1c9bc 100644 --- a/samples/fitch/languages/samples.fitch/models/types.mps +++ b/samples/fitch/languages/samples.fitch/models/types.mps @@ -2,7 +2,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch/samples.fitch.mpl b/samples/fitch/languages/samples.fitch/samples.fitch.mpl index 96e8b761..2d1523b1 100644 --- a/samples/fitch/languages/samples.fitch/samples.fitch.mpl +++ b/samples/fitch/languages/samples.fitch/samples.fitch.mpl @@ -75,7 +75,7 @@ - + diff --git a/samples/fitch/solutions/samples.fitch.build/models/samples.fitch.build.mps b/samples/fitch/solutions/samples.fitch.build/models/samples.fitch.build.mps index 93c5c917..a6b0731b 100644 --- a/samples/fitch/solutions/samples.fitch.build/models/samples.fitch.build.mps +++ b/samples/fitch/solutions/samples.fitch.build/models/samples.fitch.build.mps @@ -70,7 +70,7 @@ - + @@ -83,7 +83,7 @@ - + diff --git a/samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic.mps b/samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic.mps index b2aeb8e6..ebbd9c28 100644 --- a/samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic.mps +++ b/samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic.mps @@ -37,7 +37,7 @@ - + @@ -79,7 +79,7 @@ - + diff --git a/samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic@tests.mps b/samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic@tests.mps index 4d06b1c8..43057dd6 100644 --- a/samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic@tests.mps +++ b/samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic@tests.mps @@ -63,11 +63,11 @@ - + - + @@ -87,7 +87,7 @@ - + @@ -127,7 +127,7 @@ - + diff --git a/samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic.mps b/samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic.mps index d2a74cbf..eb027320 100644 --- a/samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic.mps +++ b/samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic.mps @@ -20,7 +20,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic@tests.mps b/samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic@tests.mps index 123ddf36..d5bdf43c 100644 --- a/samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic@tests.mps +++ b/samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic@tests.mps @@ -63,11 +63,11 @@ - + - + @@ -87,7 +87,7 @@ - + @@ -127,7 +127,7 @@ - + diff --git a/samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic.mps b/samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic.mps index fbad1848..4ce2666a 100644 --- a/samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic.mps +++ b/samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic.mps @@ -43,7 +43,7 @@ - + @@ -64,7 +64,7 @@ - + diff --git a/samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic@tests.mps b/samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic@tests.mps index 0c4f1d9f..7d8d5cdb 100644 --- a/samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic@tests.mps +++ b/samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic@tests.mps @@ -63,11 +63,11 @@ - + - + @@ -87,7 +87,7 @@ - + @@ -127,7 +127,7 @@ - + diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/behavior.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/behavior.mps index 0aa3f730..77e56353 100644 --- a/samples/lambdacalc/languages/samples.lambdacalc/models/behavior.mps +++ b/samples/lambdacalc/languages/samples.lambdacalc/models/behavior.mps @@ -98,7 +98,7 @@ - + @@ -112,7 +112,7 @@ - + @@ -161,7 +161,7 @@ - + diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/constraints.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/constraints.mps index 94f30cb1..809869a6 100644 --- a/samples/lambdacalc/languages/samples.lambdacalc/models/constraints.mps +++ b/samples/lambdacalc/languages/samples.lambdacalc/models/constraints.mps @@ -123,7 +123,7 @@ - + @@ -143,7 +143,7 @@ - + @@ -275,7 +275,7 @@ - + diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/editor.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/editor.mps index ca2369d3..859f0ddc 100644 --- a/samples/lambdacalc/languages/samples.lambdacalc/models/editor.mps +++ b/samples/lambdacalc/languages/samples.lambdacalc/models/editor.mps @@ -16,7 +16,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -67,10 +67,10 @@ - + - + @@ -108,7 +108,7 @@ - + @@ -122,13 +122,13 @@ - + - + @@ -239,7 +239,7 @@ - + diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/structure.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/structure.mps index fc5867ab..eb9beb90 100644 --- a/samples/lambdacalc/languages/samples.lambdacalc/models/structure.mps +++ b/samples/lambdacalc/languages/samples.lambdacalc/models/structure.mps @@ -44,7 +44,7 @@ - + diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps index 14a93635..18a6206a 100644 --- a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps +++ b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps @@ -2,7 +2,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -130,7 +130,7 @@ - + @@ -147,7 +147,7 @@ - + @@ -180,7 +180,7 @@ - + @@ -190,7 +190,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -289,7 +289,7 @@ - + diff --git a/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl b/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl index a72b4897..06704584 100644 --- a/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl +++ b/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl @@ -38,7 +38,7 @@ - + diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps b/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps index 8aab9c47..dd2841a4 100644 --- a/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps +++ b/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps @@ -70,7 +70,7 @@ - + @@ -83,7 +83,7 @@ - + diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo.mps b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo.mps index 496d7d21..576bb660 100644 --- a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo.mps +++ b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo.mps @@ -16,7 +16,7 @@ - + @@ -39,7 +39,7 @@ - + diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps index 767f3fc7..287c0209 100644 --- a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps +++ b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps @@ -113,7 +113,7 @@ - + @@ -129,7 +129,7 @@ - + @@ -157,7 +157,7 @@ - + @@ -209,7 +209,7 @@ - + diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.incremental@tests.mps b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.incremental@tests.mps index 28bd7a8b..10d31fcb 100644 --- a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.incremental@tests.mps +++ b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.incremental@tests.mps @@ -122,7 +122,7 @@ - + @@ -138,7 +138,7 @@ - + @@ -167,7 +167,7 @@ - + @@ -237,7 +237,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.blTypesExt/generator/templates/main@generator.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.blTypesExt/generator/templates/main@generator.mps index fba53c6c..8f3cadd2 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.blTypesExt/generator/templates/main@generator.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.blTypesExt/generator/templates/main@generator.mps @@ -12,7 +12,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.blTypesExt/jetbrains.mps.baseLanguage.blTypesExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.blTypesExt/jetbrains.mps.baseLanguage.blTypesExt.mpl index c987c94e..e273d2da 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.blTypesExt/jetbrains.mps.baseLanguage.blTypesExt.mpl +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.blTypesExt/jetbrains.mps.baseLanguage.blTypesExt.mpl @@ -68,7 +68,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.blTypesExt/models/jetbrains.mps.baseLanguage.blTypesExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.blTypesExt/models/jetbrains.mps.baseLanguage.blTypesExt.types.mps index 703fc0c5..1a4f40ca 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.blTypesExt/models/jetbrains.mps.baseLanguage.blTypesExt.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.blTypesExt/models/jetbrains.mps.baseLanguage.blTypesExt.types.mps @@ -16,7 +16,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/generator/templates/jetbrains.mps.baseLanguage.classifiersExt.generator.templates@generator.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/generator/templates/jetbrains.mps.baseLanguage.classifiersExt.generator.templates@generator.mps index 31a5d24d..ec47bfdb 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/generator/templates/jetbrains.mps.baseLanguage.classifiersExt.generator.templates@generator.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/generator/templates/jetbrains.mps.baseLanguage.classifiersExt.generator.templates@generator.mps @@ -12,7 +12,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/jetbrains.mps.baseLanguage.classifiersExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/jetbrains.mps.baseLanguage.classifiersExt.mpl index c5fee8b2..c9a65a66 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/jetbrains.mps.baseLanguage.classifiersExt.mpl +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/jetbrains.mps.baseLanguage.classifiersExt.mpl @@ -79,7 +79,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/models/jetbrains.mps.baseLanguage.classifiersExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/models/jetbrains.mps.baseLanguage.classifiersExt.types.mps index 69a0c4ea..9395bf2e 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/models/jetbrains.mps.baseLanguage.classifiersExt.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/models/jetbrains.mps.baseLanguage.classifiersExt.types.mps @@ -3,7 +3,7 @@ - + @@ -77,7 +77,7 @@ - + @@ -117,7 +117,7 @@ - + @@ -156,7 +156,7 @@ - + @@ -233,6 +233,7 @@ + @@ -299,6 +300,9 @@ + + + @@ -1301,6 +1305,14 @@ + + + + + + + + @@ -1328,6 +1340,14 @@ + + + + + + + + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/generator/templates/main@generator.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/generator/templates/main@generator.mps index 3947f2b3..ac1c6fb6 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/generator/templates/main@generator.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/generator/templates/main@generator.mps @@ -12,7 +12,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/jetbrains.mps.baseLanguage.closuresExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/jetbrains.mps.baseLanguage.closuresExt.mpl index f0a3b79b..9575fa2f 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/jetbrains.mps.baseLanguage.closuresExt.mpl +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/jetbrains.mps.baseLanguage.closuresExt.mpl @@ -81,7 +81,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps index b698e8b2..e0a3e21e 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps @@ -3,7 +3,7 @@ - + @@ -142,7 +142,7 @@ - + @@ -160,7 +160,7 @@ - + @@ -231,7 +231,7 @@ - + @@ -327,7 +327,7 @@ - + @@ -473,9 +473,6 @@ - - - @@ -487,6 +484,7 @@ + @@ -571,6 +569,12 @@ + + + + + + @@ -600,8 +604,8 @@ - - + + @@ -664,6 +668,14 @@ + + + + + + + + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/generator/templates/main@generator.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/generator/templates/main@generator.mps index 39a774a8..274b3eb2 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/generator/templates/main@generator.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/generator/templates/main@generator.mps @@ -12,7 +12,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/jetbrains.mps.baseLanguage.collectionsExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/jetbrains.mps.baseLanguage.collectionsExt.mpl index 8a45b595..e4055fad 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/jetbrains.mps.baseLanguage.collectionsExt.mpl +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/jetbrains.mps.baseLanguage.collectionsExt.mpl @@ -79,7 +79,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.types.mps index 1c0629f6..847c4890 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.types.mps @@ -3,7 +3,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -200,7 +200,7 @@ - + @@ -304,9 +304,6 @@ - - - @@ -318,6 +315,7 @@ + @@ -412,6 +410,12 @@ + + + + + + @@ -492,8 +496,8 @@ - - + + @@ -548,6 +552,14 @@ + + + + + + + + @@ -581,6 +593,14 @@ + + + + + + + + @@ -671,6 +691,14 @@ + + + + + + + + @@ -761,6 +789,14 @@ + + + + + + + + @@ -833,8 +869,8 @@ - - + + @@ -854,6 +890,14 @@ + + + + + + + + @@ -926,8 +970,8 @@ - - + + @@ -947,6 +991,14 @@ + + + + + + + + @@ -1019,8 +1071,8 @@ - - + + @@ -1040,6 +1092,14 @@ + + + + + + + + @@ -1112,8 +1172,8 @@ - - + + @@ -1133,6 +1193,14 @@ + + + + + + + + @@ -1205,8 +1273,8 @@ - - + + @@ -1226,6 +1294,14 @@ + + + + + + + + @@ -1298,8 +1374,8 @@ - - + + @@ -1319,6 +1395,14 @@ + + + + + + + + @@ -1391,8 +1475,8 @@ - - + + @@ -1412,6 +1496,14 @@ + + + + + + + + @@ -1492,8 +1584,8 @@ - - + + @@ -1513,6 +1605,14 @@ + + + + + + + + @@ -1620,8 +1720,8 @@ - - + + @@ -1641,6 +1741,14 @@ + + + + + + + + @@ -1748,8 +1856,8 @@ - - + + @@ -1769,6 +1877,14 @@ + + + + + + + + @@ -1868,8 +1984,8 @@ - - + + @@ -1889,6 +2005,14 @@ + + + + + + + + @@ -2343,8 +2467,8 @@ - - + + @@ -2364,6 +2488,14 @@ + + + + + + + + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/generator/templates/main@generator.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/generator/templates/main@generator.mps index 522e0519..191fc6d2 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/generator/templates/main@generator.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/generator/templates/main@generator.mps @@ -12,7 +12,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/jetbrains.mps.baseLanguage.function.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/jetbrains.mps.baseLanguage.function.mpl index d276047c..da69c565 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/jetbrains.mps.baseLanguage.function.mpl +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/jetbrains.mps.baseLanguage.function.mpl @@ -78,7 +78,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/models/jetbrains.mps.baseLanguage.function.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/models/jetbrains.mps.baseLanguage.function.types.mps index 49f92816..d4907598 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/models/jetbrains.mps.baseLanguage.function.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/models/jetbrains.mps.baseLanguage.function.types.mps @@ -3,7 +3,7 @@ - + @@ -87,7 +87,7 @@ - + @@ -120,7 +120,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/jetbrains.mps.baseLanguage.javadocExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/jetbrains.mps.baseLanguage.javadocExt.mpl index da6676a5..5f924f64 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/jetbrains.mps.baseLanguage.javadocExt.mpl +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/jetbrains.mps.baseLanguage.javadocExt.mpl @@ -31,7 +31,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/models/jetbrains.mps.baseLanguage.javadocExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/models/jetbrains.mps.baseLanguage.javadocExt.types.mps index a8a56190..c3e69379 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/models/jetbrains.mps.baseLanguage.javadocExt.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/models/jetbrains.mps.baseLanguage.javadocExt.types.mps @@ -2,7 +2,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/generator/templates/main@generator.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/generator/templates/main@generator.mps index f420d171..ce98745b 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/generator/templates/main@generator.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/generator/templates/main@generator.mps @@ -12,7 +12,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/jetbrains.mps.baseLanguage.sequence.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/jetbrains.mps.baseLanguage.sequence.mpl index ee47c3ee..ba4b0d42 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/jetbrains.mps.baseLanguage.sequence.mpl +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/jetbrains.mps.baseLanguage.sequence.mpl @@ -77,7 +77,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/models/jetbrains.mps.baseLanguage.sequence.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/models/jetbrains.mps.baseLanguage.sequence.types.mps index f5c323e4..42609b5c 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/models/jetbrains.mps.baseLanguage.sequence.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/models/jetbrains.mps.baseLanguage.sequence.types.mps @@ -3,7 +3,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -77,7 +77,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/generator/templates/main@generator.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/generator/templates/main@generator.mps index f268b18e..5cd09ea5 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/generator/templates/main@generator.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/generator/templates/main@generator.mps @@ -12,7 +12,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl index 1b459abc..9fee529d 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl @@ -81,7 +81,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps index 10628587..bd196f7d 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps @@ -3,7 +3,7 @@ - + @@ -94,7 +94,7 @@ - + @@ -162,7 +162,7 @@ - + @@ -216,7 +216,7 @@ - + @@ -319,6 +319,7 @@ + @@ -400,6 +401,9 @@ + + + @@ -474,6 +478,14 @@ + + + + + + + + @@ -525,6 +537,14 @@ + + + + + + + + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl index f102aa47..0825d595 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl @@ -39,7 +39,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.scripts.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.scripts.mps index 76677c57..ea8299fd 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.scripts.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.scripts.mps @@ -61,7 +61,7 @@ - + @@ -179,7 +179,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps index 668e7b52..f113419c 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps @@ -5,7 +5,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -149,7 +149,7 @@ - + @@ -231,7 +231,7 @@ - + @@ -271,7 +271,7 @@ - + @@ -390,7 +390,7 @@ - + @@ -499,7 +499,7 @@ - + @@ -764,9 +764,6 @@ - - - @@ -782,6 +779,7 @@ + @@ -906,6 +904,12 @@ + + + + + + @@ -16101,6 +16105,14 @@ + + + + + + + + @@ -16177,8 +16189,8 @@ - - + + @@ -16201,6 +16213,14 @@ + + + + + + + + @@ -16284,8 +16304,8 @@ - - + + @@ -16326,6 +16346,14 @@ + + + + + + + + @@ -16347,8 +16375,8 @@ - - + + @@ -16389,6 +16417,14 @@ + + + + + + + + @@ -16410,8 +16446,8 @@ - - + + @@ -16452,6 +16488,14 @@ + + + + + + + + @@ -16465,8 +16509,8 @@ - - + + @@ -16479,8 +16523,8 @@ - - + + @@ -16518,6 +16562,14 @@ + + + + + + + + @@ -16545,6 +16597,14 @@ + + + + + + + + @@ -16572,6 +16632,14 @@ + + + + + + + + @@ -16636,6 +16704,14 @@ + + + + + + + + @@ -16663,6 +16739,14 @@ + + + + + + + + @@ -16690,6 +16774,14 @@ + + + + + + + + @@ -28152,8 +28244,8 @@ - - + + @@ -28174,6 +28266,14 @@ + + + + + + + + @@ -28302,8 +28402,8 @@ - - + + @@ -28324,6 +28424,14 @@ + + + + + + + + @@ -29137,8 +29245,8 @@ - - + + @@ -29158,6 +29266,14 @@ + + + + + + + + @@ -30226,6 +30342,14 @@ + + + + + + + + @@ -30254,6 +30378,14 @@ + + + + + + + + @@ -30279,6 +30411,14 @@ + + + + + + + + @@ -30357,6 +30497,14 @@ + + + + + + + + @@ -30464,6 +30612,14 @@ + + + + + + + + @@ -30491,6 +30647,14 @@ + + + + + + + + @@ -30519,6 +30683,14 @@ + + + + + + + + @@ -30687,6 +30859,14 @@ + + + + + + + + @@ -30866,6 +31046,14 @@ + + + + + + + + @@ -30984,6 +31172,14 @@ + + + + + + + + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/generator/templates/main@generator.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/generator/templates/main@generator.mps index c0bfb8df..eafb3ab3 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/generator/templates/main@generator.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/generator/templates/main@generator.mps @@ -12,7 +12,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl index 6993a9d5..5af6582e 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl @@ -75,7 +75,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.types.mps index 388ead78..3b378777 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.types.mps @@ -3,7 +3,7 @@ - + @@ -45,7 +45,7 @@ - + @@ -72,7 +72,7 @@ - + @@ -144,6 +144,7 @@ + @@ -198,6 +199,9 @@ + + + @@ -1404,6 +1408,14 @@ + + + + + + + + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/generator/templates/jetbrains.mps.lang.behaviorExt.templates@generator.mps b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/generator/templates/jetbrains.mps.lang.behaviorExt.templates@generator.mps index 39a026c3..bba986a6 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/generator/templates/jetbrains.mps.lang.behaviorExt.templates@generator.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/generator/templates/jetbrains.mps.lang.behaviorExt.templates@generator.mps @@ -12,7 +12,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.lang.behaviorExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.lang.behaviorExt.mpl index 6e4d1afb..c9a852e7 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.lang.behaviorExt.mpl +++ b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.lang.behaviorExt.mpl @@ -78,7 +78,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.types.mps index 63bb77c8..050aec51 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.types.mps @@ -3,7 +3,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -80,7 +80,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/generator/templates/main@generator.mps b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/generator/templates/main@generator.mps index 2a8a6cec..0177bdf8 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/generator/templates/main@generator.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/generator/templates/main@generator.mps @@ -12,7 +12,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl index b26c04b5..3c74315a 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl +++ b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl @@ -89,7 +89,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps index e8e24b78..c0c674d1 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps @@ -2,7 +2,7 @@ - + @@ -72,7 +72,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -171,7 +171,7 @@ - + @@ -253,6 +253,7 @@ + @@ -329,6 +330,9 @@ + + + @@ -2976,6 +2980,14 @@ + + + + + + + + @@ -3009,6 +3021,14 @@ + + + + + + + + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/generator/templates/main@generator.mps b/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/generator/templates/main@generator.mps index 40bd2537..344425b5 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/generator/templates/main@generator.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/generator/templates/main@generator.mps @@ -12,7 +12,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/jetbrains.mps.lang.constraintsExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/jetbrains.mps.lang.constraintsExt.mpl index e59ff4f9..2b76ae10 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/jetbrains.mps.lang.constraintsExt.mpl +++ b/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/jetbrains.mps.lang.constraintsExt.mpl @@ -82,7 +82,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/models/jetbrains.mps.lang.constraintsExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/models/jetbrains.mps.lang.constraintsExt.types.mps index f54ce731..8f0b5168 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/models/jetbrains.mps.lang.constraintsExt.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/models/jetbrains.mps.lang.constraintsExt.types.mps @@ -3,7 +3,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -76,7 +76,7 @@ - + @@ -107,7 +107,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/generator/templates/main@generator.mps b/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/generator/templates/main@generator.mps index 8020b12d..31c5fe31 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/generator/templates/main@generator.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/generator/templates/main@generator.mps @@ -12,7 +12,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/jetbrains.mps.lang.generator.generationContextExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/jetbrains.mps.lang.generator.generationContextExt.mpl index 506f5ba9..f13b7cc7 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/jetbrains.mps.lang.generator.generationContextExt.mpl +++ b/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/jetbrains.mps.lang.generator.generationContextExt.mpl @@ -82,7 +82,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.types.mps index d4d3d26a..0473e913 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.types.mps @@ -3,7 +3,7 @@ - + @@ -74,7 +74,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -202,6 +202,7 @@ + @@ -260,6 +261,9 @@ + + + @@ -2570,6 +2574,14 @@ + + + + + + + + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/generator/templates/main@generator.mps b/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/generator/templates/main@generator.mps index 12cc9742..b4b91fa4 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/generator/templates/main@generator.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/generator/templates/main@generator.mps @@ -12,7 +12,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/jetbrains.mps.lang.generatorExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/jetbrains.mps.lang.generatorExt.mpl index f4e60895..b8cbd380 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/jetbrains.mps.lang.generatorExt.mpl +++ b/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/jetbrains.mps.lang.generatorExt.mpl @@ -82,7 +82,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/models/jetbrains.mps.lang.generatorExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/models/jetbrains.mps.lang.generatorExt.types.mps index c322189a..55c56e48 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/models/jetbrains.mps.lang.generatorExt.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/models/jetbrains.mps.lang.generatorExt.types.mps @@ -3,7 +3,7 @@ - + @@ -92,7 +92,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -201,7 +201,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.patternExt/generator/templates/jetbrains.mps.lang.patternExt.generator.templates@generator.mps b/samples/mpscore/languages/jetbrains.mps.lang.patternExt/generator/templates/jetbrains.mps.lang.patternExt.generator.templates@generator.mps index 54b24a30..bb6a0420 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.patternExt/generator/templates/jetbrains.mps.lang.patternExt.generator.templates@generator.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.patternExt/generator/templates/jetbrains.mps.lang.patternExt.generator.templates@generator.mps @@ -12,7 +12,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.patternExt/jetbrains.mps.lang.patternExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.patternExt/jetbrains.mps.lang.patternExt.mpl index f78302bc..59a4214e 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.patternExt/jetbrains.mps.lang.patternExt.mpl +++ b/samples/mpscore/languages/jetbrains.mps.lang.patternExt/jetbrains.mps.lang.patternExt.mpl @@ -85,7 +85,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.patternExt/models/jetbrains.mps.lang.patternExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.patternExt/models/jetbrains.mps.lang.patternExt.types.mps index 65496484..3da2c78f 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.patternExt/models/jetbrains.mps.lang.patternExt.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.patternExt/models/jetbrains.mps.lang.patternExt.types.mps @@ -3,7 +3,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -81,7 +81,7 @@ - + @@ -121,7 +121,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/generator/templates/main@generator.mps b/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/generator/templates/main@generator.mps index 97f83967..5ed47095 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/generator/templates/main@generator.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/generator/templates/main@generator.mps @@ -12,7 +12,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/jetbrains.mps.lang.quotationExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/jetbrains.mps.lang.quotationExt.mpl index 7d418a5c..bcdd7490 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/jetbrains.mps.lang.quotationExt.mpl +++ b/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/jetbrains.mps.lang.quotationExt.mpl @@ -84,7 +84,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/models/jetbrains.mps.lang.quotationExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/models/jetbrains.mps.lang.quotationExt.types.mps index b098f7ca..717482b4 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/models/jetbrains.mps.lang.quotationExt.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/models/jetbrains.mps.lang.quotationExt.types.mps @@ -3,7 +3,7 @@ - + @@ -70,7 +70,7 @@ - + @@ -92,7 +92,7 @@ - + @@ -131,7 +131,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.scopesExt/generator/templates/jetbrains.mps.lang.scopesExt.generator.templates@generator.mps b/samples/mpscore/languages/jetbrains.mps.lang.scopesExt/generator/templates/jetbrains.mps.lang.scopesExt.generator.templates@generator.mps index 4039eee3..c7b73359 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.scopesExt/generator/templates/jetbrains.mps.lang.scopesExt.generator.templates@generator.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.scopesExt/generator/templates/jetbrains.mps.lang.scopesExt.generator.templates@generator.mps @@ -12,7 +12,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.scopesExt/jetbrains.mps.lang.scopesExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.scopesExt/jetbrains.mps.lang.scopesExt.mpl index e1b84a56..afa3c836 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.scopesExt/jetbrains.mps.lang.scopesExt.mpl +++ b/samples/mpscore/languages/jetbrains.mps.lang.scopesExt/jetbrains.mps.lang.scopesExt.mpl @@ -76,7 +76,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.scopesExt/models/jetbrains.mps.lang.scopesExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.scopesExt/models/jetbrains.mps.lang.scopesExt.types.mps index 6d00e5f6..23f1b19f 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.scopesExt/models/jetbrains.mps.lang.scopesExt.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.scopesExt/models/jetbrains.mps.lang.scopesExt.types.mps @@ -3,7 +3,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.scriptExt/generator/templates/jetbrains.mps.lang.scriptExt.generator.templates@generator.mps b/samples/mpscore/languages/jetbrains.mps.lang.scriptExt/generator/templates/jetbrains.mps.lang.scriptExt.generator.templates@generator.mps index c4f6bf58..acde3b14 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.scriptExt/generator/templates/jetbrains.mps.lang.scriptExt.generator.templates@generator.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.scriptExt/generator/templates/jetbrains.mps.lang.scriptExt.generator.templates@generator.mps @@ -12,7 +12,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.scriptExt/jetbrains.mps.lang.scriptExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.scriptExt/jetbrains.mps.lang.scriptExt.mpl index 6afb1e13..8dcd6dba 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.scriptExt/jetbrains.mps.lang.scriptExt.mpl +++ b/samples/mpscore/languages/jetbrains.mps.lang.scriptExt/jetbrains.mps.lang.scriptExt.mpl @@ -80,7 +80,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.scriptExt/models/jetbrains.mps.lang.scriptExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.scriptExt/models/jetbrains.mps.lang.scriptExt.types.mps index 65142890..bd5c1e51 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.scriptExt/models/jetbrains.mps.lang.scriptExt.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.scriptExt/models/jetbrains.mps.lang.scriptExt.types.mps @@ -3,7 +3,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/generator/templates/jetbrains.mps.lang.smodel.queryExt.generator.templates@generator.mps b/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/generator/templates/jetbrains.mps.lang.smodel.queryExt.generator.templates@generator.mps index da1884b9..548699bc 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/generator/templates/jetbrains.mps.lang.smodel.queryExt.generator.templates@generator.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/generator/templates/jetbrains.mps.lang.smodel.queryExt.generator.templates@generator.mps @@ -12,7 +12,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/jetbrains.mps.lang.smodel.queryExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/jetbrains.mps.lang.smodel.queryExt.mpl index 0b274c9b..db04ce49 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/jetbrains.mps.lang.smodel.queryExt.mpl +++ b/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/jetbrains.mps.lang.smodel.queryExt.mpl @@ -82,7 +82,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/models/jetbrains.mps.lang.smodel.queryExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/models/jetbrains.mps.lang.smodel.queryExt.types.mps index a28e9a86..c4c9dddf 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/models/jetbrains.mps.lang.smodel.queryExt.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/models/jetbrains.mps.lang.smodel.queryExt.types.mps @@ -3,7 +3,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -100,7 +100,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/generator/templates/main@generator.mps b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/generator/templates/main@generator.mps index efb9c737..bf2a9770 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/generator/templates/main@generator.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/generator/templates/main@generator.mps @@ -12,7 +12,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.mpl index 77da996e..d22fbee8 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.mpl +++ b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.mpl @@ -93,7 +93,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps index 220b4e98..ab443809 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps @@ -3,7 +3,7 @@ - + @@ -484,6 +484,7 @@ + @@ -581,6 +582,9 @@ + + + @@ -3853,7 +3857,7 @@ - + @@ -3862,7 +3866,7 @@ - + @@ -3879,7 +3883,7 @@ - + @@ -4248,6 +4252,14 @@ + + + + + + + + @@ -4315,6 +4327,14 @@ + + + + + + + + @@ -4382,6 +4402,14 @@ + + + + + + + + @@ -4449,6 +4477,14 @@ + + + + + + + + @@ -4516,6 +4552,14 @@ + + + + + + + + @@ -4583,6 +4627,14 @@ + + + + + + + + @@ -4675,6 +4727,14 @@ + + + + + + + + @@ -4702,6 +4762,14 @@ + + + + + + + + @@ -4729,6 +4797,14 @@ + + + + + + + + @@ -4756,6 +4832,14 @@ + + + + + + + + @@ -4783,6 +4867,14 @@ + + + + + + + + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.testExt/generator/templates/jetbrains.mps.lang.testExt.generator.templates@generator.mps b/samples/mpscore/languages/jetbrains.mps.lang.testExt/generator/templates/jetbrains.mps.lang.testExt.generator.templates@generator.mps index 632747f0..6b6786b9 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.testExt/generator/templates/jetbrains.mps.lang.testExt.generator.templates@generator.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.testExt/generator/templates/jetbrains.mps.lang.testExt.generator.templates@generator.mps @@ -12,7 +12,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.testExt/jetbrains.mps.lang.testExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.testExt/jetbrains.mps.lang.testExt.mpl index 4b8e12b8..e2332333 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.testExt/jetbrains.mps.lang.testExt.mpl +++ b/samples/mpscore/languages/jetbrains.mps.lang.testExt/jetbrains.mps.lang.testExt.mpl @@ -81,7 +81,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.testExt/models/jetbrains.mps.lang.testExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.testExt/models/jetbrains.mps.lang.testExt.types.mps index cfb2b962..61cf5635 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.testExt/models/jetbrains.mps.lang.testExt.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.testExt/models/jetbrains.mps.lang.testExt.types.mps @@ -3,7 +3,7 @@ - + @@ -70,7 +70,7 @@ - + @@ -95,7 +95,7 @@ - + @@ -134,7 +134,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/generator/templates/jetbrains.mps.lang.typecheckingExt.generator.templates@generator.mps b/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/generator/templates/jetbrains.mps.lang.typecheckingExt.generator.templates@generator.mps index e33400ec..4dec9d92 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/generator/templates/jetbrains.mps.lang.typecheckingExt.generator.templates@generator.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/generator/templates/jetbrains.mps.lang.typecheckingExt.generator.templates@generator.mps @@ -12,7 +12,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/jetbrains.mps.lang.typecheckingExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/jetbrains.mps.lang.typecheckingExt.mpl index ecabb356..e6ecc680 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/jetbrains.mps.lang.typecheckingExt.mpl +++ b/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/jetbrains.mps.lang.typecheckingExt.mpl @@ -90,7 +90,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/models/jetbrains.mps.lang.typecheckingExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/models/jetbrains.mps.lang.typecheckingExt.types.mps index f71490e4..27aecdf4 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/models/jetbrains.mps.lang.typecheckingExt.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/models/jetbrains.mps.lang.typecheckingExt.types.mps @@ -20,7 +20,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/generator/templates/main@generator.mps b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/generator/templates/main@generator.mps index 9a0296ac..432eb391 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/generator/templates/main@generator.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/generator/templates/main@generator.mps @@ -12,7 +12,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/jetbrains.mps.lang.typesystemExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/jetbrains.mps.lang.typesystemExt.mpl index 764a751d..06950c06 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/jetbrains.mps.lang.typesystemExt.mpl +++ b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/jetbrains.mps.lang.typesystemExt.mpl @@ -91,7 +91,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.types.mps index 94a2be4f..6e3b8e75 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.types.mps @@ -3,7 +3,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -173,7 +173,7 @@ - + @@ -220,9 +220,6 @@ - - - @@ -234,6 +231,7 @@ + @@ -303,6 +301,12 @@ + + + + + + @@ -357,6 +361,14 @@ + + + + + + + + @@ -395,8 +407,8 @@ - - + + @@ -471,6 +483,14 @@ + + + + + + + + @@ -509,8 +529,8 @@ - - + + @@ -585,6 +605,14 @@ + + + + + + + + diff --git a/samples/mpscore/languages/jetbrains.mps.logicExt/generator/templates/main@generator.mps b/samples/mpscore/languages/jetbrains.mps.logicExt/generator/templates/main@generator.mps index 07b0a6d0..8618b204 100644 --- a/samples/mpscore/languages/jetbrains.mps.logicExt/generator/templates/main@generator.mps +++ b/samples/mpscore/languages/jetbrains.mps.logicExt/generator/templates/main@generator.mps @@ -12,7 +12,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.logicExt/jetbrains.mps.logicExt.mpl b/samples/mpscore/languages/jetbrains.mps.logicExt/jetbrains.mps.logicExt.mpl index 52a07a4e..2c5b7b46 100644 --- a/samples/mpscore/languages/jetbrains.mps.logicExt/jetbrains.mps.logicExt.mpl +++ b/samples/mpscore/languages/jetbrains.mps.logicExt/jetbrains.mps.logicExt.mpl @@ -77,7 +77,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.types.mps b/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.types.mps index 1ef166e8..f6560007 100644 --- a/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.types.mps @@ -3,7 +3,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -144,7 +144,7 @@ - + @@ -227,9 +227,6 @@ - - - @@ -241,6 +238,7 @@ + @@ -321,6 +319,12 @@ + + + + + + @@ -2383,8 +2387,8 @@ - - + + @@ -2425,6 +2429,14 @@ + + + + + + + + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.closures.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.closures.mps index 3331990b..f9697b2f 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.closures.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.closures.mps @@ -105,7 +105,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -168,7 +168,7 @@ - + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.closures@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.closures@tests.mps index 80060532..34281d13 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.closures@tests.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.closures@tests.mps @@ -64,11 +64,11 @@ - + - + @@ -88,7 +88,7 @@ - + @@ -128,7 +128,7 @@ - + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections.mps index d84bdc44..8db14859 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections.mps @@ -89,7 +89,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -142,7 +142,7 @@ - + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections@tests.mps index 082b021b..58195307 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections@tests.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections@tests.mps @@ -65,11 +65,11 @@ - + - + @@ -92,7 +92,7 @@ - + @@ -132,7 +132,7 @@ - + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.collections.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.collections.mps index 6ddd911a..adeb0f69 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.collections.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.collections.mps @@ -91,7 +91,7 @@ - + @@ -106,7 +106,7 @@ - + @@ -135,7 +135,7 @@ - + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.containers@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.containers@tests.mps index 9445674b..e117e3d9 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.containers@tests.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.containers@tests.mps @@ -66,11 +66,11 @@ - + - + @@ -93,7 +93,7 @@ - + @@ -126,7 +126,7 @@ - + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.incremental@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.incremental@tests.mps index fcca9d1a..65858fad 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.incremental@tests.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.incremental@tests.mps @@ -116,7 +116,7 @@ - + @@ -133,7 +133,7 @@ - + @@ -168,7 +168,7 @@ - + @@ -246,7 +246,7 @@ - + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.sequence.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.sequence.mps index 1ada1f30..2c982988 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.sequence.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.sequence.mps @@ -73,7 +73,7 @@ - + @@ -90,7 +90,7 @@ - + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.sequence@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.sequence@tests.mps index d40050bc..74d721c1 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.sequence@tests.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.sequence@tests.mps @@ -63,11 +63,11 @@ - + - + @@ -87,7 +87,7 @@ - + @@ -127,7 +127,7 @@ - + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples.mps index 64683ac7..c80d1e3e 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples.mps @@ -92,7 +92,7 @@ - + @@ -107,7 +107,7 @@ - + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples@tests.mps index 07f3b841..bfa5a8f5 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples@tests.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples@tests.mps @@ -64,11 +64,11 @@ - + - + @@ -88,7 +88,7 @@ - + @@ -128,7 +128,7 @@ - + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.features.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.features.mps index 51f9a6c5..e50542c6 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.features.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.features.mps @@ -215,7 +215,7 @@ - + @@ -259,7 +259,7 @@ - + @@ -316,7 +316,7 @@ - + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.generics.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.generics.mps index cd83d5a4..c2f8aa22 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.generics.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.generics.mps @@ -136,7 +136,7 @@ - + @@ -173,7 +173,7 @@ - + @@ -203,7 +203,7 @@ - + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.staging.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.staging.mps index 78d8d2cf..9849d7e7 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.staging.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.staging.mps @@ -86,7 +86,7 @@ - + @@ -117,7 +117,7 @@ - + @@ -136,7 +136,7 @@ - + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.thinlet.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.thinlet.mps index 3dfcfefb..b81c4fd2 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.thinlet.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.thinlet.mps @@ -179,7 +179,7 @@ - + @@ -212,7 +212,7 @@ - + @@ -277,7 +277,7 @@ - + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.features@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.features@tests.mps index 80c6622e..77a2c0f3 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.features@tests.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.features@tests.mps @@ -65,11 +65,11 @@ - + - + @@ -92,7 +92,7 @@ - + @@ -135,7 +135,7 @@ - + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.generics@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.generics@tests.mps index f830421c..b19504eb 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.generics@tests.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.generics@tests.mps @@ -67,14 +67,14 @@ - + - + @@ -97,7 +97,7 @@ - + @@ -137,7 +137,7 @@ - + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps index 8dff8b6f..cb13ec89 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps @@ -76,7 +76,7 @@ - + @@ -193,7 +193,7 @@ - + @@ -219,7 +219,7 @@ - + @@ -255,7 +255,7 @@ - + @@ -331,7 +331,7 @@ - + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.staging@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.staging@tests.mps index ed4d8476..fe0cae64 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.staging@tests.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.staging@tests.mps @@ -66,14 +66,14 @@ - + - + @@ -93,7 +93,7 @@ - + @@ -133,7 +133,7 @@ - + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.thinlet@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.thinlet@tests.mps index 86d702f6..b4063a49 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.thinlet@tests.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.thinlet@tests.mps @@ -84,7 +84,7 @@ - + @@ -96,7 +96,7 @@ - + @@ -116,7 +116,7 @@ - + @@ -165,7 +165,7 @@ - + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps index ff599a31..34ad357c 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps @@ -161,7 +161,7 @@ - + @@ -185,7 +185,7 @@ - + @@ -218,7 +218,7 @@ - + @@ -227,7 +227,7 @@ - + @@ -255,7 +255,7 @@ - + @@ -342,7 +342,7 @@ - + diff --git a/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.types@tests.mps b/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.types@tests.mps index 37ffc4e5..48e02884 100644 --- a/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.types@tests.mps +++ b/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.types@tests.mps @@ -96,7 +96,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -142,7 +142,7 @@ - + @@ -199,7 +199,7 @@ - + diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds@tests.mps index f2c26bbf..de65bca8 100644 --- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds@tests.mps +++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds@tests.mps @@ -70,14 +70,14 @@ - + - + @@ -97,7 +97,7 @@ - + @@ -137,7 +137,7 @@ - + diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps index 8cb72313..b93385e6 100644 --- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps +++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps @@ -67,14 +67,14 @@ - + - + @@ -97,7 +97,7 @@ - + @@ -137,7 +137,7 @@ - + diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.bounds.bad.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.bounds.bad.mps index ba903746..6b8c32e7 100644 --- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.bounds.bad.mps +++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.bounds.bad.mps @@ -64,7 +64,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -89,7 +89,7 @@ - + diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.bounds.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.bounds.mps index b48a76a5..cab42b99 100644 --- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.bounds.mps +++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.bounds.mps @@ -86,7 +86,7 @@ - + @@ -105,7 +105,7 @@ - + @@ -118,7 +118,7 @@ - + diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.helloWorld.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.helloWorld.mps index 8a9e4db4..be9d9182 100644 --- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.helloWorld.mps +++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.helloWorld.mps @@ -112,7 +112,7 @@ - + @@ -132,7 +132,7 @@ - + @@ -148,7 +148,7 @@ - + diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.hugeSample.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.hugeSample.mps index da74f80d..4287d397 100644 --- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.hugeSample.mps +++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.hugeSample.mps @@ -54,7 +54,7 @@ - + @@ -65,13 +65,13 @@ - + - +