natas_hw
/
mps-coderules
mirror of https://github.com/JetBrains/mps-coderules
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migrated to MPS2017.3.

This commit is contained in:
Fedor Isakov 2017-12-06 16:36:28 +01:00
parent f87cbe6de8
commit d3a4e21ca9
14 changed files with 350 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
build.xml
View File

@ -116,9 +116,7 @@
<mkdir dir="${build.tmp}/default/jetbrains.mps.logic.reactor.jar/META-INF" />
<echoxml file="${build.tmp}/default/jetbrains.mps.logic.reactor.jar/META-INF/module.xml">
<module namespace="jetbrains.mps.logic.reactor" type="solution" uuid="bbf5c548-7111-4a53-a117-cdefc664cf34">
<dependencies>
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
</dependencies>
<dependencies />
<library jar="lib/collection-0.7.jar" />
<library jar="lib/conreactor-api-0.9.jar" />
<library jar="lib/conreactor-core-0.9.jar" />
@ -835,7 +833,7 @@
<mkdir dir="${build.tmp}/default/typechecking-0.2.zip/typechecking" />
<mkdir dir="${build.tmp}/default/typechecking-0.2.zip/typechecking/META-INF" />
<echoxml file="${build.tmp}/default/typechecking-0.2.zip/typechecking/META-INF/plugin.xml">
<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
<id>jetbrains.mps.typechecking</id>
<name>Typechecking with Constraint Rules</name>
<description>Experimental support for type checking with constraint rules</description>
@ -937,9 +935,7 @@
<mkdir dir="${build.tmp}/default/jetbrains.mps.logic.reactor.jar1/META-INF" />
<echoxml file="${build.tmp}/default/jetbrains.mps.logic.reactor.jar1/META-INF/module.xml">
<module namespace="jetbrains.mps.logic.reactor" type="solution" uuid="bbf5c548-7111-4a53-a117-cdefc664cf34">
<dependencies>
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
</dependencies>
<dependencies />
<library jar="../lib/collection-0.7.jar" />
<library jar="../lib/conreactor-api-0.9.jar" />
<library jar="../lib/conreactor-core-0.9.jar" />
@ -1392,7 +1388,14 @@
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-descriptor.devkit" />
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.constraints.jar" />
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.structure.jar" />
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.typesystem.jar" />
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.bootstrap-languages.jar" />
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.general-purpose.jar" />
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-descriptor.jar" />
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-design.jar" />
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.templates.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
@ -1436,6 +1439,7 @@
<library file="${artifacts.mps}/languages/make/jetbrains.mps.make.reduced.jar" />
<library file="${artifacts.mps}/languages/make/jetbrains.mps.make.script.jar" />
<library file="${artifacts.mps}/languages/make/jetbrains.mps.tool.gentest.jar" />
<library file="${artifacts.mps}/languages/text/jetbrains.mps.lang.text.jar" />
<library file="${artifacts.mps}/languages/workbench/jetbrains.mps.lang.plugin.standalone.jar" />
<library file="${artifacts.mps}/languages/xml/jetbrains.mps.core.xml.jar" />
<library file="${artifacts.mps}/lib/mps-behavior-api.jar" />
@ -1452,7 +1456,6 @@
<library file="${artifacts.mps}/lib/mps-tool.jar" />
<library file="${artifacts.mps}/lib/mps-tuples.jar" />
<library file="${artifacts.mps}/lib/mps-workbench.jar" />
<library file="${artifacts.mps}/plugins/mps-core/languages/util/jetbrains.mps.core.properties.jar" />
<library file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
<library file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
<library file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
@ -2058,14 +2061,11 @@
<fileset dir="${artifacts.mps}/lib" includes="*.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
<fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
<fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
<fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
@ -2344,14 +2344,11 @@
<fileset dir="${artifacts.mps}/lib" includes="*.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
<fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
<fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
<fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
@ -2414,13 +2411,10 @@
<fileset dir="${artifacts.mps}/lib" includes="*.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
<fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
<fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
<fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
@ -2447,7 +2441,13 @@
<pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
<pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
<pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
<pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-descriptor.devkit" />
<pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.constraints.jar" />
<pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.structure.jar" />
<pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.typesystem.jar" />
<pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.bootstrap-languages.jar" />
<pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.general-purpose.jar" />
<pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-descriptor.jar" />
<pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-design.jar" />
<pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
<pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
<pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
@ -2483,6 +2483,7 @@
<pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.refactoring.participant.jar" />
<pathelement location="${artifacts.mps}/languages/make/jetbrains.mps.make.reduced.jar" />
<pathelement location="${artifacts.mps}/languages/make/jetbrains.mps.tool.gentest.jar" />
<pathelement location="${artifacts.mps}/languages/text/jetbrains.mps.lang.text.jar" />
<pathelement location="${artifacts.mps}/lib/mps-behavior-api.jar" />
<pathelement location="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
<pathelement location="${artifacts.mps}/lib/mps-closures.jar" />

