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

Fix tests for incremental tc of BL. Add more tests for types with bounds. Temporarily revert reporting method to the old one.

This commit is contained in:
Grigorii Kirgizov 2019-07-24 19:27:11 +03:00 committed by Fedor Isakov
parent 0ab4e48da1
commit 9b49c3f053
5 changed files with 1601 additions and 1657 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking.test.util.mps
View File

@ -1858,7 +1858,7 @@
</node>
</node>
<node concept="37vLTG" id="3GEs5q_3o_k" role="3clF46">
<property role="TrG5h" value="target" />
<property role="TrG5h" value="targetRef" />
<node concept="2sp9CU" id="3GEs5q_3o_l" role="1tU5fm" />
</node>
<node concept="37vLTG" id="3GEs5q_3o_m" role="3clF46">
@ -1870,21 +1870,30 @@
<node concept="3clFbS" id="3GEs5q_3o_q" role="3clF47">
<node concept="3clFbJ" id="3o9wrC3ylNj" role="3cqZAp">
<node concept="3clFbS" id="3o9wrC3ylNl" role="3clFbx">
<node concept="3cpWs8" id="4t5t2tffpl6" role="3cqZAp">
<node concept="3cpWsn" id="4t5t2tffpl9" role="3cpWs9">
<property role="TrG5h" value="target" />
<node concept="3Tqbb2" id="4t5t2tffpl4" role="1tU5fm" />
<node concept="2OqwBi" id="3o9wrC3LyDK" role="33vP2m">
<node concept="37vLTw" id="3o9wrC3$mcD" role="2Oq$k0">
<ref role="3cqZAo" node="3GEs5q_3o_k" resolve="targetRef" />
</node>
<node concept="Vyspw" id="3o9wrC3LyVs" role="2OqNvi">
<node concept="37vLTw" id="3o9wrC3LzfJ" role="Vysub">
<ref role="3cqZAo" node="tyIfzC1aQx" resolve="repo" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="3o9wrC3$3ft" role="3cqZAp">
<node concept="2OqwBi" id="3o9wrC3$lh4" role="3clFbG">
<node concept="37vLTw" id="3o9wrC3$3fr" role="2Oq$k0">
<ref role="3cqZAo" node="3o9wrC3yh0W" resolve="failedNodes" />
</node>
<node concept="TSZUe" id="3o9wrC3$lO3" role="2OqNvi">
<node concept="2OqwBi" id="3o9wrC3LyDK" role="25WWJ7">
<node concept="37vLTw" id="3o9wrC3$mcD" role="2Oq$k0">
<ref role="3cqZAo" node="3GEs5q_3o_k" resolve="target" />
</node>
<node concept="Vyspw" id="3o9wrC3LyVs" role="2OqNvi">
<node concept="37vLTw" id="3o9wrC3LzfJ" role="Vysub">
<ref role="3cqZAo" node="tyIfzC1aQx" resolve="repo" />
</node>
</node>
<node concept="37vLTw" id="4t5t2tffrSa" role="25WWJ7">
<ref role="3cqZAo" node="4t5t2tffpl9" resolve="target" />
</node>
</node>
</node>

76
coderules/solutions/jetbrains.mps.coderules/models/service.mps
View File

