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

Extract typechecking-related stuff to a separate solution 'j.m.typechecking'

This commit is contained in:
Fedor Isakov 2017-07-24 11:50:36 +02:00
parent 4665aa5623
commit e970b2443a
29 changed files with 9581 additions and 9930 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -13,6 +13,6 @@ config/*
system/*
logic/solutions/jetbrains.mps.logic.reactor/lib/*
logic/solutions/jetbrains.mps.logic.test/lib/*
typechecking/solutions/jetbrains.mps.typechecking.ui/lib/*
typechecking/solutions/jetbrains.mps.typechecking/lib/*
MPS_HOME
TEST-*

3
.mps/modules.xml
View File

@ -14,6 +14,7 @@
<modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.typechecking.sample/jetbrains.mps.typechecking.sample.msd" folder="typechecking.sample" />
<modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd" folder="typechecking" />
<modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.typechecking.ui/jetbrains.mps.typechecking.ui.msd" folder="typechecking.plugin" />
<modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd" folder="typechecking" />
<modulePath path="$PROJECT_DIR$/typesystem2/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl" folder="typesystem2" />
<modulePath path="$PROJECT_DIR$/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl" folder="typesystem2" />
<modulePath path="$PROJECT_DIR$/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd" folder="typesystem2" />
@ -21,4 +22,4 @@
<modulePath path="$PROJECT_DIR$/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd" folder="typesystem2" />
</projectModules>
</component>
</project>
</project>

2
build.gradle
View File

@ -63,7 +63,7 @@ def allInitDependencies = [
'installMps',
'logic/solutions/jetbrains.mps.logic.reactor:copyDependencies',
'logic/solutions/jetbrains.mps.logic.test:copyDependencies',
'typechecking/solutions/jetbrains.mps.typechecking.ui:copyDependencies' ]
'typechecking/solutions/jetbrains.mps.typechecking:copyDependencies' ]
task init(dependsOn: allInitDependencies) {
doLast {

204
build.xml
View File

@ -442,6 +442,51 @@
<zipfileset file="${basedir}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/jetbrains.mps.lang.typesystem2.helper.msd" prefix="module" />
<zipfileset dir="${build.tmp}/customProcessors/copyModels/typesystem2-solutions-jetbrains.mps.lang.typesystem2.helper-models" prefix="module/models" />
</jar>
<mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.jar" />
<mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.jar/META-INF" />
<echoxml file="${build.tmp}/default/jetbrains.mps.typechecking.jar/META-INF/module.xml">
<module namespace="jetbrains.mps.typechecking" type="solution" uuid="6998f568-f0e9-473b-b4a8-9efb6499fc8d">
<dependencies>
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
<module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
<module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
<module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
<module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
<module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
<module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
<module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
<module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
</dependencies>
<library jar="lib/reactive-streams-1.0.0.final.jar" />
<library jar="lib/rxjava-2.1.1.jar" />
<library jar="lib/rxjava2-swing-0.2.1.jar" />
<classpath>
<entry path="." />
</classpath>
<sources jar="jetbrains.mps.typechecking-src.jar" descriptor="jetbrains.mps.typechecking.msd" />
</module>
</echoxml>
<jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.jar" duplicate="preserve">
<fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking" />
<fileset dir="${basedir}/typechecking/solutions/jetbrains.mps.typechecking" includes="icons/**, resources/**" />
<fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
<fileset dir="${build.tmp}/default/jetbrains.mps.typechecking.jar" />
</jar>
<copyModels todir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.typechecking-models">
<fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
</copyModels>
<jar destfile="${build.layout}/tests/jetbrains.mps.typechecking-src.jar" duplicate="preserve">
<fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/source_gen">
<exclude name="**/trace.info" />
<exclude name="**/exports" />
<exclude name="**/checkpoints" />
<exclude name="**/*.mps" />
</fileset>
<zipfileset file="${basedir}/typechecking/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd" prefix="module" />
<zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.typechecking-models" prefix="module/models" />
</jar>
<mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.ui.jar" />
<mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.ui.jar/META-INF" />
<echoxml file="${build.tmp}/default/jetbrains.mps.typechecking.ui.jar/META-INF/module.xml">
@ -461,9 +506,6 @@
<module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" />
<module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
</dependencies>
<library jar="lib/rxjava-2.1.1.jar" />
<library jar="lib/rxjava2-swing-0.2.1.jar" />
<library jar="lib/reactive-streams-1.0.0.final.jar" />
<classpath>
<entry path="." />
</classpath>
@ -828,7 +870,7 @@
<fileset dir="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib" />
</copy>
<copy todir="${build.layout}/tests/lib">
<fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.ui/lib" />
<fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib" />
</copy>
<mkdir dir="${build.tmp}/default/typechecking-0.1.zip" />
<mkdir dir="${build.tmp}/default/typechecking-0.1.zip/typechecking" />
@ -1218,6 +1260,51 @@
<zipfileset file="${basedir}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/jetbrains.mps.lang.typesystem2.helper.msd" prefix="module" />
<zipfileset dir="${build.tmp}/customProcessors/copyModels/typesystem2-solutions-jetbrains.mps.lang.typesystem2.helper-models1" prefix="module/models" />
</jar>
<mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.jar1" />
<mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.jar1/META-INF" />
<echoxml file="${build.tmp}/default/jetbrains.mps.typechecking.jar1/META-INF/module.xml">
<module namespace="jetbrains.mps.typechecking" type="solution" uuid="6998f568-f0e9-473b-b4a8-9efb6499fc8d">
<dependencies>
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
<module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
<module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
<module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
<module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
<module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
<module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
<module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
<module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
</dependencies>
<library jar="../lib/reactive-streams-1.0.0.final-0.7.jar" />
<library jar="../lib/rxjava-2.1.1.jar" />
<library jar="../lib/rxjava2-swing-0.2.1.jar" />
<classpath>
<entry path="." />
</classpath>
<sources jar="jetbrains.mps.typechecking-src.jar" descriptor="jetbrains.mps.typechecking.msd" />
</module>
</echoxml>
<jar destfile="${build.tmp}/default/typechecking-0.1.zip/typechecking/languages/jetbrains.mps.typechecking.jar" duplicate="preserve">
<fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking" />
<fileset dir="${basedir}/typechecking/solutions/jetbrains.mps.typechecking" includes="icons/**, resources/**" />
<fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
<fileset dir="${build.tmp}/default/jetbrains.mps.typechecking.jar1" />
</jar>
<copyModels todir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.typechecking-models1">
<fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
</copyModels>
<jar destfile="${build.tmp}/default/typechecking-0.1.zip/typechecking/languages/jetbrains.mps.typechecking-src.jar" duplicate="preserve">
<fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/source_gen">
<exclude name="**/trace.info" />
<exclude name="**/exports" />
<exclude name="**/checkpoints" />
<exclude name="**/*.mps" />
</fileset>
<zipfileset file="${basedir}/typechecking/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd" prefix="module" />
<zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.typechecking-models1" prefix="module/models" />
</jar>
<mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.ui.jar1" />
<mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.ui.jar1/META-INF" />
<echoxml file="${build.tmp}/default/jetbrains.mps.typechecking.ui.jar1/META-INF/module.xml">
@ -1237,9 +1324,6 @@
<module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" />
<module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
</dependencies>
<library jar="../lib/rxjava-2.1.1.jar" />
<library jar="../lib/rxjava2-swing-0.2.1.jar" />
<library jar="../lib/reactive-streams-1.0.0.final-0.7.jar" />
<classpath>
<entry path="." />
</classpath>
@ -1348,7 +1432,7 @@
</jar>
<zip destfile="${build.layout}/typechecking-0.1.zip">
<zipfileset dir="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib" prefix="typechecking/lib" />
<zipfileset dir="${basedir}/typechecking/solutions/jetbrains.mps.typechecking.ui/lib" prefix="typechecking/lib" />
<zipfileset dir="${basedir}/typechecking/solutions/jetbrains.mps.typechecking/lib" prefix="typechecking/lib" />
<fileset dir="${build.tmp}/default/typechecking-0.1.zip" />
</zip>
<echo file="${build.layout}/build.properties">mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}</echo>
@ -1365,7 +1449,7 @@
<delete dir="${build.layout}" />
</target>
<target name="compileJava" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.smodel.types#7345257067587611144, java.compile.jetbrains.mps.lang.typechecking.test, java.compile.jetbrains.mps.typechecking.ui, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.typechecking.sample, java.compile.jetbrains.mps.baseLanguageExt.test, java.compile.jetbrains.mps.typechecking.sample.test" />
<target name="compileJava" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.smodel.types#7345257067587611144, java.compile.jetbrains.mps.lang.typechecking.test, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.ui, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.typechecking.sample, java.compile.jetbrains.mps.baseLanguageExt.test, java.compile.jetbrains.mps.typechecking.sample.test" />
<target name="processResources" />
@ -1473,6 +1557,7 @@
<module file="${basedir}/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd" />
<module file="${basedir}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd" />
<module file="${basedir}/logic/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd" />
<module file="${basedir}/typechecking/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd" />
<module file="${basedir}/typechecking/solutions/jetbrains.mps.typechecking.ui/jetbrains.mps.typechecking.ui.msd" />
</chunk>
<chunk>
@ -2028,7 +2113,7 @@
</javac>
</target>
<target name="java.compile.jetbrains.mps.lang.smodel.types" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, fetchDependencies">
<target name="java.compile.jetbrains.mps.lang.smodel.types" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, fetchDependencies">
<mkdir dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.smodel.types/source_gen" />
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.types" />
<javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.types" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@ -2049,11 +2134,16 @@
<fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
<fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
<fileset file="${artifacts.mps}/lib/mps-editor.jar" />
<fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
<fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
<fileset file="${artifacts.mps}/lib/mps-platform.jar" />
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava-2.1.1.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava2-swing-0.2.1.jar" />
<fileset file="${artifacts.mps}/lib/annotations.jar" />
<fileset file="${artifacts.mps}/lib/log4j.jar" />
<fileset file="${artifacts.mps}/lib/jdom.jar" />
@ -2075,7 +2165,7 @@
</javac>
</target>
<target name="java.compile.jetbrains.mps.lang.smodel.types#7345257067587611144" depends="java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.typesystem2.runtime, fetchDependencies">
<target name="java.compile.jetbrains.mps.lang.smodel.types#7345257067587611144" depends="java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, fetchDependencies">
<mkdir dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.smodel.types/generator/source_gen" />
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.types#7345257067587611144" />
<javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.types#7345257067587611144" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@ -2102,6 +2192,11 @@
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.smodel.types" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava-2.1.1.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava2-swing-0.2.1.jar" />
<fileset file="${artifacts.mps}/lib/annotations.jar" />
<fileset file="${artifacts.mps}/lib/log4j.jar" />
<fileset file="${artifacts.mps}/lib/jdom.jar" />
@ -2123,7 +2218,7 @@
</javac>
</target>
<target name="java.compile.jetbrains.mps.lang.typechecking.test" depends="java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.ui, fetchDependencies">
<target name="java.compile.jetbrains.mps.lang.typechecking.test" depends="java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.ui, fetchDependencies">
<mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.test/source_gen" />
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.test" />
<javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@ -2157,6 +2252,7 @@
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.ui" />
<fileset file="${artifacts.mps}/lib/mps-test.jar" />
<fileset file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
@ -2165,9 +2261,9 @@
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.ui/lib/rxjava-2.1.1.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.ui/lib/rxjava2-swing-0.2.1.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.ui/lib/reactive-streams-1.0.0.final.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava-2.1.1.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava2-swing-0.2.1.jar" />
<fileset file="${artifacts.mps}/lib/ant/lib/ant.jar" />
<fileset file="${artifacts.mps}/lib/junit-4.12.jar" />
<fileset file="${artifacts.mps}/lib/hamcrest-core-1.3.jar" />
@ -2201,7 +2297,61 @@
</javac>
</target>
<target name="java.compile.jetbrains.mps.typechecking.ui" depends="java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
<target name="java.compile.jetbrains.mps.typechecking" depends="java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
<mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/source_gen" />
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking" />
<javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking" fork="true" encoding="utf8" includeantruntime="false" debug="true">
<compilerarg value="-Xlint:none" />
<src>
<path location="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/source_gen" />
</src>
<classpath>
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
<fileset file="${artifacts.mps}/lib/mps-closures.jar" />
<fileset file="${artifacts.mps}/lib/mps-collections.jar" />
<fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
<fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
<fileset file="${artifacts.mps}/lib/mps-core.jar" />
<fileset file="${artifacts.mps}/lib/mps-logging.jar" />
<fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
<fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
<fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
<fileset file="${artifacts.mps}/lib/mps-editor.jar" />
<fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
<fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
<fileset file="${artifacts.mps}/lib/mps-platform.jar" />
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
<fileset file="${artifacts.mps}/lib/mps-icons.jar" />
<fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.helper" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.2.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava-2.1.1.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava2-swing-0.2.1.jar" />
<fileset file="${artifacts.mps}/lib/annotations.jar" />
<fileset file="${artifacts.mps}/lib/log4j.jar" />
<fileset file="${artifacts.mps}/lib/jdom.jar" />
<fileset file="${artifacts.mps}/lib/trove4j.jar" />
<fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
<fileset dir="${artifacts.mps}/lib" includes="*.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.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.structure.jar" />
</classpath>
</javac>
</target>
<target name="java.compile.jetbrains.mps.typechecking.ui" depends="java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, fetchDependencies">
<mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.ui/source_gen" />
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.ui" />
<javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking.ui" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@ -2233,14 +2383,15 @@
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.2.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.ui/lib/rxjava-2.1.1.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.ui/lib/rxjava2-swing-0.2.1.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.ui/lib/reactive-streams-1.0.0.final.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava-2.1.1.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava2-swing-0.2.1.jar" />
<fileset file="${artifacts.mps}/lib/annotations.jar" />
<fileset file="${artifacts.mps}/lib/log4j.jar" />
<fileset file="${artifacts.mps}/lib/jdom.jar" />
@ -2248,9 +2399,7 @@
<fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
<fileset dir="${artifacts.mps}/lib" includes="*.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.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.structure.jar" />
</classpath>
</javac>
</target>
@ -2441,7 +2590,7 @@
</javac>
</target>
<target name="java.compile.jetbrains.mps.typechecking.sample.test" depends="java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.sample, java.compile.jetbrains.mps.typechecking.ui, fetchDependencies">
<target name="java.compile.jetbrains.mps.typechecking.sample.test" depends="java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.sample, java.compile.jetbrains.mps.typechecking.ui, fetchDependencies">
<mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.sample.test/source_gen" />
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample.test" />
<javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@ -2463,20 +2612,21 @@
<fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
<fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.sample" />
<fileset file="${artifacts.mps}/lib/mps-editor.jar" />
<fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
<fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
<fileset file="${artifacts.mps}/lib/mps-platform.jar" />
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.sample" />
<fileset file="${artifacts.mps}/lib/mps-icons.jar" />
<fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.ui" />
<fileset file="${artifacts.mps}/lib/mps-test.jar" />
<fileset file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.ui/lib/rxjava-2.1.1.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.ui/lib/rxjava2-swing-0.2.1.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.ui/lib/reactive-streams-1.0.0.final.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava-2.1.1.jar" />
<fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava2-swing-0.2.1.jar" />
<fileset file="${artifacts.mps}/lib/ant/lib/ant.jar" />
<fileset file="${artifacts.mps}/lib/junit-4.12.jar" />
<fileset file="${artifacts.mps}/lib/hamcrest-core-1.3.jar" />
@ -2588,6 +2738,7 @@
<pathelement location="${build.layout}/tests/jetbrains.mps.logic.jar" />
<pathelement location="${build.layout}/tests/jetbrains.mps.logic.reactor.jar" />
<pathelement location="${build.layout}/tests/jetbrains.mps.logic.runtime.jar" />
<pathelement location="${build.layout}/tests/jetbrains.mps.typechecking.jar" />
<pathelement location="${build.layout}/tests/jetbrains.mps.typechecking.sample.jar" />
<pathelement location="${build.layout}/tests/jetbrains.mps.typechecking.ui.jar" />
</path>
@ -2668,6 +2819,7 @@
<delete dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/source_gen" />
<delete dir="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/source_gen" />
<delete dir="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.test/source_gen" />
<delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/source_gen" />
<delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.ui/source_gen" />
<delete dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.baseLanguageExt/source_gen" />
<delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.baseLanguageExt.test/source_gen" />

2
settings.gradle
View File

@ -1,3 +1,3 @@
include 'logic/solutions/jetbrains.mps.logic.reactor'
include 'logic/solutions/jetbrains.mps.logic.test'
include 'typechecking/solutions/jetbrains.mps.typechecking.ui'
include 'typechecking/solutions/jetbrains.mps.typechecking'

2
typechecking/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
View File

@ -31,7 +31,7 @@
<import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
<import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
<import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
<import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.typesystem2.typechecking)" />
<import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.typesystem2.evaluation)" />
<import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
</imports>
<registry>

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

@ -984,6 +984,12 @@
<ref role="3bR37D" to="ffeo:7YI57w6K0rx" resolve="jetbrains.mps.lang.smodel#1139186730696" />
</node>
</node>
<node concept="1SiIV0" id="55Q$YFtvxj6" role="3bR37C">
<node concept="3bR9La" id="55Q$YFtvxj7" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
</node>
</node>
</node>
</node>
</node>
@ -1072,7 +1078,13 @@
<node concept="1SiIV0" id="5w_kaFFWUQc" role="3bR37C">
<node concept="3bR9La" id="5w_kaFFWUQd" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking.ui" />
<ref role="3bR37D" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
</node>
</node>
<node concept="1SiIV0" id="55Q$YFtvxju" role="3bR37C">
<node concept="3bR9La" id="55Q$YFtvxjv" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" node="55Q$YFtvwQY" resolve="jetbrains.mps.typechecking.ui" />
</node>
</node>
</node>
@ -1081,8 +1093,8 @@
<property role="TrG5h" value="typechecking" />
<node concept="1E1JtA" id="65DJywFj0Fi" role="2G$12L">
<property role="BnDLt" value="true" />
<property role="TrG5h" value="jetbrains.mps.typechecking.ui" />
<property role="3LESm3" value="35e2a720-13d8-4eda-88d3-ff9d78d5a3ae" />
<property role="TrG5h" value="jetbrains.mps.typechecking" />
<property role="3LESm3" value="6998f568-f0e9-473b-b4a8-9efb6499fc8d" />
<property role="2GAjPV" value="false" />
<node concept="55IIr" id="65DJywFj0Fj" role="3LF7KH">
<node concept="2Ry0Ak" id="65DJywFj0LR" role="iGT6I">
@ -1090,9 +1102,9 @@
<node concept="2Ry0Ak" id="65DJywFj0Qg" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="65DJywFj0UD" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.typechecking.ui" />
<node concept="2Ry0Ak" id="55Q$YFtqlRS" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.typechecking.ui.msd" />
<property role="2Ry0Am" value="jetbrains.mps.typechecking" />
<node concept="2Ry0Ak" id="55Q$YFtvx5w" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.typechecking.msd" />
</node>
</node>
</node>
@ -1104,60 +1116,18 @@
<ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
</node>
</node>
<node concept="1SiIV0" id="65DJywFj290" role="3bR37C">
<node concept="3bR9La" id="65DJywFj291" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
</node>
</node>
<node concept="1SiIV0" id="65DJywFj292" role="3bR37C">
<node concept="3bR9La" id="65DJywFj293" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" to="ffeo:1TaHNgiIbJ$" resolve="jetbrains.mps.ide.editor" />
</node>
</node>
<node concept="1SiIV0" id="65DJywFj294" role="3bR37C">
<node concept="3bR9La" id="65DJywFj295" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.typesystem2.template" />
</node>
</node>
<node concept="1SiIV0" id="65DJywFj298" role="3bR37C">
<node concept="3bR9La" id="65DJywFj299" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
</node>
</node>
<node concept="1SiIV0" id="65DJywFj29a" role="3bR37C">
<node concept="3bR9La" id="65DJywFj29b" role="1SiIV1">
<property role="3bR36h" value="true" />
<ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
</node>
</node>
<node concept="1SiIV0" id="65DJywFj29g" role="3bR37C">
<node concept="3bR9La" id="65DJywFj29h" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
</node>
</node>
<node concept="1SiIV0" id="65DJywFj29i" role="3bR37C">
<node concept="3bR9La" id="65DJywFj29j" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
</node>
</node>
<node concept="1SiIV0" id="65DJywFj29k" role="3bR37C">
<node concept="3bR9La" id="65DJywFj29l" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
</node>
</node>
<node concept="1SiIV0" id="65DJywFj29s" role="3bR37C">
<node concept="3bR9La" id="65DJywFj29t" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" to="ffeo:7Kfy9QB6LgV" resolve="jetbrains.mps.make.runtime" />
</node>
</node>
<node concept="1SiIV0" id="65DJywFj29u" role="3bR37C">
<node concept="3bR9La" id="65DJywFj29v" role="1SiIV1">
<property role="3bR36h" value="false" />
@ -1170,37 +1140,53 @@
<ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
</node>
</node>
<node concept="1SiIV0" id="6i42QSs2bfI" role="3bR37C">
<node concept="3bR9La" id="6i42QSs2bfJ" role="1SiIV1">
<property role="3bR36h" value="true" />
<ref role="3bR37D" to="ffeo:7Kfy9QB6Lfd" resolve="jetbrains.mps.findUsages.runtime" />
</node>
</node>
<node concept="1SiIV0" id="3u5wJtgkeu" role="3bR37C">
<node concept="3bR9La" id="3u5wJtgkev" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" node="3u5wJtgk3a" resolve="jetbrains.mps.lang.typesystem2.helper" />
</node>
</node>
<node concept="1SiIV0" id="1BDNG5xH$Qz" role="3bR37C">
<node concept="3bR9La" id="1BDNG5xH$Q$" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" to="ffeo:7Kfy9QB6Lg2" resolve="jetbrains.mps.smodel.resources" />
<node concept="1SiIV0" id="55Q$YFtvxay" role="3bR37C">
<node concept="3bR9La" id="55Q$YFtvxaz" role="1SiIV1">
<property role="3bR36h" value="true" />
<ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
</node>
</node>
<node concept="1SiIV0" id="55Q$YFtqlZS" role="3bR37C">
<node concept="1BurEX" id="55Q$YFtqlZT" role="1SiIV1">
<node concept="398BVA" id="55Q$YFtqlZG" role="1BurEY">
<node concept="1SiIV0" id="1Ss4_iXRmTp" role="3bR37C">
<node concept="1BurEX" id="1Ss4_iXRmTq" role="1SiIV1">
<node concept="398BVA" id="1Ss4_iXRmTd" role="1BurEY">
<ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
<node concept="2Ry0Ak" id="55Q$YFtqlZH" role="iGT6I">
<node concept="2Ry0Ak" id="1Ss4_iXRmTe" role="iGT6I">
<property role="2Ry0Am" value="typechecking" />
<node concept="2Ry0Ak" id="55Q$YFtqlZI" role="2Ry0An">
<node concept="2Ry0Ak" id="1Ss4_iXRmTf" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="55Q$YFtqlZJ" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.typechecking.ui" />
<node concept="2Ry0Ak" id="55Q$YFtqlZK" role="2Ry0An">
<node concept="2Ry0Ak" id="1Ss4_iXRmTg" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.typechecking" />
<node concept="2Ry0Ak" id="1Ss4_iXRmTh" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="55Q$YFtqlZL" role="2Ry0An">
<node concept="2Ry0Ak" id="1Ss4_iXRmTi" role="2Ry0An">
<property role="2Ry0Am" value="reactive-streams-1.0.0.final.jar" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1SiIV0" id="1Ss4_iXRmTB" role="3bR37C">
<node concept="1BurEX" id="1Ss4_iXRmTC" role="1SiIV1">
<node concept="398BVA" id="1Ss4_iXRmTr" role="1BurEY">
<ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
<node concept="2Ry0Ak" id="1Ss4_iXRmTs" role="iGT6I">
<property role="2Ry0Am" value="typechecking" />
<node concept="2Ry0Ak" id="1Ss4_iXRmTt" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="1Ss4_iXRmTu" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.typechecking" />
<node concept="2Ry0Ak" id="1Ss4_iXRmTv" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="1Ss4_iXRmTw" role="2Ry0An">
<property role="2Ry0Am" value="rxjava-2.1.1.jar" />
</node>
</node>
@ -1210,19 +1196,19 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="55Q$YFtqm06" role="3bR37C">
<node concept="1BurEX" id="55Q$YFtqm07" role="1SiIV1">
<node concept="398BVA" id="55Q$YFtqlZU" role="1BurEY">
<node concept="1SiIV0" id="1Ss4_iXRmTP" role="3bR37C">
<node concept="1BurEX" id="1Ss4_iXRmTQ" role="1SiIV1">
<node concept="398BVA" id="1Ss4_iXRmTD" role="1BurEY">
<ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
<node concept="2Ry0Ak" id="55Q$YFtqlZV" role="iGT6I">
<node concept="2Ry0Ak" id="1Ss4_iXRmTE" role="iGT6I">
<property role="2Ry0Am" value="typechecking" />
<node concept="2Ry0Ak" id="55Q$YFtqlZW" role="2Ry0An">
<node concept="2Ry0Ak" id="1Ss4_iXRmTF" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="55Q$YFtqlZX" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.typechecking.ui" />
<node concept="2Ry0Ak" id="55Q$YFtqlZY" role="2Ry0An">
<node concept="2Ry0Ak" id="1Ss4_iXRmTG" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.typechecking" />
<node concept="2Ry0Ak" id="1Ss4_iXRmTH" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="55Q$YFtqlZZ" role="2Ry0An">
<node concept="2Ry0Ak" id="1Ss4_iXRmTI" role="2Ry0An">
<property role="2Ry0Am" value="rxjava2-swing-0.2.1.jar" />
</node>
</node>
@ -1232,28 +1218,128 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="55Q$YFtqm0k" role="3bR37C">
<node concept="1BurEX" id="55Q$YFtqm0l" role="1SiIV1">
<node concept="398BVA" id="55Q$YFtqm08" role="1BurEY">
<ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
<node concept="2Ry0Ak" id="55Q$YFtqm09" role="iGT6I">
<property role="2Ry0Am" value="typechecking" />
<node concept="2Ry0Ak" id="55Q$YFtqm0a" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="55Q$YFtqm0b" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.typechecking.ui" />
<node concept="2Ry0Ak" id="55Q$YFtqm0c" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="55Q$YFtqm0d" role="2Ry0An">
<property role="2Ry0Am" value="reactive-streams-1.0.0.final.jar" />
</node>
</node>
</node>
<node concept="1SiIV0" id="1Ss4_iXXglt" role="3bR37C">
<node concept="3bR9La" id="1Ss4_iXXglu" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
</node>
</node>
<node concept="1SiIV0" id="6IQb_Rx4yBd" role="3bR37C">
<node concept="3bR9La" id="6IQb_Rx4yBe" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
</node>
</node>
<node concept="1SiIV0" id="6IQb_Rx4yBf" role="3bR37C">
<node concept="3bR9La" id="6IQb_Rx4yBg" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
</node>
</node>
</node>
<node concept="1E1JtA" id="55Q$YFtvwQY" role="2G$12L">
<property role="BnDLt" value="true" />
<property role="TrG5h" value="jetbrains.mps.typechecking.ui" />
<property role="3LESm3" value="35e2a720-13d8-4eda-88d3-ff9d78d5a3ae" />
<property role="2GAjPV" value="false" />
<node concept="55IIr" id="55Q$YFtvwQZ" role="3LF7KH">
<node concept="2Ry0Ak" id="55Q$YFtvwR0" role="iGT6I">
<property role="2Ry0Am" value="typechecking" />
<node concept="2Ry0Ak" id="55Q$YFtvwR1" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="55Q$YFtvwR2" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.typechecking.ui" />
<node concept="2Ry0Ak" id="55Q$YFtvwR3" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.typechecking.ui.msd" />
</node>
</node>
</node>
</node>
</node>
<node concept="1SiIV0" id="55Q$YFtvwR4" role="3bR37C">
<node concept="3bR9La" id="55Q$YFtvwR5" role="1SiIV1">
<property role="3bR36h" value="true" />
<ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
</node>
</node>
<node concept="1SiIV0" id="55Q$YFtvwR6" role="3bR37C">
<node concept="3bR9La" id="55Q$YFtvwR7" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
</node>
</node>
<node concept="1SiIV0" id="55Q$YFtvwR8" role="3bR37C">
<node concept="3bR9La" id="55Q$YFtvwR9" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" to="ffeo:1TaHNgiIbJ$" resolve="jetbrains.mps.ide.editor" />
</node>
</node>
<node concept="1SiIV0" id="55Q$YFtvwRa" role="3bR37C">
<node concept="3bR9La" id="55Q$YFtvwRb" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.typesystem2.template" />
</node>
</node>
<node concept="1SiIV0" id="55Q$YFtvwRc" role="3bR37C">
<node concept="3bR9La" id="55Q$YFtvwRd" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
</node>
</node>
<node concept="1SiIV0" id="55Q$YFtvwRe" role="3bR37C">
<node concept="3bR9La" id="55Q$YFtvwRf" role="1SiIV1">
<property role="3bR36h" value="true" />
<ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
</node>
</node>
<node concept="1SiIV0" id="55Q$YFtvwRg" role="3bR37C">
<node concept="3bR9La" id="55Q$YFtvwRh" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
</node>
</node>
<node concept="1SiIV0" id="55Q$YFtvwRi" role="3bR37C">
<node concept="3bR9La" id="55Q$YFtvwRj" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
</node>
</node>
<node concept="1SiIV0" id="55Q$YFtvwRm" role="3bR37C">
<node concept="3bR9La" id="55Q$YFtvwRn" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" to="ffeo:7Kfy9QB6LgV" resolve="jetbrains.mps.make.runtime" />
</node>
</node>
<node concept="1SiIV0" id="55Q$YFtvwRo" role="3bR37C">
<node concept="3bR9La" id="55Q$YFtvwRp" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" node="7BVjoXzUxee" resolve="jetbrains.mps.lang.typesystem2.runtime" />
</node>
</node>
<node concept="1SiIV0" id="55Q$YFtvwRq" role="3bR37C">
<node concept="3bR9La" id="55Q$YFtvwRr" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
</node>
</node>
<node concept="1SiIV0" id="55Q$YFtvwRs" role="3bR37C">
<node concept="3bR9La" id="55Q$YFtvwRt" role="1SiIV1">
<property role="3bR36h" value="true" />
<ref role="3bR37D" to="ffeo:7Kfy9QB6Lfd" resolve="jetbrains.mps.findUsages.runtime" />
</node>
</node>
<node concept="1SiIV0" id="55Q$YFtvwRu" role="3bR37C">
<node concept="3bR9La" id="55Q$YFtvwRv" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" node="3u5wJtgk3a" resolve="jetbrains.mps.lang.typesystem2.helper" />
</node>
</node>
<node concept="1SiIV0" id="55Q$YFtvxjO" role="3bR37C">
<node concept="3bR9La" id="55Q$YFtvxjP" role="1SiIV1">
<property role="3bR36h" value="true" />
<ref role="3bR37D" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
</node>
</node>
</node>
<node concept="1E1JtD" id="46o4wsH5PJF" role="2G$12L">
<property role="BnDLt" value="true" />
@ -1461,10 +1547,10 @@
<ref role="3bR37D" node="46o4wsH5O3R" resolve="jetbrains.mps.typechecking.sample" />
</node>
</node>
<node concept="1SiIV0" id="46o4wsH5OPq" role="3bR37C">
<node concept="3bR9La" id="46o4wsH5OPr" role="1SiIV1">
<node concept="1SiIV0" id="55Q$YFtvxlc" role="3bR37C">
<node concept="3bR9La" id="55Q$YFtvxld" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking.ui" />
<ref role="3bR37D" node="55Q$YFtvwQY" resolve="jetbrains.mps.typechecking.ui" />
</node>
</node>
</node>
@ -1515,7 +1601,10 @@
<ref role="L2wRA" node="3u5wJtgk3a" resolve="jetbrains.mps.lang.typesystem2.helper" />
</node>
<node concept="L2wRC" id="7Ant4WkHLmq" role="39821P">
<ref role="L2wRA" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking.ui" />
<ref role="L2wRA" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
</node>
<node concept="L2wRC" id="55Q$YFtv_$M" role="39821P">
<ref role="L2wRA" node="55Q$YFtvwQY" resolve="jetbrains.mps.typechecking.ui" />
</node>
<node concept="L2wRC" id="5pz4PwHqt4r" role="39821P">
<ref role="L2wRA" node="5pz4PwHqqS4" resolve="jetbrains.mps.lang.typechecking.test" />
@ -1591,7 +1680,7 @@
<node concept="2Ry0Ak" id="3NqN4u$_rqg" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="3NqN4u$_rqh" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.typechecking.ui" />
<property role="2Ry0Am" value="jetbrains.mps.typechecking" />
<node concept="2Ry0Ak" id="3NqN4u$_rqi" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
</node>
@ -1744,7 +1833,7 @@
<ref role="L2wRA" node="3u5wJtgk3a" resolve="jetbrains.mps.lang.typesystem2.helper" />
</node>
<node concept="L2wRC" id="65DJywFj_1R" role="39821P">
<ref role="L2wRA" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking.ui" />
<ref role="L2wRA" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
<node concept="3yLZsm" id="3NqN4u$_rT6" role="3yL2VB">
<property role="3yLZsk" value="../lib/reactive-streams-1.0.0.final-0.7.jar" />
<node concept="398BVA" id="3NqN4u$_rT7" role="3yLZsn">
@ -1754,7 +1843,7 @@
<node concept="2Ry0Ak" id="3NqN4u$_rT9" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="3NqN4u$_rTa" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.typechecking.ui" />
<property role="2Ry0Am" value="jetbrains.mps.typechecking" />
<node concept="2Ry0Ak" id="3NqN4u$_rTb" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="3NqN4u$_s8k" role="2Ry0An">
@ -1775,7 +1864,7 @@
<node concept="2Ry0Ak" id="3NqN4u$_sip" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="3NqN4u$_siq" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.typechecking.ui" />
<property role="2Ry0Am" value="jetbrains.mps.typechecking" />
<node concept="2Ry0Ak" id="3NqN4u$_sir" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="3NqN4u$_snF" role="2Ry0An">
@ -1796,7 +1885,7 @@
<node concept="2Ry0Ak" id="3NqN4u$_sxK" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="3NqN4u$_sxL" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.typechecking.ui" />
<property role="2Ry0Am" value="jetbrains.mps.typechecking" />
<node concept="2Ry0Ak" id="3NqN4u$_sxM" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="3NqN4u$_sB9" role="2Ry0An">
@ -1809,6 +1898,9 @@
</node>
</node>
</node>
<node concept="L2wRC" id="55Q$YFtwDpa" role="39821P">
<ref role="L2wRA" node="55Q$YFtvwQY" resolve="jetbrains.mps.typechecking.ui" />
</node>
<node concept="L2wRC" id="3u5wJtgSbK" role="39821P">
<ref role="L2wRA" node="3u5wJtgiSM" resolve="jetbrains.mps.lang.smodel.types" />
</node>
@ -1837,7 +1929,7 @@
<node concept="2Ry0Ak" id="3NqN4u$_rDC" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="3NqN4u$_rDD" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.typechecking.ui" />
<property role="2Ry0Am" value="jetbrains.mps.typechecking" />
<node concept="2Ry0Ak" id="3NqN4u$_rDE" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
</node>