6
logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
View File

@ -30,7 +30,8 @@
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="5" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="6" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="1" />
</languageVersions>
@ -114,7 +115,8 @@
<language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="0" />
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="5" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="6" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="1" />

1
logic/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
View File

@ -20,6 +20,7 @@
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
</languageVersions>
<dependencyVersions>

1
logic/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd
View File

@ -30,6 +30,7 @@
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="2" />
</languageVersions>

3
typechecking/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
View File

@ -34,7 +34,8 @@
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="5" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="6" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="1" />
<language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.typesystem2" version="7" />

3
typechecking/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
View File

@ -33,7 +33,8 @@
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="5" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="6" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="1" />
</languageVersions>

2
typechecking/solutions/jetbrains.mps.typechecking.build/jetbrains.mps.typechecking.build.msd
View File

@ -11,7 +11,7 @@
</dependencies>
<languageVersions>
<language slang="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" version="0" />
<language slang="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="3" />
<language slang="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="5" />
<language slang="l:427a473d-5177-432c-9905-bcbceb71b996:jetbrains.mps.build.mps.runner" version="0" />
<language slang="l:9f846aef-4e4a-4a84-828e-7e83fe2697f2:jetbrains.mps.build.mps.testManifest" version="0" />
<language slang="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" version="0" />

307
typechecking/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
View File