@ -1992,48 +1992,48 @@
</node>
</node>
</node>
<node concept="1X3_iC" id="6fTgyZtNmid" role="lGtFl">
<property role="3V$3am" value="statement" />
<property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
<node concept="3cpWs8" id="3o9wrC3tl4y" role="8Wnug">
<node concept="3cpWsn" id="3o9wrC3tl4w" role="3cpWs9">
<property role="3TUv4t" value="true" />
<property role="TrG5h" value="supervisor" />
<node concept="3uibUv" id="3o9wrC3tmgD" role="1tU5fm">
<ref role="3uigEE" to="w7la:~Supervisor" resolve="Supervisor" />
</node>
<node concept="2ShNRf" id="3o9wrC3trPm" role="33vP2m">
<node concept="1pGfFk" id="3o9wrC3ttgt" role="2ShVmc">
<ref role="37wK5l" to="hano:3o9wrC3sC_c" resolve="OriginReportingSupervisor" />
<node concept="2OqwBi" id="3o9wrC3tvAX" role="37wK5m">
<node concept="37vLTw" id="3o9wrC3tu_g" role="2Oq$k0">
<ref role="3cqZAo" node="7WKNeR9AoxI" resolve="programProducer" />
</node>
<node concept="liA8E" id="3o9wrC3twLu" role="2OqNvi">
<ref role="37wK5l" to="hano:3GlpCDSyO$P" resolve="getProgram" />
</node>
<node concept="3cpWs8" id="3o9wrC3tl4y" role="3cqZAp">
<node concept="3cpWsn" id="3o9wrC3tl4w" role="3cpWs9">
<property role="3TUv4t" value="true" />
<property role="TrG5h" value="supervisor" />
<node concept="3uibUv" id="3o9wrC3tmgD" role="1tU5fm">
<ref role="3uigEE" to="w7la:~Supervisor" resolve="Supervisor" />
</node>
<node concept="2ShNRf" id="3o9wrC3trPm" role="33vP2m">
<node concept="1pGfFk" id="3o9wrC3ttgt" role="2ShVmc">
<ref role="37wK5l" to="hano:3o9wrC3sC_c" resolve="OriginReportingSupervisor" />
<node concept="2OqwBi" id="3o9wrC3tvAX" role="37wK5m">
<node concept="37vLTw" id="3o9wrC3tu_g" role="2Oq$k0">
<ref role="3cqZAo" node="7WKNeR9AoxI" resolve="programProducer" />
</node>
<node concept="liA8E" id="3o9wrC3twLu" role="2OqNvi">
<ref role="37wK5l" to="hano:3GlpCDSyO$P" resolve="getProgram" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="3o9wrC3WxS6" role="3cqZAp">
<node concept="3cpWsn" id="3o9wrC3WxS7" role="3cpWs9">
<property role="3TUv4t" value="true" />
<property role="TrG5h" value="supervisor" />
<node concept="3uibUv" id="3o9wrC3WxS8" role="1tU5fm">
<ref role="3uigEE" to="w7la:~Supervisor" resolve="Supervisor" />
</node>
<node concept="2ShNRf" id="3o9wrC3VZhD" role="33vP2m">
<node concept="1pGfFk" id="3o9wrC3W0Hw" role="2ShVmc">
<ref role="37wK5l" to="hano:3o9wrC3VMfB" resolve="PrincipalNodeReportingSupervisor" />
<node concept="2OqwBi" id="3o9wrC3W3dV" role="37wK5m">
<node concept="37vLTw" id="3o9wrC3W1V9" role="2Oq$k0">
<ref role="3cqZAo" node="7WKNeR9AoxI" resolve="programProducer" />
</node>
<node concept="liA8E" id="3o9wrC3W4po" role="2OqNvi">
<ref role="37wK5l" to="hano:1H_6AUT8p2f" resolve="getProgramSpec" />
<node concept="1X3_iC" id="5DfcI9Uuw0F" role="lGtFl">
<property role="3V$3am" value="statement" />
<property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
<node concept="3cpWs8" id="3o9wrC3WxS6" role="8Wnug">
<node concept="3cpWsn" id="3o9wrC3WxS7" role="3cpWs9">
<property role="3TUv4t" value="true" />
<property role="TrG5h" value="supervisor" />
<node concept="3uibUv" id="3o9wrC3WxS8" role="1tU5fm">
<ref role="3uigEE" to="w7la:~Supervisor" resolve="Supervisor" />
</node>
<node concept="2ShNRf" id="3o9wrC3VZhD" role="33vP2m">
<node concept="1pGfFk" id="3o9wrC3W0Hw" role="2ShVmc">
<ref role="37wK5l" to="hano:3o9wrC3VMfB" resolve="PrincipalNodeReportingSupervisor" />
<node concept="2OqwBi" id="3o9wrC3W3dV" role="37wK5m">
<node concept="37vLTw" id="3o9wrC3W1V9" role="2Oq$k0">
<ref role="3cqZAo" node="7WKNeR9AoxI" resolve="programProducer" />
</node>
<node concept="liA8E" id="3o9wrC3W4po" role="2OqNvi">
<ref role="37wK5l" to="hano:1H_6AUT8p2f" resolve="getProgramSpec" />
</node>
</node>
</node>
</node>
@ -2064,8 +2064,8 @@
<node concept="37vLTw" id="7WKNeR9AoxM" role="37wK5m">
<ref role="3cqZAo" node="7WKNeR9AoxI" resolve="programProducer" />
</node>
<node concept="37vLTw" id="6fTgyZtNyLJ" role="37wK5m">
<ref role="3cqZAo" node="3o9wrC3WxS7" resolve="supervisor" />
<node concept="37vLTw" id="5DfcI9UuzgE" role="37wK5m">
<ref role="3cqZAo" node="3o9wrC3tl4w" resolve="supervisor" />
</node>
<node concept="2ShNRf" id="7WKNeR9Gjbf" role="37wK5m">
<node concept="1pGfFk" id="7WKNeR9Gjbg" role="2ShVmc">

92
samples/mpscore/build.xml
View File

@ -139,8 +139,6 @@
<module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
<module ref="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" kind="cl" />
<module ref="df345b11-b8c7-4213-ac66-48d2a9b75d88(jetbrains.mps.baseLanguageInternal)" kind="cl" />
<module ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" kind="cl" />
<module ref="c9670c16-a215-41fb-8784-04b14329799d(jetbrains.mps.coderules.typechecking.test)" kind="cl" />
<module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
<module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
<module ref="b189d6c6-9397-4d64-88af-1ac73760a4f5(jetbrains.mps.logic.test)" kind="cl" />
@ -151,12 +149,9 @@
<language id="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" />
<language id="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" />
<language id="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" />
<language id="l:0fda14cc-a416-4c81-869a-2175d8b3325d:jetbrains.mps.baseLanguageExt" />
<language id="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" />
<language id="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" />
<language id="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" />
<language id="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" />
<language id="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" />
<language id="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" />
</uses>
<classpath>
@ -209,6 +204,7 @@
<module ref="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)" kind="cl" />
<module ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" kind="cl" />
<module ref="c9670c16-a215-41fb-8784-04b14329799d(jetbrains.mps.coderules.typechecking.test)" kind="cl" />
<module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
</dependencies>
<uses>
<language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
@ -326,8 +322,12 @@
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.typesystem.jar" />
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.general-purpose.jar" />
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-descriptor.jar" />
<library file="${artifacts.mps}/languages/editor/jetbrains.mps.editor.runtime.jar" />
<library file="${artifacts.mps}/languages/editor/jetbrains.mps.editorlang.runtime.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.analyzers.runtime.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.dataFlow.runtime.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.findUsages.runtime.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.aspect.jar" />
@ -357,31 +357,41 @@
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.sharedConcepts.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.query.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.query.runtime.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.textGen.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.util.order.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.refactoring.participant.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.typesystemEngine.jar" />
<library file="${artifacts.mps}/languages/make/jetbrains.mps.make.facets.jar" />
<library file="${artifacts.mps}/languages/make/jetbrains.mps.make.runtime.jar" />
<library file="${artifacts.mps}/languages/make/jetbrains.mps.smodel.resources.jar" />
<library file="${artifacts.mps}/languages/mps-stubs.jar" />
<library file="${artifacts.mps}/languages/plaf/jetbrains.mps.baseLanguage.search.jar" />
<library file="${artifacts.mps}/languages/plaf/jetbrains.mps.baseLanguage.util.jar" />
<library file="${artifacts.mps}/languages/plaf/jetbrains.mps.ide.platform.jar" />
<library file="${artifacts.mps}/languages/text/jetbrains.mps.lang.text.jar" />
<library file="${artifacts.mps}/languages/tools/jetbrains.mps.core.tool.environment.jar" />
<library file="${artifacts.mps}/languages/tools/jetbrains.mps.tool.common.jar" />
<library file="${artifacts.mps}/languages/util/jetbrains.mps.kernel.jar" />
<library file="${artifacts.mps}/languages/util/jetbrains.mps.lang.behavior.api.jar" />
<library file="${artifacts.mps}/languages/util/jetbrains.mps.lang.behavior.runtime.jar" />
<library file="${artifacts.mps}/languages/util/jetbrains.mps.project.jar" />
<library file="${artifacts.mps}/languages/util/jetbrains.mps.refactoring.jar" />
<library file="${artifacts.mps}/languages/util/jetbrains.mps.refactoring.runtime.jar" />
<library file="${artifacts.mps}/languages/util/jetbrains.mps.runtime.jar" />
<library file="${artifacts.mps}/languages/xml/jetbrains.mps.core.xml.jar" />
<library file="${artifacts.mps}/lib/mps-behavior-api.jar" />
<library file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
<library file="${artifacts.mps}/lib/mps-core.jar" />
<library file="${artifacts.mps}/lib/mps-editor.jar" />
<library file="${artifacts.mps}/lib/mps-environment.jar" />
<library file="${artifacts.mps}/lib/mps-platform.jar" />
<library file="${artifacts.mps}/lib/mps-stubs.jar" />
<library file="${artifacts.mps}/lib/mps-test.jar" />
<library file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
<library file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
<library file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
<library file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
<chunk>
<module file="${basedir}/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl" />
<module file="${basedir}/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd" />
</chunk>
<chunk>
<module file="${basedir}/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd" />
<module file="${basedir}/solutions/typechecking.samples.baseLanguage/typechecking.samples.baseLanguage.msd" />
</chunk>
<jvmargs>
@ -414,19 +424,20 @@
<fileset file="${artifacts.mps}/lib/mps-core.jar" />
<fileset file="${artifacts.mps}/lib/mps-platform.jar" />
<fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
<fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
<fileset file="${artifacts.mps}/lib/mps-logging.jar" />
<fileset file="${artifacts.mps}/lib/mps-closures.jar" />
<fileset file="${artifacts.mps}/lib/mps-collections.jar" />
<fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
<fileset file="${artifacts.mps}/lib/mps-references.jar" />
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
<fileset file="${artifacts.mps}/lib/mps-messaging.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-generator.jar" />
<fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
<fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
<fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
@ -480,19 +491,20 @@
<fileset file="${artifacts.mps}/lib/mps-core.jar" />
<fileset file="${artifacts.mps}/lib/mps-platform.jar" />
<fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
<fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
<fileset file="${artifacts.mps}/lib/mps-logging.jar" />
<fileset file="${artifacts.mps}/lib/mps-closures.jar" />
<fileset file="${artifacts.mps}/lib/mps-collections.jar" />
<fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
<fileset file="${artifacts.mps}/lib/mps-references.jar" />
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
<fileset file="${artifacts.mps}/lib/mps-messaging.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-generator.jar" />
<fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
<fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
<fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
@ -512,23 +524,13 @@
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
<fileset file="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
<fileset file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.jar" />
<fileset file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.typechecking.jar" />
<fileset file="${artifacts.coderules}/deploy/jetbrains.mps.coderules.typechecking.test.jar" />
<fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
<fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.template.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
<fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
<fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />
<fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.runtime.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
<fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
<fileset file="${artifacts.coderules}/deploy/jetbrains.mps.logic.runtime.jar" />
<fileset file="${artifacts.coderules}/deploy/jetbrains.mps.logic.test.jar" />
<fileset file="${artifacts.coderules}/deploy/jetbrains.mps.reporting.runtime.jar" />
<fileset dir="${artifacts.coderules}/deploy/lib" includes="reactive-streams-1.0.0.final.jar" />
<fileset dir="${artifacts.coderules}/deploy/lib" includes="rxjava-2.1.1.jar" />
<fileset dir="${artifacts.coderules}/deploy/lib" includes="rxjava2-swing-0.2.1.jar" />
<fileset dir="${artifacts.coderules}/deploy/lib" includes="collection-0.7.jar" />
<fileset dir="${artifacts.coderules}/deploy/lib" includes="trove4j-3.0.3.jar" />
<fileset dir="${artifacts.coderules}/deploy/lib" includes="conreactor-core-0.9.10.jar" />
@ -551,19 +553,20 @@
<fileset file="${artifacts.mps}/lib/mps-core.jar" />
<fileset file="${artifacts.mps}/lib/mps-platform.jar" />
<fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
<fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
<fileset file="${artifacts.mps}/lib/mps-logging.jar" />
<fileset file="${artifacts.mps}/lib/mps-closures.jar" />
<fileset file="${artifacts.mps}/lib/mps-collections.jar" />
<fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
<fileset file="${artifacts.mps}/lib/mps-references.jar" />
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
<fileset file="${artifacts.mps}/lib/mps-messaging.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-generator.jar" />
<fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
<fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
<fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
@ -652,8 +655,12 @@
<pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.typesystem.jar" />
<pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.general-purpose.jar" />
<pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-descriptor.jar" />
<pathelement location="${artifacts.mps}/languages/editor/jetbrains.mps.editor.runtime.jar" />
<pathelement location="${artifacts.mps}/languages/editor/jetbrains.mps.editorlang.runtime.jar" />
<pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.analyzers.runtime.jar" />
<pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
<pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.dataFlow.runtime.jar" />
<pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.findUsages.runtime.jar" />
<pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
<pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
<pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.behavior.jar" />
@ -682,20 +689,29 @@
<pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.sharedConcepts.jar" />
<pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
<pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.query.jar" />
<pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.query.runtime.jar" />
<pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
<pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.textGen.jar" />
<pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
<pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
<pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.refactoring.participant.jar" />
<pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.typesystemEngine.jar" />
<pathelement location="${artifacts.mps}/languages/make/jetbrains.mps.make.facets.jar" />
<pathelement location="${artifacts.mps}/languages/make/jetbrains.mps.make.runtime.jar" />
<pathelement location="${artifacts.mps}/languages/make/jetbrains.mps.smodel.resources.jar" />
<pathelement location="${artifacts.mps}/languages/mps-stubs.jar" />
<pathelement location="${artifacts.mps}/languages/plaf/jetbrains.mps.baseLanguage.search.jar" />
<pathelement location="${artifacts.mps}/languages/plaf/jetbrains.mps.baseLanguage.util.jar" />
<pathelement location="${artifacts.mps}/languages/text/jetbrains.mps.lang.text.jar" />
<pathelement location="${artifacts.mps}/lib/mps-behavior-api.jar" />
<pathelement location="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
<pathelement location="${artifacts.mps}/lib/mps-core.jar" />
<pathelement location="${artifacts.mps}/lib/mps-editor.jar" />
<pathelement location="${artifacts.mps}/lib/mps-environment.jar" />
<pathelement location="${artifacts.mps}/lib/mps-platform.jar" />
<pathelement location="${artifacts.mps}/lib/mps-stubs.jar" />
<pathelement location="${artifacts.mps}/lib/mps-test.jar" />
<pathelement location="${artifacts.mps}/languages/tools/jetbrains.mps.core.tool.environment.jar" />
<pathelement location="${artifacts.mps}/languages/tools/jetbrains.mps.tool.common.jar" />
<pathelement location="${artifacts.mps}/languages/util/jetbrains.mps.kernel.jar" />
<pathelement location="${artifacts.mps}/languages/util/jetbrains.mps.lang.behavior.api.jar" />
<pathelement location="${artifacts.mps}/languages/util/jetbrains.mps.lang.behavior.runtime.jar" />
<pathelement location="${artifacts.mps}/languages/util/jetbrains.mps.project.jar" />
<pathelement location="${artifacts.mps}/languages/util/jetbrains.mps.refactoring.jar" />
<pathelement location="${artifacts.mps}/languages/util/jetbrains.mps.refactoring.runtime.jar" />
<pathelement location="${artifacts.mps}/languages/util/jetbrains.mps.runtime.jar" />
<pathelement location="${artifacts.mps}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
<pathelement location="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
<pathelement location="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.matcher.jar" />

10
samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
View File

@ -2784,7 +2784,7 @@
<node concept="2GrKxI" id="2rIdnPvQfvq" role="2Gsz3X">
<property role="TrG5h" value="sp" />
</node>
<node concept="37vLTw" id="2rIdnPvQfyg" role="2GsD0m">
<node concept="37vLTw" id="4t5t2tfguNr" role="2GsD0m">
<ref role="3cqZAo" node="2rIdnPuJSEy" resolve="subtypePaths" />
</node>
<node concept="3clFbS" id="2rIdnPvQfvu" role="2LFqv$">
@ -21909,7 +21909,7 @@
<node concept="VVOAv" id="3KV3FXk1ZsY" role="qph3F">
<node concept="TZ5HA" id="3KV3FXk1Zt0" role="2Xj1qM">
<node concept="1dT_AC" id="3KV3FXk1Zt4" role="1dT_Ay">
<property role="1dT_AB" value="fullPaths" />
<property role="1dT_AB" value="allPaths" />
</node>
</node>
</node>
@ -21953,7 +21953,7 @@
<node concept="VVOAv" id="3KV3FXk1ZuD" role="qph3F">
<node concept="TZ5HA" id="3KV3FXk1ZuF" role="2Xj1qM">
<node concept="1dT_AC" id="3KV3FXk1ZuJ" role="1dT_Ay">
<property role="1dT_AB" value="fullPaths" />
<property role="1dT_AB" value="allPaths" />
</node>
</node>
</node>
@ -22371,7 +22371,7 @@
<node concept="VVOAv" id="3KV3FXk1ZkS" role="qph3F">
<node concept="TZ5HA" id="3KV3FXk1ZkW" role="2Xj1qM">
<node concept="1dT_AC" id="3KV3FXk1Zl2" role="1dT_Ay">
<property role="1dT_AB" value="fullPathsVal" />
<property role="1dT_AB" value="allPaths" />
</node>
</node>
</node>
@ -22383,7 +22383,7 @@
<node concept="VVOAv" id="3KV3FXk1Zlg" role="qph3F">
<node concept="TZ5HA" id="3KV3FXk1Zli" role="2Xj1qM">
<node concept="1dT_AC" id="3KV3FXk1Zlm" role="1dT_Ay">
<property role="1dT_AB" value="startFromVal" />
<property role="1dT_AB" value="startFrom" />
</node>
</node>
</node>

3051
samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.incrementalBL@tests.mps
View File

File diff suppressed because it is too large Load Diff