3
typechecking/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd
View File

@ -43,9 +43,10 @@
<module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
<module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
<module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
<module reference="35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.typechecking)" version="0" />
<module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)" version="0" />
<module reference="3ddddf69-9ff0-426b-9365-51ae7356fb82(jetbrains.mps.typechecking.sample)" version="0" />
<module reference="1b65dfe8-24ff-41c3-9a3e-70f102942455(jetbrains.mps.typechecking.sample.test)" version="0" />
<module reference="35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.typechecking.ui)" version="0" />
</dependencyVersions>
</solution>

17
typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds.bad@tests.mps
View File

@ -11,6 +11,7 @@
<import index="7rut" ref="r:b1bec7fa-733c-4182-bbd4-b266e3d7e6db(jetbrains.mps.typechecking.sample.bounds.bad)" />
<import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
<import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.typechecking.ui.plugin)" />
<import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.typechecking)" />
</imports>
<registry>
<language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
@ -108,9 +109,9 @@
<node concept="3clFbS" id="1N_0WA5DT8I" role="3clF47">
<node concept="2Hmddi" id="4ekooLap0nE" role="3cqZAp">
<node concept="2OqwBi" id="6nJA6bpKqaJ" role="2Hmdds">
<node concept="2YIFZM" id="6nJA6bpKq32" role="2Oq$k0">
<ref role="37wK5l" to="t5kh:7y50OW6XU7p" resolve="checkTypes" />
<ref role="1Pybhc" to="t5kh:1N_0WA5JxZO" resolve="LaunchTypechecking" />
<node concept="2YIFZM" id="6IQb_RxcBBy" role="2Oq$k0">
<ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
<ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
<node concept="2OqwBi" id="6nJA6bpKq33" role="37wK5m">
<node concept="3xONca" id="6nJA6bpKq34" role="2Oq$k0">
<ref role="3xOPvv" node="1N_0WA5DX6Z" resolve="Test_Sample_bad1" />
@ -122,7 +123,7 @@
<node concept="1jxXqW" id="6nJA6bpKq36" role="37wK5m" />
</node>
<node concept="liA8E" id="6nJA6bpKqof" role="2OqNvi">
<ref role="37wK5l" to="t5kh:7y50OW6Y0Sl" resolve="error" />
<ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
</node>
</node>
<node concept="3_1$Yv" id="4ekooLap0B2" role="3_9lra">
@ -139,9 +140,9 @@
<node concept="3clFbS" id="4ekooLap0M$" role="3clF47">
<node concept="2Hmddi" id="4ekooLap0MH" role="3cqZAp">
<node concept="2OqwBi" id="6nJA6bpKqCv" role="2Hmdds">
<node concept="2YIFZM" id="6nJA6bpKqwM" role="2Oq$k0">
<ref role="37wK5l" to="t5kh:7y50OW6XU7p" resolve="checkTypes" />
<ref role="1Pybhc" to="t5kh:1N_0WA5JxZO" resolve="LaunchTypechecking" />
<node concept="2YIFZM" id="6IQb_RxcBBv" role="2Oq$k0">
<ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
<ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
<node concept="2OqwBi" id="6nJA6bpKqwN" role="37wK5m">
<node concept="3xONca" id="6nJA6bpKqwO" role="2Oq$k0">
<ref role="3xOPvv" node="1N_0WA5J$6h" resolve="Test_Sample_bad2" />
@ -153,7 +154,7 @@
<node concept="1jxXqW" id="6nJA6bpKqwQ" role="37wK5m" />
</node>
<node concept="liA8E" id="6nJA6bpKqQf" role="2OqNvi">
<ref role="37wK5l" to="t5kh:7y50OW6Y0Sl" resolve="error" />
<ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
</node>
</node>
<node concept="3_1$Yv" id="4ekooLap0MN" role="3_9lra">

25
typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.bounds@tests.mps
View File

@ -14,6 +14,7 @@
<import index="f6t6" ref="r:9993217f-5bfa-4281-bc47-527677747cb2(jetbrains.mps.typechecking.sample.bounds)" />
<import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
<import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.typechecking.ui.plugin)" />
<import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.typechecking)" />
</imports>
<registry>
<language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
@ -119,9 +120,9 @@
<node concept="3clFbS" id="1N_0WA5DT8I" role="3clF47">
<node concept="3ykFI1" id="1N_0WA5IMvR" role="3cqZAp">
<node concept="2OqwBi" id="6nJA6bpKr9l" role="3ykU8v">
<node concept="2YIFZM" id="6nJA6bpKr0g" role="2Oq$k0">
<ref role="37wK5l" to="t5kh:7y50OW6XU7p" resolve="checkTypes" />
<ref role="1Pybhc" to="t5kh:1N_0WA5JxZO" resolve="LaunchTypechecking" />
<node concept="2YIFZM" id="6IQb_RxcBBx" role="2Oq$k0">
<ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
<ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
<node concept="2OqwBi" id="6nJA6bpKr0h" role="37wK5m">
<node concept="3xONca" id="6nJA6bpKr0i" role="2Oq$k0">
<ref role="3xOPvv" node="1N_0WA5DX6Z" resolve="Test_Sample" />
@ -133,7 +134,7 @@
<node concept="1jxXqW" id="6nJA6bpKr0k" role="37wK5m" />
</node>
<node concept="liA8E" id="6nJA6bpKrmZ" role="2OqNvi">
<ref role="37wK5l" to="t5kh:7y50OW6Y0Sl" resolve="error" />
<ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
</node>
</node>
<node concept="3_1$Yv" id="1N_0WA5IN6H" role="3_9lra">
@ -150,9 +151,9 @@
<node concept="3clFbS" id="1N_0WA5J$AF" role="3clF47">
<node concept="3ykFI1" id="1N_0WA5J$AO" role="3cqZAp">
<node concept="2OqwBi" id="6nJA6bpKrAI" role="3ykU8v">
<node concept="2YIFZM" id="6nJA6bpKrtD" role="2Oq$k0">
<ref role="37wK5l" to="t5kh:7y50OW6XU7p" resolve="checkTypes" />
<ref role="1Pybhc" to="t5kh:1N_0WA5JxZO" resolve="LaunchTypechecking" />
<node concept="2YIFZM" id="6IQb_RxcBBA" role="2Oq$k0">
<ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
<ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
<node concept="2OqwBi" id="6nJA6bpKrtE" role="37wK5m">
<node concept="3xONca" id="6nJA6bpKrtF" role="2Oq$k0">
<ref role="3xOPvv" node="1N_0WA5J$6h" resolve="Test_Sample2" />
@ -164,7 +165,7 @@
<node concept="1jxXqW" id="6nJA6bpKrtH" role="37wK5m" />
</node>
<node concept="liA8E" id="6nJA6bpKrOo" role="2OqNvi">
<ref role="37wK5l" to="t5kh:7y50OW6Y0Sl" resolve="error" />
<ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
</node>
</node>
<node concept="3_1$Yv" id="1N_0WA5J$AU" role="3_9lra">
@ -181,9 +182,9 @@
<node concept="3clFbS" id="5DSQNPPS8Ea" role="3clF47">
<node concept="3ykFI1" id="5DSQNPPS8Eb" role="3cqZAp">
<node concept="2OqwBi" id="6nJA6bpKs9r" role="3ykU8v">
<node concept="2YIFZM" id="6nJA6bpKrVa" role="2Oq$k0">
<ref role="37wK5l" to="t5kh:7y50OW6XU7p" resolve="checkTypes" />
<ref role="1Pybhc" to="t5kh:1N_0WA5JxZO" resolve="LaunchTypechecking" />
<node concept="2YIFZM" id="6IQb_RxcBBC" role="2Oq$k0">
<ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
<ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
<node concept="2OqwBi" id="6nJA6bpKrVb" role="37wK5m">
<node concept="3xONca" id="6nJA6bpKrVc" role="2Oq$k0">
<ref role="3xOPvv" node="5DSQNPPS8Va" resolve="Test_Variance" />
@ -195,7 +196,7 @@
<node concept="1jxXqW" id="6nJA6bpKrVe" role="37wK5m" />
</node>
<node concept="liA8E" id="6nJA6bpKsq0" role="2OqNvi">
<ref role="37wK5l" to="t5kh:7y50OW6Y0Sl" resolve="error" />
<ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
</node>
</node>
<node concept="3_1$Yv" id="5DSQNPPS8Eh" role="3_9lra">

9
typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.codeAnal@tests.mps
View File

@ -12,6 +12,7 @@
<import index="hwt6" ref="r:1f3a7853-f20c-4f91-9912-5e82d9d1651a(jetbrains.mps.typechecking.sample.codeAnal)" />
<import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.typechecking.ui.plugin)" />
<import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
<import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.typechecking)" />
</imports>
<registry>
<language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
@ -104,9 +105,9 @@
<node concept="3clFbS" id="1N_0WA5DT8I" role="3clF47">
<node concept="3ykFI1" id="1N_0WA5IMvR" role="3cqZAp">
<node concept="2OqwBi" id="6nJA6bpKsEr" role="3ykU8v">
<node concept="2YIFZM" id="6nJA6bpKsyQ" role="2Oq$k0">
<ref role="37wK5l" to="t5kh:7y50OW6XU7p" resolve="checkTypes" />
<ref role="1Pybhc" to="t5kh:1N_0WA5JxZO" resolve="LaunchTypechecking" />
<node concept="2YIFZM" id="6IQb_RxcBB$" role="2Oq$k0">
<ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
<ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
<node concept="2OqwBi" id="6nJA6bpKsyR" role="37wK5m">
<node concept="3xONca" id="6nJA6bpKsyS" role="2Oq$k0">
<ref role="3xOPvv" node="1N_0WA5DX6Z" resolve="Test_Thinlet" />
@ -118,7 +119,7 @@
<node concept="1jxXqW" id="6nJA6bpKsyU" role="37wK5m" />
</node>
<node concept="liA8E" id="6nJA6bpKsY6" role="2OqNvi">
<ref role="37wK5l" to="t5kh:7y50OW6Y0Sl" resolve="error" />
<ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
</node>
</node>
<node concept="3_1$Yv" id="1N_0WA5IN6H" role="3_9lra">

17
typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.helloWorld@tests.mps
View File

@ -10,6 +10,7 @@
<import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
<import index="bs09" ref="r:28026be8-9bf8-4f54-9319-0ca8a6d1299d(jetbrains.mps.typechecking.sample.helloWorld)" />
<import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.typechecking.ui.plugin)" />
<import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.typechecking)" />
</imports>
<registry>
<language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
@ -110,9 +111,9 @@
<node concept="3clFbS" id="1N_0WA5DT8I" role="3clF47">
<node concept="3ykFI1" id="1N_0WA5IMvR" role="3cqZAp">
<node concept="2OqwBi" id="6nJA6bpKteJ" role="3ykU8v">
<node concept="2YIFZM" id="6nJA6bpKt7i" role="2Oq$k0">
<ref role="37wK5l" to="t5kh:7y50OW6XU7p" resolve="checkTypes" />
<ref role="1Pybhc" to="t5kh:1N_0WA5JxZO" resolve="LaunchTypechecking" />
<node concept="2YIFZM" id="6IQb_RxcBBz" role="2Oq$k0">
<ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
<ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
<node concept="2OqwBi" id="6nJA6bpKt7j" role="37wK5m">
<node concept="3xONca" id="6nJA6bpKt7k" role="2Oq$k0">
<ref role="3xOPvv" node="1N_0WA5DX6Z" resolve="Test_HelloWorld" />
@ -124,7 +125,7 @@
<node concept="1jxXqW" id="6nJA6bpKt7m" role="37wK5m" />
</node>
<node concept="liA8E" id="6nJA6bpKtyF" role="2OqNvi">
<ref role="37wK5l" to="t5kh:7y50OW6Y0Sl" resolve="error" />
<ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
</node>
</node>
<node concept="3_1$Yv" id="1N_0WA5IN6H" role="3_9lra">
@ -141,9 +142,9 @@
<node concept="3clFbS" id="7$Xw2YtL_l2" role="3clF47">
<node concept="3ykFI1" id="7$Xw2YtL_l3" role="3cqZAp">
<node concept="2OqwBi" id="6nJA6bpKtUh" role="3ykU8v">
<node concept="2YIFZM" id="6nJA6bpKtBH" role="2Oq$k0">
<ref role="37wK5l" to="t5kh:7y50OW6XU7p" resolve="checkTypes" />
<ref role="1Pybhc" to="t5kh:1N_0WA5JxZO" resolve="LaunchTypechecking" />
<node concept="2YIFZM" id="6IQb_RxcBB_" role="2Oq$k0">
<ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
<ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
<node concept="2OqwBi" id="6nJA6bpKtBI" role="37wK5m">
<node concept="3xONca" id="6nJA6bpKtBJ" role="2Oq$k0">
<ref role="3xOPvv" node="7$Xw2YtL_mF" resolve="Test_Inheritance" />
@ -155,7 +156,7 @@
<node concept="1jxXqW" id="6nJA6bpKtBL" role="37wK5m" />
</node>
<node concept="liA8E" id="6nJA6bpKuak" role="2OqNvi">
<ref role="37wK5l" to="t5kh:7y50OW6Y0Sl" resolve="error" />
<ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
</node>
</node>
<node concept="3_1$Yv" id="7$Xw2YtL_l9" role="3_9lra">

17
typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.simpleGenerics@tests.mps
View File

@ -10,6 +10,7 @@
<import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
<import index="waaz" ref="r:5669dd77-177e-474f-8fb2-c015a8eb4306(jetbrains.mps.typechecking.sample.simpleGenerics)" />
<import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.typechecking.ui.plugin)" />
<import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.typechecking)" />
</imports>
<registry>
<language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
@ -110,9 +111,9 @@
<node concept="3clFbS" id="1N_0WA5DT8I" role="3clF47">
<node concept="3ykFI1" id="1N_0WA5IMvR" role="3cqZAp">
<node concept="2OqwBi" id="6nJA6bpKuqD" role="3ykU8v">
<node concept="2YIFZM" id="6nJA6bpKujc" role="2Oq$k0">
<ref role="37wK5l" to="t5kh:7y50OW6XU7p" resolve="checkTypes" />
<ref role="1Pybhc" to="t5kh:1N_0WA5JxZO" resolve="LaunchTypechecking" />
<node concept="2YIFZM" id="6IQb_RxcBBw" role="2Oq$k0">
<ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
<ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
<node concept="2OqwBi" id="6nJA6bpKujd" role="37wK5m">
<node concept="3xONca" id="6nJA6bpKuje" role="2Oq$k0">
<ref role="3xOPvv" node="1N_0WA5DX6Z" resolve="Test_SimpleGenerics" />
@ -124,7 +125,7 @@
<node concept="1jxXqW" id="6nJA6bpKujg" role="37wK5m" />
</node>
<node concept="liA8E" id="6nJA6bpKuCg" role="2OqNvi">
<ref role="37wK5l" to="t5kh:7y50OW6Y0Sl" resolve="error" />
<ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
</node>
</node>
<node concept="3_1$Yv" id="1N_0WA5IN6H" role="3_9lra">
@ -141,9 +142,9 @@
<node concept="3clFbS" id="1N_0WA5JFrP" role="3clF47">
<node concept="3ykFI1" id="1N_0WA5JFrQ" role="3cqZAp">
<node concept="2OqwBi" id="6nJA6bpKuOJ" role="3ykU8v">
<node concept="2YIFZM" id="6nJA6bpKuHi" role="2Oq$k0">
<ref role="37wK5l" to="t5kh:7y50OW6XU7p" resolve="checkTypes" />
<ref role="1Pybhc" to="t5kh:1N_0WA5JxZO" resolve="LaunchTypechecking" />
<node concept="2YIFZM" id="6IQb_RxcBBu" role="2Oq$k0">
<ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
<ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
<node concept="2OqwBi" id="6nJA6bpKuHj" role="37wK5m">
<node concept="3xONca" id="6nJA6bpKuHk" role="2Oq$k0">
<ref role="3xOPvv" node="1N_0WA5JFiM" resolve="Test_SimpleGenerics2" />
@ -155,7 +156,7 @@
<node concept="1jxXqW" id="6nJA6bpKuHm" role="37wK5m" />
</node>
<node concept="liA8E" id="6nJA6bpKv2f" role="2OqNvi">
<ref role="37wK5l" to="t5kh:7y50OW6Y0Sl" resolve="error" />
<ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
</node>
</node>
<node concept="3_1$Yv" id="1N_0WA5JFrW" role="3_9lra">

17
typechecking/solutions/jetbrains.mps.typechecking.sample.test/models/jetbrains.mps.typechecking.sample.slice@tests.mps
View File

@ -10,6 +10,7 @@
<import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
<import index="9oqm" ref="r:a8ff5933-0f6e-4d4a-af4a-5da865d78faf(jetbrains.mps.typechecking.sample.slice)" />
<import index="t5kh" ref="r:1514c681-0724-461e-a435-315a6af4b3b4(jetbrains.mps.typechecking.ui.plugin)" />
<import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.typechecking)" />
</imports>
<registry>
<language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
@ -110,9 +111,9 @@
<node concept="3clFbS" id="1N_0WA5DT8I" role="3clF47">
<node concept="3ykFI1" id="1N_0WA5IMvR" role="3cqZAp">
<node concept="2OqwBi" id="6nJA6bpKvFr" role="3ykU8v">
<node concept="2YIFZM" id="6nJA6bpKvcB" role="2Oq$k0">
<ref role="37wK5l" to="t5kh:7y50OW6XU7p" resolve="checkTypes" />
<ref role="1Pybhc" to="t5kh:1N_0WA5JxZO" resolve="LaunchTypechecking" />
<node concept="2YIFZM" id="6IQb_RxcBBt" role="2Oq$k0">
<ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
<ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
<node concept="2OqwBi" id="6nJA6bpKvcC" role="37wK5m">
<node concept="3xONca" id="6nJA6bpKvcD" role="2Oq$k0">
<ref role="3xOPvv" node="1N_0WA5DX6Z" resolve="Test_ComplexTypeErasure" />
@ -124,7 +125,7 @@
<node concept="1jxXqW" id="6nJA6bpKvcF" role="37wK5m" />
</node>
<node concept="liA8E" id="6nJA6bpKvZn" role="2OqNvi">
<ref role="37wK5l" to="t5kh:7y50OW6Y0Sl" resolve="error" />
<ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
</node>
</node>
<node concept="3_1$Yv" id="1N_0WA5IN6H" role="3_9lra">
@ -141,9 +142,9 @@
<node concept="3clFbS" id="1N_0WA5JGix" role="3clF47">
<node concept="3ykFI1" id="1N_0WA5JGiy" role="3cqZAp">
<node concept="2OqwBi" id="6nJA6bpKwkc" role="3ykU8v">
<node concept="2YIFZM" id="6nJA6bpKw4p" role="2Oq$k0">
<ref role="37wK5l" to="t5kh:7y50OW6XU7p" resolve="checkTypes" />
<ref role="1Pybhc" to="t5kh:1N_0WA5JxZO" resolve="LaunchTypechecking" />
<node concept="2YIFZM" id="6IQb_RxcBBs" role="2Oq$k0">
<ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
<ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
<node concept="2OqwBi" id="6nJA6bpKw4q" role="37wK5m">
<node concept="3xONca" id="6nJA6bpKw4r" role="2Oq$k0">
<ref role="3xOPvv" node="1N_0WA5JGhH" resolve="Test_GenericSubst" />
@ -155,7 +156,7 @@
<node concept="1jxXqW" id="6nJA6bpKw4t" role="37wK5m" />
</node>
<node concept="liA8E" id="6nJA6bpKwCp" role="2OqNvi">
<ref role="37wK5l" to="t5kh:7y50OW6Y0Sl" resolve="error" />
<ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
</node>
</node>
<node concept="3_1$Yv" id="1N_0WA5JGiC" role="3_9lra">

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

@ -18,6 +18,7 @@
<dependency reexport="false">0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)</dependency>
<dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)</dependency>
<dependency reexport="false">35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.typechecking.ui)</dependency>
<dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
@ -56,7 +57,8 @@
<module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
<module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
<module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
<module reference="35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.typechecking)" version="0" />
<module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)" version="0" />
<module reference="35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.typechecking.ui)" version="0" />
</dependencyVersions>
</solution>

77
typechecking/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
View File

@ -16,7 +16,7 @@
<imports>
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
<import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
<import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.typesystem2.typechecking)" />
<import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.typesystem2.evaluation)" />
<import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
<import index="umch" ref="r:4caa22a9-5195-4617-8800-5f9f74cc4480(jetbrains.mps.lang.typesystem2.helper.plugin)" />
<import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
@ -36,6 +36,7 @@
<import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
<import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
<import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
<import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.typechecking)" />
</imports>
<registry>
<language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
@ -293,11 +294,11 @@
<node concept="3cpWsn" id="6QH_LDtdTgs" role="3cpWs9">
<property role="TrG5h" value="tc" />
<node concept="3uibUv" id="6QH_LDtdTgp" role="1tU5fm">
<ref role="3uigEE" to="hano:4Z$O9mrQIzY" resolve="Typechecking" />
<ref role="3uigEE" to="tj24:4Z$O9mrQIzY" resolve="Typechecking" />
</node>
<node concept="2YIFZM" id="6QH_LDtdTgt" role="33vP2m">
<ref role="37wK5l" to="hano:4Z$O9mrQIG1" resolve="get" />
<ref role="1Pybhc" to="hano:4Z$O9mrQIzY" resolve="Typechecking" />
<node concept="2YIFZM" id="55Q$YFtvvQb" role="33vP2m">
<ref role="37wK5l" to="tj24:4Z$O9mrQIG1" resolve="get" />
<ref role="1Pybhc" to="tj24:4Z$O9mrQIzY" resolve="Typechecking" />
<node concept="2OqwBi" id="6QH_LDtdTwK" role="37wK5m">
<node concept="1jxXqW" id="6QH_LDtdTWQ" role="2Oq$k0" />
<node concept="liA8E" id="6QH_LDtdTVP" role="2OqNvi">
@ -311,14 +312,14 @@
<node concept="3cpWsn" id="6QH_LDtdVHk" role="3cpWs9">
<property role="TrG5h" value="typesCache" />
<node concept="3uibUv" id="6QH_LDtfmIh" role="1tU5fm">
<ref role="3uigEE" to="hano:6QH_LDtfe19" resolve="Typechecking.TypeCache" />
<ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="Typechecking.TypeCache" />
</node>
<node concept="2OqwBi" id="6QH_LDtdVHl" role="33vP2m">
<node concept="37vLTw" id="6QH_LDtdVHm" role="2Oq$k0">
<ref role="3cqZAo" node="6QH_LDtdTgs" resolve="tc" />
</node>
<node concept="liA8E" id="6QH_LDtdVHn" role="2OqNvi">
<ref role="37wK5l" to="hano:4Z$O9mrQJgp" resolve="cachedTypes" />
<ref role="37wK5l" to="tj24:4Z$O9mrQJgp" resolve="cachedTypes" />
<node concept="37vLTw" id="6QH_LDtdVHo" role="37wK5m">
<ref role="3cqZAo" node="6QH_LDtdVp4" resolve="unit" />
</node>
@ -336,14 +337,14 @@
<node concept="3cpWsn" id="6QH_LDtdXLK" role="3cpWs9">
<property role="TrG5h" value="typeCache2" />
<node concept="3uibUv" id="6QH_LDtfmAJ" role="1tU5fm">
<ref role="3uigEE" to="hano:6QH_LDtfe19" resolve="Typechecking.TypeCache" />
<ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="Typechecking.TypeCache" />
</node>
<node concept="2OqwBi" id="6QH_LDtdXLL" role="33vP2m">
<node concept="37vLTw" id="6QH_LDtdXLM" role="2Oq$k0">
<ref role="3cqZAo" node="6QH_LDtdTgs" resolve="tc" />
</node>
<node concept="liA8E" id="6QH_LDtdXLN" role="2OqNvi">
<ref role="37wK5l" to="hano:6QH_LDtbsGz" resolve="updateCachedTypes" />
<ref role="37wK5l" to="tj24:6QH_LDtbsGz" resolve="updateCachedTypes" />
<node concept="37vLTw" id="6QH_LDtdXLO" role="37wK5m">
<ref role="3cqZAo" node="6QH_LDtdVp4" resolve="unit" />
</node>
@ -359,7 +360,7 @@
<ref role="3cqZAo" node="6QH_LDtdXLR" resolve="typeCache" />
</node>
<node concept="liA8E" id="6QH_LDteuBk" role="2OqNvi">
<ref role="37wK5l" to="hano:6QH_LDtcxgx" resolve="typesModel" />
<ref role="37wK5l" to="tj24:6QH_LDtcxgx" resolve="typesModel" />
</node>
</node>
</node>
@ -408,7 +409,7 @@
<ref role="3cqZAo" node="6QH_LDtdXLR" resolve="typeCache" />
</node>
<node concept="liA8E" id="6QH_LDtesSt" role="2OqNvi">
<ref role="37wK5l" to="hano:6QH_LDtcYUC" resolve="putType" />
<ref role="37wK5l" to="tj24:6QH_LDtcYUC" resolve="putType" />
<node concept="2OqwBi" id="6QH_LDteGcY" role="37wK5m">
<node concept="2JrnkZ" id="6QH_LDteEw4" role="2Oq$k0">
<node concept="3xONca" id="6QH_LDtetdX" role="2JrQYb">
@ -430,7 +431,7 @@
<node concept="37vLTG" id="6QH_LDtdXLR" role="1bW2Oz">
<property role="TrG5h" value="typeCache" />
<node concept="3uibUv" id="6QH_LDtdXLS" role="1tU5fm">
<ref role="3uigEE" to="hano:6QH_LDtcxgf" resolve="Typechecking.UpdatableTypeCache" />
<ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="Typechecking.UpdatableTypeCache" />
</node>
</node>
</node>
@ -448,14 +449,14 @@
<node concept="3cpWsn" id="6QH_LDtdZNu" role="3cpWs9">
<property role="TrG5h" value="typesCache3" />
<node concept="3uibUv" id="6QH_LDtfmZy" role="1tU5fm">
<ref role="3uigEE" to="hano:6QH_LDtfe19" resolve="Typechecking.TypeCache" />
<ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="Typechecking.TypeCache" />
</node>
<node concept="2OqwBi" id="6QH_LDtdZNv" role="33vP2m">
<node concept="37vLTw" id="6QH_LDtdZNw" role="2Oq$k0">
<ref role="3cqZAo" node="6QH_LDtdTgs" resolve="tc" />
</node>
<node concept="liA8E" id="6QH_LDtdZNx" role="2OqNvi">
<ref role="37wK5l" to="hano:4Z$O9mrQJgp" resolve="cachedTypes" />
<ref role="37wK5l" to="tj24:4Z$O9mrQJgp" resolve="cachedTypes" />
<node concept="37vLTw" id="6QH_LDtdZNy" role="37wK5m">
<ref role="3cqZAo" node="6QH_LDtdVp4" resolve="unit" />
</node>
@ -481,7 +482,7 @@
<ref role="3cqZAo" node="6QH_LDtdZNu" resolve="typesCache3" />
</node>
<node concept="liA8E" id="6QH_LDteITL" role="2OqNvi">
<ref role="37wK5l" to="hano:6QH_LDtffJj" resolve="typeOf" />
<ref role="37wK5l" to="tj24:6QH_LDtffJj" resolve="typeOf" />
<node concept="3xONca" id="6QH_LDteITM" role="37wK5m">
<ref role="3xOPvv" node="6QH_LDtdU18" resolve="foo" />
</node>
@ -622,11 +623,11 @@
<node concept="3cpWsn" id="6$7vuu2ugt3" role="3cpWs9">
<property role="TrG5h" value="tplApp" />
<node concept="3uibUv" id="6$7vuu2ugsZ" role="1tU5fm">
<ref role="3uigEE" to="hano:3GlpCDSxTG7" resolve="TypecheckingTemplates" />
<ref role="3uigEE" to="tj24:3GlpCDSxTG7" resolve="TypecheckingTemplates" />
</node>
<node concept="2ShNRf" id="6$7vuu2ugt4" role="33vP2m">
<node concept="1pGfFk" id="6$7vuu2ugt5" role="2ShVmc">
<ref role="37wK5l" to="hano:3GlpCDSychS" resolve="TypecheckingTemplates" />
<ref role="37wK5l" to="tj24:3GlpCDSychS" resolve="TypecheckingTemplates" />
<node concept="37vLTw" id="6$7vuu2ugt6" role="37wK5m">
<ref role="3cqZAo" node="6$7vuu2ugbx" resolve="repository" />
</node>
@ -645,7 +646,7 @@
<ref role="3cqZAo" node="6$7vuu2ugt3" resolve="tplApp" />
</node>
<node concept="liA8E" id="6$7vuu2ujxU" role="2OqNvi">
<ref role="37wK5l" to="hano:3GlpCDSxTKz" resolve="applyTemplates" />
<ref role="37wK5l" to="tj24:3GlpCDSxTKz" resolve="applyTemplates" />
<node concept="2OqwBi" id="6$7vuu2ujxV" role="37wK5m">
<node concept="3xONca" id="6$7vuu2ujxW" role="2Oq$k0">
<ref role="3xOPvv" node="6$7vuu2ubYm" resolve="cls" />
@ -687,7 +688,7 @@
<ref role="3cqZAo" node="6$7vuu2ugt3" resolve="tplApp" />
</node>
<node concept="liA8E" id="6QH_LDtbV5Y" role="2OqNvi">
<ref role="37wK5l" to="hano:3GlpCDSyRnn" resolve="getExpressionSolver" />
<ref role="37wK5l" to="tj24:3GlpCDSyRnn" resolve="getExpressionSolver" />
</node>
</node>
</node>
@ -781,7 +782,7 @@
<ref role="3cqZAo" node="6$7vuu2ugt3" resolve="tplApp" />
</node>
<node concept="liA8E" id="1CcQBrQrTBl" role="2OqNvi">
<ref role="37wK5l" to="hano:3GlpCDSyO$P" resolve="getPrograms" />
<ref role="37wK5l" to="tj24:3GlpCDSyO$P" resolve="getPrograms" />
</node>
</node>
</node>
@ -801,11 +802,11 @@
<node concept="3cpWsn" id="1CcQBrQng1y" role="3cpWs9">
<property role="TrG5h" value="types" />
<node concept="3uibUv" id="1CcQBrQng1v" role="1tU5fm">
<ref role="3uigEE" to="hano:6HT7BWBSFOV" resolve="TypeCollector" />
<ref role="3uigEE" to="tj24:6HT7BWBSFOV" resolve="TypeCollector" />
</node>
<node concept="2ShNRf" id="1CcQBrQng1z" role="33vP2m">
<node concept="1pGfFk" id="1CcQBrQng1$" role="2ShVmc">
<ref role="37wK5l" to="hano:1CcQBrQmOiH" resolve="TypeCollector" />
<ref role="37wK5l" to="tj24:1CcQBrQmOiH" resolve="TypeCollector" />
<node concept="2OqwBi" id="1CcQBrQskR9" role="37wK5m">
<node concept="37vLTw" id="1CcQBrQskRa" role="2Oq$k0">
<ref role="3cqZAo" node="6QH_LDtbV5Q" resolve="evaluator" />
@ -830,7 +831,7 @@
<ref role="3cqZAo" node="1CcQBrQng1y" resolve="types" />
</node>
<node concept="liA8E" id="1CcQBrQoexC" role="2OqNvi">
<ref role="37wK5l" to="hano:1CcQBrQmO_H" resolve="typeNode" />
<ref role="37wK5l" to="tj24:1CcQBrQmO_H" resolve="typeNode" />
<node concept="2OqwBi" id="6$7vuu2w3U0" role="37wK5m">
<node concept="2JrnkZ" id="6$7vuu2w3Lh" role="2Oq$k0">
<node concept="3xONca" id="6$7vuu2w20p" role="2JrQYb">
@ -916,12 +917,12 @@
<property role="TrG5h" value="typeOfExpr" />
<node concept="3Tqbb2" id="6$7vuu2wZdp" role="1tU5fm" />
<node concept="2OqwBi" id="6$7vuu2wZds" role="33vP2m">
<node concept="2YIFZM" id="6$7vuu2wZdt" role="2Oq$k0">
<ref role="37wK5l" to="hano:7kaxm0sEy4A" resolve="getInstance" />
<ref role="1Pybhc" to="hano:7kaxm0sEy3e" resolve="TypecheckingFacade" />
<node concept="2YIFZM" id="55Q$YFtvvQc" role="2Oq$k0">
<ref role="37wK5l" to="tj24:7kaxm0sEy4A" resolve="getInstance" />
<ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingFacade" />
</node>
<node concept="liA8E" id="6$7vuu2wZdu" role="2OqNvi">
<ref role="37wK5l" to="hano:7kaxm0sEBHs" resolve="typeOf" />
<ref role="37wK5l" to="tj24:7kaxm0sEBHs" resolve="typeOf" />
<node concept="3xONca" id="6$7vuu2wZdv" role="37wK5m">
<ref role="3xOPvv" node="6$7vuu2wqbE" resolve="expr" />
</node>
@ -947,12 +948,12 @@
<property role="TrG5h" value="typeOfExpr2" />
<node concept="3Tqbb2" id="6$7vuu2xGoC" role="1tU5fm" />
<node concept="2OqwBi" id="6$7vuu2xGoD" role="33vP2m">
<node concept="2YIFZM" id="6$7vuu2xGoE" role="2Oq$k0">
<ref role="37wK5l" to="hano:7kaxm0sEy4A" resolve="getInstance" />
<ref role="1Pybhc" to="hano:7kaxm0sEy3e" resolve="TypecheckingFacade" />
<node concept="2YIFZM" id="55Q$YFtvvQd" role="2Oq$k0">
<ref role="37wK5l" to="tj24:7kaxm0sEy4A" resolve="getInstance" />
<ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingFacade" />
</node>
<node concept="liA8E" id="6$7vuu2xGoF" role="2OqNvi">
<ref role="37wK5l" to="hano:7kaxm0sEBHs" resolve="typeOf" />
<ref role="37wK5l" to="tj24:7kaxm0sEBHs" resolve="typeOf" />
<node concept="3xONca" id="6$7vuu2xGoG" role="37wK5m">
<ref role="3xOPvv" node="6$7vuu2wqbE" resolve="expr" />
</node>
@ -1229,11 +1230,11 @@
<node concept="3cpWsn" id="7y50OW6ZE45" role="3cpWs9">
<property role="TrG5h" value="checkTypes" />
<node concept="3uibUv" id="7y50OW6ZE42" role="1tU5fm">
<ref role="3uigEE" to="t5kh:7y50OW6XXpr" resolve="LaunchTypechecking.TypecheckingResult" />
<ref role="3uigEE" to="tj24:7y50OW6XXpr" resolve="LaunchTypechecking.TypecheckingResult" />
</node>
<node concept="2YIFZM" id="7y50OW6ZE46" role="33vP2m">
<ref role="37wK5l" to="t5kh:7y50OW6XU7p" resolve="checkTypes" />
<ref role="1Pybhc" to="t5kh:1N_0WA5JxZO" resolve="LaunchTypechecking" />
<node concept="2YIFZM" id="6IQb_RxcBBB" role="33vP2m">
<ref role="37wK5l" to="tj24:7y50OW6XU7p" resolve="checkTypes" />
<ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="LaunchTypechecking" />
<node concept="3xONca" id="7y50OW6ZE47" role="37wK5m">
<ref role="3xOPvv" node="4nxCIBqymjB" resolve="class" />
</node>
@ -1247,7 +1248,7 @@
<ref role="3cqZAo" node="7y50OW6ZE45" resolve="checkTypes" />
</node>
<node concept="liA8E" id="7y50OW6ZEtL" role="2OqNvi">
<ref role="37wK5l" to="t5kh:7y50OW6Y0Sl" resolve="error" />
<ref role="37wK5l" to="tj24:7y50OW6Y0Sl" resolve="error" />
</node>
</node>
</node>
@ -1288,7 +1289,7 @@
<ref role="3cqZAo" node="7y50OW6ZE45" resolve="checkTypes" />
</node>
<node concept="liA8E" id="7y50OW6ZH4p" role="2OqNvi">
<ref role="37wK5l" to="t5kh:7y50OW6XYoC" resolve="getType" />
<ref role="37wK5l" to="tj24:7y50OW6XYoC" resolve="getType" />
<node concept="3xONca" id="7y50OW6ZH4q" role="37wK5m">
<ref role="3xOPvv" node="1eKXYsjuWjw" resolve="fieldA" />
</node>
@ -1307,7 +1308,7 @@
<ref role="3cqZAo" node="7y50OW6ZE45" resolve="checkTypes" />
</node>
<node concept="liA8E" id="7y50OW701J5" role="2OqNvi">
<ref role="37wK5l" to="t5kh:7y50OW6XYoC" resolve="getType" />
<ref role="37wK5l" to="tj24:7y50OW6XYoC" resolve="getType" />
<node concept="3xONca" id="7y50OW701Tq" role="37wK5m">
<ref role="3xOPvv" node="7y50OW6ZXVj" resolve="fieldB" />
</node>

20
typechecking/solutions/jetbrains.mps.typechecking.ui/jetbrains.mps.typechecking.ui.msd
View File

@ -4,26 +4,14 @@
<modelRoot contentPath="${module}" type="default">
<sourceRoot location="models" />
</modelRoot>
<modelRoot contentPath="${module}" type="java_classes">
<sourceRoot location="lib/rxjava-2.1.1.jar" />
<sourceRoot location="lib/reactive-streams-1.0.0.final.jar" />
<sourceRoot location="lib/rxjava2-swing-0.2.1.jar" />
</modelRoot>
</models>
<stubModelEntries>
<stubModelEntry path="${module}/lib/rxjava-2.1.1.jar" />
<stubModelEntry path="${module}/lib/rxjava2-swing-0.2.1.jar" />
<stubModelEntry path="${module}/lib/reactive-streams-1.0.0.final.jar" />
</stubModelEntries>
<sourcePath />
<dependencies>
<dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
<dependency reexport="true">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
<dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
<dependency reexport="false">df9d410f-2ebb-43f7-893a-483a4f085250(jetbrains.mps.smodel.resources)</dependency>
<dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)</dependency>
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
<dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
<dependency reexport="false">a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime)</dependency>
<dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
<dependency reexport="false">5b1f863d-65a0-41a6-a801-33896be24202(jetbrains.mps.ide.editor)</dependency>
@ -32,6 +20,7 @@
<dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
<dependency reexport="true">bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)</dependency>
<dependency reexport="false">274c9cfa-1024-4444-904c-f2f1383a35da(jetbrains.mps.lang.typesystem2.helper)</dependency>
<dependency reexport="true">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
@ -60,17 +49,14 @@
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
<module reference="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" version="0" />
<module reference="5b1f863d-65a0-41a6-a801-33896be24202(jetbrains.mps.ide.editor)" version="0" />
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
<module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
<module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
<module reference="274c9cfa-1024-4444-904c-f2f1383a35da(jetbrains.mps.lang.typesystem2.helper)" version="0" />
<module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)" version="0" />
<module reference="35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.lang.typesystem2.sampleplugin)" version="0" />
<module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
<module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
<module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
<module reference="a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime)" version="0" />
<module reference="df9d410f-2ebb-43f7-893a-483a4f085250(jetbrains.mps.smodel.resources)" version="0" />
<module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)" version="0" />
<module reference="35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.typechecking.ui)" version="0" />
</dependencyVersions>
</solution>

6672
typechecking/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps
View File

File diff suppressed because it is too large Load Diff

0
typechecking/solutions/jetbrains.mps.typechecking.ui/build.gradle → typechecking/solutions/jetbrains.mps.typechecking/build.gradle
View File

0
typechecking/solutions/jetbrains.mps.typechecking.ui/gradle.properties → typechecking/solutions/jetbrains.mps.typechecking/gradle.properties
View File

62
typechecking/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd Normal file
View File

@ -0,0 +1,62 @@
<?xml version="1.0" encoding="UTF-8"?>
<solution name="jetbrains.mps.typechecking" uuid="6998f568-f0e9-473b-b4a8-9efb6499fc8d" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
<models>
<modelRoot contentPath="${module}" type="default">
<sourceRoot location="models" />
</modelRoot>
<modelRoot contentPath="${module}" type="java_classes">
<sourceRoot location="lib/reactive-streams-1.0.0.final.jar" />
<sourceRoot location="lib/rxjava-2.1.1.jar" />
<sourceRoot location="lib/rxjava2-swing-0.2.1.jar" />
</modelRoot>
</models>
<stubModelEntries>
<stubModelEntry path="${module}/lib/reactive-streams-1.0.0.final.jar" />
<stubModelEntry path="${module}/lib/rxjava-2.1.1.jar" />
<stubModelEntry path="${module}/lib/rxjava2-swing-0.2.1.jar" />
</stubModelEntries>
<sourcePath />
<dependencies>
<dependency reexport="true">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
<dependency reexport="false">274c9cfa-1024-4444-904c-f2f1383a35da(jetbrains.mps.lang.typesystem2.helper)</dependency>
<dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
<dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)</dependency>
<dependency reexport="true">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
<dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
<dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)</dependency>
<dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
<dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
<dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
<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:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
</languageVersions>
<dependencyVersions>
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
<module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
<module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
<module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
<module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
<module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
<module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
<module reference="274c9cfa-1024-4444-904c-f2f1383a35da(jetbrains.mps.lang.typesystem2.helper)" version="0" />
<module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)" version="0" />
<module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
<module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
<module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
<module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)" version="0" />
</dependencyVersions>
</solution>

8619
typechecking/solutions/jetbrains.mps.typechecking/models/typechecking.mps Normal file
View File

File diff suppressed because it is too large Load Diff

11
typesystem2/languages/jetbrains.mps.lang.smodel.types/generator/template/main@generator.mps
View File

@ -6,7 +6,8 @@
<devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
</languages>
<imports>
<import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.typesystem2.typechecking)" />
<import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.typesystem2.evaluation)" />
<import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.typechecking)" />
<import index="z8tp" ref="r:5bfbd177-208e-4d27-b74c-2ebd2a92eb80(jetbrains.mps.lang.smodel.types.structure)" implicit="true" />
<import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" implicit="true" />
</imports>
@ -75,12 +76,12 @@
<node concept="3clFbS" id="3u5wJtc3VJ" role="1Koe22">
<node concept="3clFbF" id="3u5wJtc3VK" role="3cqZAp">
<node concept="2OqwBi" id="3u5wJtc3VL" role="3clFbG">
<node concept="2YIFZM" id="3u5wJtc3VM" role="2Oq$k0">
<ref role="37wK5l" to="hano:7kaxm0sEy4A" resolve="getInstance" />
<ref role="1Pybhc" to="hano:7kaxm0sEy3e" resolve="TypecheckingFacade" />
<node concept="2YIFZM" id="55Q$YFtvvQe" role="2Oq$k0">
<ref role="37wK5l" to="tj24:7kaxm0sEy4A" resolve="getInstance" />
<ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingFacade" />
</node>
<node concept="liA8E" id="3u5wJtc3VN" role="2OqNvi">
<ref role="37wK5l" to="hano:7kaxm0sEBHs" resolve="typeOf" />
<ref role="37wK5l" to="tj24:7kaxm0sEBHs" resolve="typeOf" />
<node concept="10Nm6u" id="3u5wJtc3VO" role="37wK5m">
<node concept="29HgVG" id="3u5wJtc3VP" role="lGtFl">
<node concept="3NFfHV" id="3u5wJtc3VQ" role="3NFExx">

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

@ -17,6 +17,7 @@
<dependencies>
<dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)</dependency>
<dependency reexport="false">2bdcefec-ba49-4b32-ab50-ebc7a41d5090(jetbrains.mps.lang.smodel#1139186730696)</dependency>
<dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
@ -54,6 +55,8 @@
<module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
<module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
<module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)" version="0" />
<module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
<module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)" version="0" />
</dependencyVersions>
<mapping-priorities>
<mapping-priority-rule kind="strictly_together">

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

@ -49,7 +49,7 @@
<import index="yg8f" ref="r:e213377a-f1a7-4ba7-9d08-96bcb97ed8ce(jetbrains.mps.logic.builtin)" />
<import index="dush" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.persistence(MPS.OpenAPI/)" />
<import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" />
<import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.typesystem2.typechecking)" />
<import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.typesystem2.evaluation)" />
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
<import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
<import index="hypd" ref="r:aa31e43e-9240-4f4d-b6db-5c1c9a86c59e(jetbrains.mps.lang.project.structure)" implicit="true" />

2
typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd
View File

@ -13,7 +13,6 @@
<dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
<dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)</dependency>
<dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
<dependency reexport="false">274c9cfa-1024-4444-904c-f2f1383a35da(jetbrains.mps.lang.typesystem2.helper)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
@ -40,7 +39,6 @@
<module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
<module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
<module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
<module reference="274c9cfa-1024-4444-904c-f2f1383a35da(jetbrains.mps.lang.typesystem2.helper)" version="0" />
<module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)" version="0" />
<module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
<module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />

3414
typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains/mps/lang/typesystem2/typechecking.mps → typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains.mps.lang.typesystem2.evaluation.mps
View File

File diff suppressed because it is too large Load Diff

3
typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/jetbrains.mps.lang.typesystem2.helper.msd
View File

@ -9,7 +9,7 @@
<dependencies>
<dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
<dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
<dependency reexport="true">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
@ -22,6 +22,7 @@
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="2" />
<language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
</languageVersions>
<dependencyVersions>

4
typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/models/jetbrains/mps/lang/typesystem2/helper/plugin.mps
View File

@ -6,6 +6,8 @@
<use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
<use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
<use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
</languages>
<imports>
<import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
@ -17,6 +19,8 @@
<import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
<import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
<import index="31cb" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.extapi.module(MPS.Core/)" />
<import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
<import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
</imports>
<registry>