@ -4,7 +4,7 @@
<languages>
<use id="427a473d-5177-432c-9905-bcbceb71b996" name="jetbrains.mps.build.mps.runner" version="0" />
<use id="698a8d22-a104-47a0-ba8d-10e3ec237f13" name="jetbrains.mps.build.workflow" version="0" />
<use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="3" />
<use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="5" />
<use id="d5033cee-f632-44b6-b308-89d4fbde34ff" name="jetbrains.mps.build.startup" version="0" />
<use id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build" version="0" />
<use id="9f846aef-4e4a-4a84-828e-7e83fe2697f2" name="jetbrains.mps.build.mps.testManifest" version="0" />
@ -72,10 +72,17 @@
<child id="5617550519002745378" name="macros" index="1l3spd" />
<child id="5617550519002745372" name="layout" index="1l3spN" />
</concept>
<concept id="8654221991637384182" name="jetbrains.mps.build.structure.BuildFileIncludesSelector" flags="ng" index="3qWCbU">
<property id="8654221991637384184" name="pattern" index="3qWCbO" />
</concept>
<concept id="4701820937132344003" name="jetbrains.mps.build.structure.BuildLayout_Container" flags="ng" index="1y1bJS">
<child id="7389400916848037006" name="children" index="39821P" />
</concept>
<concept id="841011766566059607" name="jetbrains.mps.build.structure.BuildStringNotEmpty" flags="ng" index="3_J27D" />
<concept id="5248329904287794596" name="jetbrains.mps.build.structure.BuildInputFiles" flags="ng" index="3LXTmp">
<child id="5248329904287794598" name="dir" index="3LXTmr" />
<child id="5248329904287794679" name="selectors" index="3LXTna" />
</concept>
<concept id="4903714810883702019" name="jetbrains.mps.build.structure.BuildTextStringPart" flags="ng" index="3Mxwew">
<property id="4903714810883755350" name="text" index="3MwjfP" />
</concept>
@ -115,12 +122,16 @@
<concept id="868032131020265945" name="jetbrains.mps.build.mps.structure.BuildMPSPlugin" flags="ng" index="3b7kt6" />
<concept id="5253498789149381388" name="jetbrains.mps.build.mps.structure.BuildMps_Module" flags="ng" index="3bQrTs">
<property id="1500819558096356884" name="doNotCompile" index="2GAjPV" />
<child id="5253498789149547825" name="sources" index="3bR31x" />
<child id="5253498789149547704" name="dependencies" index="3bR37C" />
</concept>
<concept id="5253498789149585690" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleDependencyOnModule" flags="ng" index="3bR9La">
<property id="5253498789149547713" name="reexport" index="3bR36h" />
<reference id="5253498789149547705" name="module" index="3bR37D" />
</concept>
<concept id="763829979718664966" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleResources" flags="ng" index="3rtmxn">
<child id="763829979718664967" name="files" index="3rtmxm" />
</concept>
<concept id="5507251971038816436" name="jetbrains.mps.build.mps.structure.BuildMps_Generator" flags="ng" index="1yeLz9" />
<concept id="4356762679305675652" name="jetbrains.mps.build.mps.structure.BuildMpsLayout_ModuleXml_CustomJarLocation" flags="ng" index="3yLZsm">
<property id="4356762679305675654" name="packagedLocation" index="3yLZsk" />
@ -309,6 +320,24 @@
</node>
</node>
</node>
<node concept="3rtmxn" id="3Z6zOnxMpzt" role="3bR31x">
<node concept="3LXTmp" id="3Z6zOnxMpzu" role="3rtmxm">
<node concept="3qWCbU" id="3Z6zOnxMpzv" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="55IIr" id="3Z6zOnxMpzw" role="3LXTmr">
<node concept="2Ry0Ak" id="3Z6zOnxMpzx" role="iGT6I">
<property role="2Ry0Am" value="logic" />
<node concept="2Ry0Ak" id="3Z6zOnxMpzy" role="2Ry0An">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="3Z6zOnxMpzz" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.logic" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1E1JtA" id="7BVjoXzUx$V" role="2G$12L">
<property role="BnDLt" value="true" />
@ -344,6 +373,27 @@
<ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
</node>
</node>
<node concept="3rtmxn" id="3Z6zOnxMp$u" role="3bR31x">
<node concept="3LXTmp" id="3Z6zOnxMp$v" role="3rtmxm">
<node concept="3qWCbU" id="3Z6zOnxMp$w" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="55IIr" id="3Z6zOnxMp$x" role="3LXTmr">
<node concept="2Ry0Ak" id="3Z6zOnxMp$y" role="iGT6I">
<property role="2Ry0Am" value="logic" />
<node concept="2Ry0Ak" id="3Z6zOnxMp$z" role="2Ry0An">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="3Z6zOnxMp$$" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.logic" />
<node concept="2Ry0Ak" id="3Z6zOnxMp$_" role="2Ry0An">
<property role="2Ry0Am" value="runtime" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1E1JtA" id="7BVjoXzUxoR" role="2G$12L">
<property role="BnDLt" value="true" />
@ -514,6 +564,24 @@
</node>
</node>
</node>
<node concept="3rtmxn" id="3Z6zOnxMp$6" role="3bR31x">
<node concept="3LXTmp" id="3Z6zOnxMp$7" role="3rtmxm">
<node concept="3qWCbU" id="3Z6zOnxMp$8" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="55IIr" id="3Z6zOnxMp$9" role="3LXTmr">
<node concept="2Ry0Ak" id="3Z6zOnxMp$a" role="iGT6I">
<property role="2Ry0Am" value="logic" />
<node concept="2Ry0Ak" id="3Z6zOnxMp$b" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="3Z6zOnxMp$c" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.logic.reactor" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2G$12M" id="7Ant4WkHLpc" role="3989C9">
@ -600,6 +668,24 @@
</node>
</node>
</node>
<node concept="3rtmxn" id="3Z6zOnxMpzP" role="3bR31x">
<node concept="3LXTmp" id="3Z6zOnxMpzQ" role="3rtmxm">
<node concept="3qWCbU" id="3Z6zOnxMpzR" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="55IIr" id="3Z6zOnxMpzS" role="3LXTmr">
<node concept="2Ry0Ak" id="3Z6zOnxMpzT" role="iGT6I">
<property role="2Ry0Am" value="logic" />
<node concept="2Ry0Ak" id="3Z6zOnxMpzU" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="3Z6zOnxMpzV" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.logic.test" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2G$12M" id="7BVjoXzUx6$" role="3989C9">
@ -801,6 +887,24 @@
<ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
</node>
</node>
<node concept="3rtmxn" id="3Z6zOnxMpyH" role="3bR31x">
<node concept="3LXTmp" id="3Z6zOnxMpyI" role="3rtmxm">
<node concept="3qWCbU" id="3Z6zOnxMpyJ" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="55IIr" id="3Z6zOnxMpyK" role="3LXTmr">
<node concept="2Ry0Ak" id="3Z6zOnxMpyL" role="iGT6I">
<property role="2Ry0Am" value="typesystem2" />
<node concept="2Ry0Ak" id="3Z6zOnxMpyM" role="2Ry0An">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="3Z6zOnxMpyN" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.lang.typesystem2" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1E1JtA" id="7BVjoXzUxee" role="2G$12L">
<property role="BnDLt" value="true" />
@ -866,6 +970,27 @@
<ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
</node>
</node>
<node concept="3rtmxn" id="3Z6zOnxMpzX" role="3bR31x">
<node concept="3LXTmp" id="3Z6zOnxMpzY" role="3rtmxm">
<node concept="3qWCbU" id="3Z6zOnxMpzZ" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="55IIr" id="3Z6zOnxMp$0" role="3LXTmr">
<node concept="2Ry0Ak" id="3Z6zOnxMp$1" role="iGT6I">
<property role="2Ry0Am" value="typesystem2" />
<node concept="2Ry0Ak" id="3Z6zOnxMp$2" role="2Ry0An">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="3Z6zOnxMp$3" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.lang.typesystem2" />
<node concept="2Ry0Ak" id="3Z6zOnxMp$4" role="2Ry0An">
<property role="2Ry0Am" value="runtime" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1E1JtA" id="7BVjoXzUx9d" role="2G$12L">
<property role="BnDLt" value="true" />
@ -916,6 +1041,24 @@
<ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
</node>
</node>
<node concept="3rtmxn" id="3Z6zOnxMpzd" role="3bR31x">
<node concept="3LXTmp" id="3Z6zOnxMpze" role="3rtmxm">
<node concept="3qWCbU" id="3Z6zOnxMpzf" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="55IIr" id="3Z6zOnxMpzg" role="3LXTmr">
<node concept="2Ry0Ak" id="3Z6zOnxMpzh" role="iGT6I">
<property role="2Ry0Am" value="typesystem2" />
<node concept="2Ry0Ak" id="3Z6zOnxMpzi" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="3Z6zOnxMpzj" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.lang.typesystem2.template" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1E1JtD" id="3u5wJtgiSM" role="2G$12L">
<property role="BnDLt" value="true" />
@ -963,6 +1106,24 @@
</node>
</node>
</node>
<node concept="3rtmxn" id="3Z6zOnxMpz_" role="3bR31x">
<node concept="3LXTmp" id="3Z6zOnxMpzA" role="3rtmxm">
<node concept="3qWCbU" id="3Z6zOnxMpzB" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="55IIr" id="3Z6zOnxMpzC" role="3LXTmr">
<node concept="2Ry0Ak" id="3Z6zOnxMpzD" role="iGT6I">
<property role="2Ry0Am" value="typesystem2" />
<node concept="2Ry0Ak" id="3Z6zOnxMpzE" role="2Ry0An">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="3Z6zOnxMpzF" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.lang.smodel.types" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2G$12M" id="5pz4PwHqqGu" role="3989C9">
@ -1059,6 +1220,24 @@
<ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
</node>
</node>
<node concept="3rtmxn" id="3Z6zOnxMp$B" role="3bR31x">
<node concept="3LXTmp" id="3Z6zOnxMp$C" role="3rtmxm">
<node concept="3qWCbU" id="3Z6zOnxMp$D" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="55IIr" id="3Z6zOnxMp$E" role="3LXTmr">
<node concept="2Ry0Ak" id="3Z6zOnxMp$F" role="iGT6I">
<property role="2Ry0Am" value="typechecking" />
<node concept="2Ry0Ak" id="3Z6zOnxMp$G" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="3Z6zOnxMp$H" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.typechecking.test" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2G$12M" id="65DJywFj0uW" role="3989C9">
@ -1202,6 +1381,24 @@
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
</node>
</node>
<node concept="3rtmxn" id="3Z6zOnxMp$m" role="3bR31x">
<node concept="3LXTmp" id="3Z6zOnxMp$n" role="3rtmxm">
<node concept="3qWCbU" id="3Z6zOnxMp$o" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="55IIr" id="3Z6zOnxMp$p" role="3LXTmr">
<node concept="2Ry0Ak" id="3Z6zOnxMp$q" role="iGT6I">
<property role="2Ry0Am" value="typechecking" />
<node concept="2Ry0Ak" id="3Z6zOnxMp$r" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="3Z6zOnxMp$s" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.typechecking" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1E1JtA" id="55Q$YFtvwQY" role="2G$12L">
<property role="BnDLt" value="true" />
@ -1306,6 +1503,24 @@
<ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
</node>
</node>
<node concept="3rtmxn" id="3Z6zOnxMpzH" role="3bR31x">
<node concept="3LXTmp" id="3Z6zOnxMpzI" role="3rtmxm">
<node concept="3qWCbU" id="3Z6zOnxMpzJ" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="55IIr" id="3Z6zOnxMpzK" role="3LXTmr">
<node concept="2Ry0Ak" id="3Z6zOnxMpzL" role="iGT6I">
<property role="2Ry0Am" value="typechecking" />
<node concept="2Ry0Ak" id="3Z6zOnxMpzM" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="3Z6zOnxMpzN" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.typechecking.ui" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1E1JtD" id="46o4wsH5PJF" role="2G$12L">
<property role="BnDLt" value="true" />
@ -1338,6 +1553,24 @@
<ref role="3bR37D" to="ffeo:7Kfy9QB6L4X" resolve="jetbrains.mps.lang.editor" />
</node>
</node>
<node concept="3rtmxn" id="3Z6zOnxMpz5" role="3bR31x">
<node concept="3LXTmp" id="3Z6zOnxMpz6" role="3rtmxm">
<node concept="3qWCbU" id="3Z6zOnxMpz7" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="55IIr" id="3Z6zOnxMpz8" role="3LXTmr">
<node concept="2Ry0Ak" id="3Z6zOnxMpz9" role="iGT6I">
<property role="2Ry0Am" value="typechecking" />
<node concept="2Ry0Ak" id="3Z6zOnxMpza" role="2Ry0An">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="3Z6zOnxMpzb" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.typechecking.annotation" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1E1JtD" id="7Ant4WkHLsF" role="2G$12L">
<property role="BnDLt" value="true" />
@ -1393,6 +1626,24 @@
<ref role="3bR37D" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.typesystem2.template" />
</node>
</node>
<node concept="3rtmxn" id="3Z6zOnxMp$e" role="3bR31x">
<node concept="3LXTmp" id="3Z6zOnxMp$f" role="3rtmxm">
<node concept="3qWCbU" id="3Z6zOnxMp$g" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="55IIr" id="3Z6zOnxMp$h" role="3LXTmr">
<node concept="2Ry0Ak" id="3Z6zOnxMp$i" role="iGT6I">
<property role="2Ry0Am" value="typechecking" />
<node concept="2Ry0Ak" id="3Z6zOnxMp$j" role="2Ry0An">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="3Z6zOnxMp$k" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.baseLanguageExt" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1E1JtA" id="46o4wsH5O3R" role="2G$12L">
<property role="BnDLt" value="true" />
@ -1420,6 +1671,24 @@
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
</node>
</node>
<node concept="3rtmxn" id="3Z6zOnxMpyP" role="3bR31x">
<node concept="3LXTmp" id="3Z6zOnxMpyQ" role="3rtmxm">
<node concept="3qWCbU" id="3Z6zOnxMpyR" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="55IIr" id="3Z6zOnxMpyS" role="3LXTmr">
<node concept="2Ry0Ak" id="3Z6zOnxMpyT" role="iGT6I">
<property role="2Ry0Am" value="typechecking" />
<node concept="2Ry0Ak" id="3Z6zOnxMpyU" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="3Z6zOnxMpyV" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.typechecking.sample" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2G$12M" id="7Ant4WkHLsE" role="3989C9">
@ -1486,6 +1755,24 @@
<ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
</node>
</node>
<node concept="3rtmxn" id="3Z6zOnxMpyX" role="3bR31x">
<node concept="3LXTmp" id="3Z6zOnxMpyY" role="3rtmxm">
<node concept="3qWCbU" id="3Z6zOnxMpyZ" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="55IIr" id="3Z6zOnxMpz0" role="3LXTmr">
<node concept="2Ry0Ak" id="3Z6zOnxMpz1" role="iGT6I">
<property role="2Ry0Am" value="typechecking" />
<node concept="2Ry0Ak" id="3Z6zOnxMpz2" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="3Z6zOnxMpz3" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.baseLanguageExt.test" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1E1JtA" id="46o4wsH5Nat" role="2G$12L">
<property role="BnDLt" value="true" />
@ -1525,6 +1812,24 @@
<ref role="3bR37D" node="55Q$YFtvwQY" resolve="jetbrains.mps.typechecking.ui" />
</node>
</node>
<node concept="3rtmxn" id="3Z6zOnxMpzl" role="3bR31x">
<node concept="3LXTmp" id="3Z6zOnxMpzm" role="3rtmxm">
<node concept="3qWCbU" id="3Z6zOnxMpzn" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="55IIr" id="3Z6zOnxMpzo" role="3LXTmr">
<node concept="2Ry0Ak" id="3Z6zOnxMpzp" role="iGT6I">
<property role="2Ry0Am" value="typechecking" />
<node concept="2Ry0Ak" id="3Z6zOnxMpzq" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="3Z6zOnxMpzr" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.typechecking.sample.test" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2sgV4H" id="7Ant4WkHLmd" role="1l3spa">

2
typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd
View File

@ -35,7 +35,7 @@
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
<language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="0" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="5" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="6" />
<language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="2" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
</languageVersions>

4
typesystem2/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl
View File

@ -33,6 +33,7 @@
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
<language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="-1" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
</languageVersions>
<dependencyVersions>
@ -105,7 +106,8 @@
<language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="0" />
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="5" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="6" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="1" />

2
typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
View File

@ -10,7 +10,7 @@
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
<use id="96ee7a94-411d-4cf8-9b94-96cad7e52411" name="jetbrains.mps.baseLanguage.jdk7" version="-1" />
<use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="-1" />
<use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
<use id="69b8a993-9b87-4d96-bf0c-3559f4bb0c63" name="jetbrains.mps.lang.slanguage" version="-1" />
<use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="0" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />

10
typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
View File

@ -38,7 +38,7 @@
<language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
<language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="1" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="0" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
@ -46,7 +46,8 @@
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
<language slang="l:69b8a993-9b87-4d96-bf0c-3559f4bb0c63:jetbrains.mps.lang.slanguage" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="5" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="6" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="1" />
<language slang="l:c9d137c4-3259-44f8-80ff-33ab2b506ee4:jetbrains.mps.lang.util" version="0" />
@ -117,7 +118,7 @@
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
<language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="1" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="1" />
<language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="4" />
@ -138,7 +139,8 @@
<language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="0" />
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="5" />
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="6" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="1" />

2
typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps
View File

@ -7,7 +7,7 @@
<use id="ed6d7656-532c-4bc2-81d1-af945aeb8280" name="jetbrains.mps.baseLanguage.blTypes" version="0" />
<use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
<use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
<use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="5" />
<use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="6" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />

2
typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/plugin.mps
View File

@ -2,7 +2,7 @@
<model ref="r:9c70dcd6-cd3e-4a40-a6f6-c3a41fef5269(jetbrains.mps.lang.typesystem2.plugin)">
<persistence version="9" />
<languages>
<use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="1" />
<use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
<use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="0" />
<use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="2" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />