Fix the trace displaying only the first stage. Simplify types in TypecheckingHelper. Refactor LaunchTypechecking to use CollectTypesStep.
This commit is contained in:
Fedor Isakov
parent
b9e44ef2eb
commit
f2710aa8d6
29
build.xml
29
build.xml
|
|
@ -538,10 +538,12 @@
|
|||
<dependencies>
|
||||
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
|
||||
<module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
|
||||
<module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" />
|
||||
<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="83f155ff-422c-4b5a-a2f2-b459302dd215(jetbrains.mps.baseLanguage.unitTest.libs)" />
|
||||
<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="e55e6749-03cb-4ea7-9695-2322bab791c1(jetbrains.mps.lang.test.matcher)" />
|
||||
|
|
@ -1929,7 +1931,7 @@
|
|||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.java.modules.cycle.1" depends="java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
|
||||
<target name="java.compile.java.modules.cycle.1" depends="java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
|
||||
<mkdir dir="${build.tmp}/java.modules.cycle.1" />
|
||||
<javac destdir="${build.tmp}/java.modules.cycle.1" fork="true" encoding="utf8" nowarn="true" includeantruntime="false">
|
||||
<compilerarg value="-Xlint:none" />
|
||||
|
|
@ -1942,20 +1944,13 @@
|
|||
<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-core.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" />
|
||||
<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" />
|
||||
|
|
@ -1966,7 +1961,6 @@
|
|||
<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.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
|
||||
|
|
@ -1975,14 +1969,13 @@
|
|||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.helper" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
</classpath>
|
||||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.lang.typesystem2.runtime" depends="java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.1, fetchDependencies">
|
||||
<target name="java.compile.jetbrains.mps.lang.typesystem2.runtime" depends="java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.1, fetchDependencies">
|
||||
<mkdir dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
|
||||
<javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" fork="true" encoding="utf8" includeantruntime="false" debug="true">
|
||||
|
|
@ -1995,21 +1988,13 @@
|
|||
<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-core.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.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" />
|
||||
|
|
@ -2022,7 +2007,6 @@
|
|||
<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.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
|
||||
|
|
@ -2680,6 +2664,7 @@
|
|||
<pathelement location="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
|
||||
<pathelement location="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-descriptor.devkit" />
|
||||
<pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
|
||||
<pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.access.jar" />
|
||||
<pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
|
||||
<pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.behavior.jar" />
|
||||
<pathelement location="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.checkedName.jar" />
|
||||
|
|
|
|||
|
|
@ -826,12 +826,6 @@
|
|||
<ref role="3bR37D" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.typesystem2.template" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="3u5wJtgkkr" role="3bR37C">
|
||||
<node concept="3bR9La" id="3u5wJtgkks" role="1SiIV1">
|
||||
<property role="3bR36h" value="false" />
|
||||
<ref role="3bR37D" node="3u5wJtgk3a" resolve="jetbrains.mps.lang.typesystem2.helper" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="3u5wJtgkkt" role="3bR37C">
|
||||
<node concept="3bR9La" id="3u5wJtgkku" role="1SiIV1">
|
||||
<property role="3bR36h" value="false" />
|
||||
|
|
|
|||
|
|
@ -27437,8 +27437,10 @@
|
|||
<node concept="3uibUv" id="Hg6EncXnsU" role="1Lm7xW">
|
||||
<ref role="3uigEE" to="tj24:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
|
||||
</node>
|
||||
<node concept="3uibUv" id="Hg6EncXnsV" role="1Lm7xW">
|
||||
<ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
|
||||
<node concept="_YKpA" id="4BHjwwGBkzR" role="1Lm7xW">
|
||||
<node concept="3uibUv" id="4BHjwwGBkzS" role="_ZDj9">
|
||||
<ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
|
|
@ -27466,18 +27468,6 @@
|
|||
</node>
|
||||
<node concept="3clFbS" id="Hg6EncXnu1" role="1bW5cS">
|
||||
<node concept="3clFbH" id="Hg6EncXnu2" role="3cqZAp" />
|
||||
<node concept="3cpWs8" id="Hg6EncXnu3" role="3cqZAp">
|
||||
<node concept="3cpWsn" id="Hg6EncXnu4" role="3cpWs9">
|
||||
<property role="TrG5h" value="trace" />
|
||||
<node concept="3uibUv" id="Hg6EncXnu5" role="1tU5fm">
|
||||
<ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
|
||||
</node>
|
||||
<node concept="10M0yZ" id="Hg6EncXnu6" role="33vP2m">
|
||||
<ref role="1PxDUh" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
|
||||
<ref role="3cqZAo" to="yg8f:24Vro6cS5rK" resolve="NULL" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="3cpWs8" id="Hg6EncXnu7" role="3cqZAp">
|
||||
<node concept="3cpWsn" id="Hg6EncXnu8" role="3cpWs9">
|
||||
<property role="TrG5h" value="programs" />
|
||||
|
|
@ -27496,6 +27486,24 @@
|
|||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="3cpWs8" id="4BHjwwG$czY" role="3cqZAp">
|
||||
<node concept="3cpWsn" id="4BHjwwG$c$1" role="3cpWs9">
|
||||
<property role="TrG5h" value="traces" />
|
||||
<node concept="_YKpA" id="4BHjwwG$czU" role="1tU5fm">
|
||||
<node concept="3uibUv" id="4BHjwwG$e8C" role="_ZDj9">
|
||||
<ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="2ShNRf" id="4BHjwwG$hn7" role="33vP2m">
|
||||
<node concept="Tc6Ow" id="4BHjwwG$heA" role="2ShVmc">
|
||||
<node concept="3uibUv" id="4BHjwwG$heB" role="HW$YZ">
|
||||
<ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="3clFbH" id="4BHjwwGBcqL" role="3cqZAp" />
|
||||
<node concept="1DcWWT" id="Hg6EncXnue" role="3cqZAp">
|
||||
<node concept="3clFbS" id="Hg6EncXnuf" role="2LFqv$">
|
||||
<node concept="3cpWs8" id="Hg6EncXnuj" role="3cqZAp">
|
||||
|
|
@ -27572,18 +27580,20 @@
|
|||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="3clFbF" id="Hg6EncXnuA" role="3cqZAp">
|
||||
<node concept="37vLTI" id="Hg6EncXnuB" role="3clFbG">
|
||||
<node concept="2OqwBi" id="Hg6EncXnuC" role="37vLTx">
|
||||
<node concept="37vLTw" id="6IQb_Rxppsn" role="2Oq$k0">
|
||||
<ref role="3cqZAo" node="6IQb_Rxph$F" resolve="openTab" />
|
||||
</node>
|
||||
<node concept="liA8E" id="Hg6EncXnuI" role="2OqNvi">
|
||||
<ref role="37wK5l" node="YGS68MEx_L" resolve="trace" />
|
||||
</node>
|
||||
<node concept="3clFbF" id="4BHjwwG$kvV" role="3cqZAp">
|
||||
<node concept="2OqwBi" id="4BHjwwG$noo" role="3clFbG">
|
||||
<node concept="37vLTw" id="4BHjwwG$kvT" role="2Oq$k0">
|
||||
<ref role="3cqZAo" node="4BHjwwG$c$1" resolve="traces" />
|
||||
</node>
|
||||
<node concept="37vLTw" id="Hg6EncXnuJ" role="37vLTJ">
|
||||
<ref role="3cqZAo" node="Hg6EncXnu4" resolve="trace" />
|
||||
<node concept="TSZUe" id="4BHjwwG$pAm" role="2OqNvi">
|
||||
<node concept="2OqwBi" id="4BHjwwG$rgu" role="25WWJ7">
|
||||
<node concept="37vLTw" id="4BHjwwG$rgv" role="2Oq$k0">
|
||||
<ref role="3cqZAo" node="6IQb_Rxph$F" resolve="openTab" />
|
||||
</node>
|
||||
<node concept="liA8E" id="4BHjwwG$rgw" role="2OqNvi">
|
||||
<ref role="37wK5l" node="YGS68MEx_L" resolve="trace" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
|
|
@ -27598,14 +27608,14 @@
|
|||
<ref role="3cqZAo" node="Hg6EncXnu8" resolve="programs" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="3clFbH" id="Hg6EncXnuN" role="3cqZAp" />
|
||||
<node concept="3clFbH" id="4BHjwwGBaFZ" role="3cqZAp" />
|
||||
<node concept="3clFbF" id="Hg6EncXnuO" role="3cqZAp">
|
||||
<node concept="1Ls8ON" id="Hg6EncXnuP" role="3clFbG">
|
||||
<node concept="37vLTw" id="Hg6EncXnuQ" role="1Lso8e">
|
||||
<ref role="3cqZAo" node="Hg6EncXntZ" resolve="prev" />
|
||||
</node>
|
||||
<node concept="37vLTw" id="Hg6EncXnuR" role="1Lso8e">
|
||||
<ref role="3cqZAo" node="Hg6EncXnu4" resolve="trace" />
|
||||
<node concept="37vLTw" id="4BHjwwGB9H3" role="1Lso8e">
|
||||
<ref role="3cqZAo" node="4BHjwwG$c$1" resolve="traces" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue