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

Introduce combinable effects, refactor Step hierarchy to produce effects. 

Step subclasses are meant to be immutable and stateless.
The state is now encapsulated in Effect subclasses, which can be combined.
Correspondingly, schedule now produces streams of effects.
This commit is contained in:
Fedor Isakov 2019-08-20 22:49:26 +02:00
parent aef7e4c2ee
commit 028683f394
9 changed files with 2836 additions and 1461 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.xml
View File

@ -770,6 +770,7 @@
<module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" kind="rt" />
<module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
<module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
<module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" kind="cl" />
<module ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" kind="cl" />
<module ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" kind="cl" />
<module ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" kind="cl" />
@ -2806,6 +2807,7 @@
<module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" kind="rt" />
<module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
<module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
<module ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" kind="cl" />
<module ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" kind="cl" />
<module ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" kind="cl" />
<module ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" kind="cl" />

6
coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
View File

@ -1959,6 +1959,12 @@
<ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
</node>
</node>
<node concept="1SiIV0" id="2daneBPb4hj" role="3bR37C">
<node concept="3bR9La" id="2daneBPb4hk" role="1SiIV1">
<property role="3bR36h" value="true" />
<ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
</node>
</node>
</node>
<node concept="1E1JtA" id="oI9YrJ7Rx" role="2G$12L">
<property role="BnDLt" value="true" />

293
coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
View File

@ -1355,29 +1355,18 @@
</node>
</node>
<node concept="2tJIrI" id="3F6vMxq_3wR" role="jymVt" />
<node concept="3clFb_" id="1pPth$lN12z" role="jymVt">
<property role="TrG5h" value="info" />
<property role="1EzhhJ" value="false" />
<node concept="17QB3L" id="1pPth$lN12$" role="3clF45" />
<node concept="3Tm1VV" id="6kREIVkR$6P" role="1B3o_S" />
<node concept="3clFbS" id="1pPth$lN12B" role="3clF47">
<node concept="3clFbF" id="1pPth$lN1GX" role="3cqZAp">
<node concept="Xl_RD" id="1pPth$lN1GW" role="3clFbG">
<property role="Xl_RC" value="highlighting results" />
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="Hg6EncbjjT" role="jymVt" />
<node concept="3clFb_" id="Hg6EncbkRR" role="jymVt">
<property role="TrG5h" value="schedule" />
<property role="1EzhhJ" value="false" />
<node concept="37vLTG" id="Hg6EncbkRS" role="3clF46">
<property role="TrG5h" value="prevStep" />
<property role="TrG5h" value="input" />
<node concept="3uibUv" id="Hg6EncbkRT" role="1tU5fm">
<ref role="3uigEE" to="unkn:~Single" resolve="Single" />
<node concept="3uibUv" id="7eK3Dxvl25k" role="11_B2D">
<ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
<node concept="3uibUv" id="3bpBM3Puk6I" role="11_B2D">
<ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
<node concept="3uibUv" id="3bpBM3PulUa" role="11_B2D">
<ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
</node>
</node>
</node>
</node>
@ -1389,30 +1378,35 @@
</node>
<node concept="3uibUv" id="Hg6EncbkRV" role="3clF45">
<ref role="3uigEE" to="unkn:~Single" resolve="Single" />
<node concept="3uibUv" id="Hg6Enc$1Of" role="11_B2D">
<ref role="3uigEE" node="1pPth$lC1vN" resolve="HighlightingTypesStep" />
<node concept="3uibUv" id="3bpBM3Puioq" role="11_B2D">
<ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
<node concept="3uibUv" id="3bpBM3PuFGh" role="11_B2D">
<ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
</node>
</node>
</node>
<node concept="3Tmbuc" id="Hg6EncFQZO" role="1B3o_S" />
<node concept="3clFbS" id="Hg6EncbkS1" role="3clF47">
<node concept="3clFbH" id="3bpBM3Punp0" role="3cqZAp" />
<node concept="3clFbF" id="5lxnBcU04KQ" role="3cqZAp">
<node concept="2OqwBi" id="5lxnBcU05yI" role="3clFbG">
<node concept="37vLTw" id="5lxnBcU04KO" role="2Oq$k0">
<ref role="3cqZAo" node="Hg6EncbkRS" resolve="prevStep" />
<ref role="3cqZAo" node="Hg6EncbkRS" resolve="input" />
</node>
<node concept="liA8E" id="5lxnBcU085M" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.flatMap(io.reactivex.functions.Function)" resolve="flatMap" />
<node concept="1bVj0M" id="5lxnBcU08CP" role="37wK5m">
<node concept="37vLTG" id="5lxnBcU09rm" role="1bW2Oz">
<property role="TrG5h" value="prev" />
<node concept="3uibUv" id="7eK3Dxvl3g6" role="1tU5fm">
<ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
<property role="TrG5h" value="inEff" />
<node concept="3uibUv" id="3bpBM3Pupvg" role="1tU5fm">
<ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
<node concept="3uibUv" id="3bpBM3Pur86" role="11_B2D">
<ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
</node>
</node>
</node>
<node concept="3clFbS" id="5lxnBcU08CQ" role="1bW5cS">
<node concept="3clFbH" id="5lxnBcU08SE" role="3cqZAp" />
<node concept="3clFbH" id="7eK3Dxvl69b" role="3cqZAp" />
<node concept="3clFbH" id="7eK3Dxvl6a5" role="3cqZAp" />
<node concept="3cpWs8" id="78H58of3fK6" role="3cqZAp">
<node concept="3cpWsn" id="78H58of3fK7" role="3cpWs9">
<property role="TrG5h" value="task" />
@ -1451,17 +1445,16 @@
</node>
<node concept="liA8E" id="78H58of3lAi" role="2OqNvi">
<ref role="37wK5l" to="o35r:78H58oeTnR1" resolve="withMessages" />
<node concept="2OqwBi" id="7eK3DxvjPRA" role="37wK5m">
<node concept="2OqwBi" id="7eK3DxvnYrT" role="2Oq$k0">
<node concept="37vLTw" id="7eK3DxvnWDA" role="2Oq$k0">
<ref role="3cqZAo" node="5lxnBcU09rm" resolve="prev" />
</node>
<node concept="liA8E" id="7eK3DxvnZF0" role="2OqNvi">
<ref role="37wK5l" to="tj24:7eK3DxvlKlZ" resolve="getTypesIndex" />
</node>
<node concept="2OqwBi" id="7eK3DxvnYrT" role="37wK5m">
<node concept="37vLTw" id="7eK3DxvnWDA" role="2Oq$k0">
<ref role="3cqZAo" node="5lxnBcU09rm" resolve="inEff" />
</node>
<node concept="liA8E" id="7eK3Dxvo0tM" role="2OqNvi">
<ref role="37wK5l" to="tj24:1FOQehxe9vM" resolve="allTypes" />
<node concept="liA8E" id="3bpBM3PuuHl" role="2OqNvi">
<ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
<node concept="10M0yZ" id="3bpBM3Puy7n" role="37wK5m">
<ref role="3cqZAo" to="tj24:2daneBPzfwl" resolve="LOCAL_TYPES" />
<ref role="1PxDUh" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
</node>
</node>
</node>
</node>
@ -1479,12 +1472,16 @@
</node>
<node concept="liA8E" id="1FOQehx4bA2" role="2OqNvi">
<ref role="37wK5l" to="o35r:1FOQehx0V$P" resolve="withReportItems" />
<node concept="2OqwBi" id="1FOQehx4bA3" role="37wK5m">
<node concept="2OqwBi" id="3bpBM3Pu$$N" role="37wK5m">
<node concept="37vLTw" id="1FOQehx4bA4" role="2Oq$k0">
<ref role="3cqZAo" node="5lxnBcU09rm" resolve="prev" />
<ref role="3cqZAo" node="5lxnBcU09rm" resolve="inEff" />
</node>
<node concept="liA8E" id="7eK3Dxvl4vE" role="2OqNvi">
<ref role="37wK5l" to="tj24:1FOQehx3WGd" resolve="getReportItems" />
<node concept="liA8E" id="3bpBM3Pu_sp" role="2OqNvi">
<ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
<node concept="10M0yZ" id="3bpBM3PuCdZ" role="37wK5m">
<ref role="3cqZAo" to="tj24:2daneBP_Jiy" resolve="REPORT_ITEMS" />
<ref role="1PxDUh" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
</node>
</node>
</node>
</node>
@ -1494,29 +1491,6 @@
</node>
</node>
</node>
<node concept="3clFbF" id="78H58of3s4V" role="3cqZAp">
<node concept="37vLTI" id="78H58of3s4W" role="3clFbG">
<node concept="2OqwBi" id="78H58of3s4X" role="37vLTx">
<node concept="37vLTw" id="78H58of3s4Y" role="2Oq$k0">
<ref role="3cqZAo" node="78H58of3fK7" resolve="task" />
</node>
<node concept="liA8E" id="78H58of3fKt" role="2OqNvi">
<ref role="37wK5l" to="o35r:78H58oeTpjT" resolve="withTracetabs" />
<node concept="2OqwBi" id="78H58of3fKu" role="37wK5m">
<node concept="liA8E" id="7eK3Dxvl5ss" role="2OqNvi">
<ref role="37wK5l" to="tj24:6kREIVl0T6j" resolve="getTraceTabComponents" />
</node>
<node concept="37vLTw" id="78H58of3fKw" role="2Oq$k0">
<ref role="3cqZAo" node="5lxnBcU09rm" resolve="prev" />
</node>
</node>
</node>
</node>
<node concept="37vLTw" id="78H58of3s53" role="37vLTJ">
<ref role="3cqZAo" node="78H58of3fK7" resolve="task" />
</node>
</node>
</node>
<node concept="3clFbH" id="78H58of3v9B" role="3cqZAp" />
<node concept="3clFbF" id="5lxnBcU0aba" role="3cqZAp">
<node concept="2OqwBi" id="5lxnBcU0d7B" role="3clFbG">
@ -1540,17 +1514,35 @@
<ref role="1Pybhc" to="unkn:~Single" resolve="Single" />
<node concept="1bVj0M" id="5lxnBcU0iBX" role="37wK5m">
<node concept="3clFbS" id="5lxnBcU0iBY" role="1bW5cS">
<node concept="3clFbF" id="5lxnBcU0nAW" role="3cqZAp">
<node concept="Xjq3P" id="5lxnBcU0nAU" role="3clFbG" />
<node concept="3clFbH" id="3bpBM3QaoLJ" role="3cqZAp" />
<node concept="3clFbF" id="3bpBM3PuExW" role="3cqZAp">
<node concept="2OqwBi" id="3bpBM3POh9K" role="3clFbG">
<node concept="37vLTw" id="3bpBM3PuExU" role="2Oq$k0">
<ref role="3cqZAo" node="5lxnBcU09rm" resolve="inEff" />
</node>
<node concept="liA8E" id="3bpBM3POiX3" role="2OqNvi">
<ref role="37wK5l" to="1yqb:2daneBOX0cV" resolve="combine" />
<node concept="2ShNRf" id="3bpBM3POjII" role="37wK5m">
<node concept="1pGfFk" id="3bpBM3POrIQ" role="2ShVmc">
<ref role="37wK5l" to="1yqb:3bpBM3PNk9l" resolve="Effect.NullEffect" />
<node concept="Xl_RD" id="3bpBM3POsK4" role="37wK5m">
<property role="Xl_RC" value="highlighting results" />
</node>
<node concept="3uibUv" id="3bpBM3POurz" role="1pMfVU">
<ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="78H58of3wTG" role="3cqZAp" />
<node concept="3clFbH" id="3bpBM3Qahlw" role="3cqZAp" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="5lxnBcU0rmn" role="3cqZAp" />
</node>
</node>
</node>
@ -1661,14 +1653,17 @@
<property role="TrG5h" value="schedule" />
<property role="1EzhhJ" value="false" />
<node concept="37vLTG" id="Hg6Enc6phb" role="3clF46">
<property role="TrG5h" value="prevStep" />
<property role="TrG5h" value="input" />
<node concept="3uibUv" id="Hg6Enc6phc" role="1tU5fm">
<ref role="3uigEE" to="unkn:~Single" resolve="Single" />
<node concept="3uibUv" id="Hg6Enc6phj" role="11_B2D">
<ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
<node concept="3qUE_q" id="6vFODDAYiK5" role="11_B2D">
<node concept="3uibUv" id="6vFODDAYjpq" role="3qUE_r">
<ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
<node concept="3uibUv" id="2daneBPWjy6" role="11_B2D">
<ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
<node concept="3uibUv" id="Hg6Enc6phj" role="11_B2D">
<ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
<node concept="3qUE_q" id="6vFODDAYiK5" role="11_B2D">
<node concept="3uibUv" id="6vFODDAYjpq" role="3qUE_r">
<ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
</node>
</node>
</node>
</node>
@ -1682,8 +1677,13 @@
</node>
<node concept="3uibUv" id="Hg6Enc6phe" role="3clF45">
<ref role="3uigEE" to="unkn:~Single" resolve="Single" />
<node concept="3uibUv" id="Hg6Enc6wvA" role="11_B2D">
<ref role="3uigEE" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
<node concept="3uibUv" id="2daneBPWfh1" role="11_B2D">
<ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
<node concept="3qUE_q" id="3bpBM3Pvmhp" role="11_B2D">
<node concept="3uibUv" id="3bpBM3Pvna5" role="3qUE_r">
<ref role="3uigEE" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
</node>
</node>
</node>
</node>
<node concept="3Tmbuc" id="Hg6EncFIBw" role="1B3o_S" />
@ -1691,15 +1691,18 @@
<node concept="3clFbH" id="2daneBOSijV" role="3cqZAp" />
<node concept="3cpWs8" id="Hg6EncXntS" role="3cqZAp">
<node concept="3cpWsn" id="Hg6EncXntT" role="3cpWs9">
<property role="TrG5h" value="withTrace" />
<property role="TrG5h" value="input_trace" />
<node concept="3uibUv" id="Hg6EncXnsI" role="1tU5fm">
<ref role="3uigEE" to="unkn:~Single" resolve="Single" />
<node concept="1LlUBW" id="Hg6EncXnsT" role="11_B2D">
<node concept="3uibUv" id="Hg6EncXnsU" role="1Lm7xW">
<ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
<node concept="3qUE_q" id="6vFODDAZbjL" role="11_B2D">
<node concept="3uibUv" id="6vFODDAZbjM" role="3qUE_r">
<ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
<node concept="3uibUv" id="2daneBPWr7k" role="1Lm7xW">
<ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
<node concept="3uibUv" id="Hg6EncXnsU" role="11_B2D">
<ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
<node concept="3qUE_q" id="6vFODDAZbjL" role="11_B2D">
<node concept="3uibUv" id="6vFODDAZbjM" role="3qUE_r">
<ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
</node>
</node>
</node>
</node>
@ -1710,18 +1713,21 @@
</node>
<node concept="2OqwBi" id="Hg6EncXntV" role="33vP2m">
<node concept="37vLTw" id="Hg6EncXntW" role="2Oq$k0">
<ref role="3cqZAo" node="Hg6Enc6phb" resolve="prevStep" />
<ref role="3cqZAo" node="Hg6Enc6phb" resolve="input" />
</node>
<node concept="liA8E" id="Hg6EncXntX" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
<node concept="1bVj0M" id="Hg6EncXntY" role="37wK5m">
<node concept="37vLTG" id="Hg6EncXntZ" role="1bW2Oz">
<property role="TrG5h" value="prev" />
<node concept="3uibUv" id="Hg6EncXnu0" role="1tU5fm">
<ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
<node concept="3qUE_q" id="6vFODDAZcUx" role="11_B2D">
<node concept="3uibUv" id="6vFODDAZcUy" role="3qUE_r">
<ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
<property role="TrG5h" value="inEff" />
<node concept="3uibUv" id="2daneBPWxGU" role="1tU5fm">
<ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
<node concept="3uibUv" id="Hg6EncXnu0" role="11_B2D">
<ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
<node concept="3qUE_q" id="6vFODDAZcUx" role="11_B2D">
<node concept="3uibUv" id="6vFODDAZcUy" role="3qUE_r">
<ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
</node>
</node>
</node>
</node>
@ -1734,12 +1740,21 @@
<node concept="3uibUv" id="6tPOoeTcyRh" role="1tU5fm">
<ref role="3uigEE" to="av0y:~Program" resolve="Program" />
</node>
<node concept="2OqwBi" id="Hg6EncXnub" role="33vP2m">
<node concept="liA8E" id="6kREIVl1TxS" role="2OqNvi">
<ref role="37wK5l" to="1yqb:6kREIVl0HhM" resolve="getProgram" />
<node concept="2OqwBi" id="2daneBPWI2a" role="33vP2m">
<node concept="2OqwBi" id="Hg6EncXnub" role="2Oq$k0">
<node concept="liA8E" id="2daneBPWC8M" role="2OqNvi">
<ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
<node concept="10M0yZ" id="2daneBPWGBl" role="37wK5m">
<ref role="3cqZAo" to="1yqb:2daneBPSu1V" resolve="PROGRAM_PRODUCER" />
<ref role="1PxDUh" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
</node>
</node>
<node concept="37vLTw" id="Hg6EncXnud" role="2Oq$k0">
<ref role="3cqZAo" node="Hg6EncXntZ" resolve="inEff" />
</node>
</node>
<node concept="37vLTw" id="Hg6EncXnud" role="2Oq$k0">
<ref role="3cqZAo" node="Hg6EncXntZ" resolve="prev" />
<node concept="liA8E" id="2daneBPWJwb" role="2OqNvi">
<ref role="37wK5l" to="hano:3GlpCDSyO$P" resolve="getProgram" />
</node>
</node>
</node>
@ -1785,7 +1800,7 @@
<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" />
<ref role="3cqZAo" node="Hg6EncXntZ" resolve="inEff" />
</node>
<node concept="1eOMI4" id="6tPOoeTcTIQ" role="1Lso8e">
<node concept="10QFUN" id="6tPOoeTcTIN" role="1eOMHV">
@ -1826,7 +1841,7 @@
<node concept="1rXfSq" id="55Q$YFtItIY" role="2Oq$k0">
<ref role="37wK5l" to="tj24:78H58of4zU0" resolve="scheduleWithTrace" />
<node concept="37vLTw" id="55Q$YFtIv91" role="37wK5m">
<ref role="3cqZAo" node="Hg6EncXntT" resolve="withTrace" />
<ref role="3cqZAo" node="Hg6EncXntT" resolve="input_trace" />
</node>
<node concept="37vLTw" id="55Q$YFtIvC0" role="37wK5m">
<ref role="3cqZAo" node="6kREIVkNs$S" resolve="subscribeScheduler" />
@ -1984,6 +1999,13 @@
<ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
</node>
</node>
<node concept="312cEg" id="6IQb_Rxsgb3" role="jymVt">
<property role="TrG5h" value="editorComponent" />
<node concept="3Tm6S6" id="6IQb_Rxsgb4" role="1B3o_S" />
<node concept="3uibUv" id="6IQb_Rxsgb5" role="1tU5fm">
<ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
</node>
</node>
<node concept="312cEg" id="3F6vMxqv_px" role="jymVt">
<property role="TrG5h" value="msgtrace" />
<node concept="3Tm6S6" id="6kREIVkHFzh" role="1B3o_S" />
@ -1998,13 +2020,6 @@
<ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEventsCollector" />
</node>
</node>
<node concept="312cEg" id="6IQb_Rxsgb3" role="jymVt">
<property role="TrG5h" value="editorComponent" />
<node concept="3Tm6S6" id="6IQb_Rxsgb4" role="1B3o_S" />
<node concept="3uibUv" id="6IQb_Rxsgb5" role="1tU5fm">
<ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
</node>
</node>
<node concept="3Tm1VV" id="55Q$YFtIVEQ" role="1B3o_S" />
<node concept="3uibUv" id="NKt6yn8c2j" role="1zkMxy">
<ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
@ -3540,33 +3555,19 @@
</node>
</node>
</node>
<node concept="2tJIrI" id="4vBwiiV$8T_" role="jymVt" />
<node concept="3clFb_" id="4vBwiiV$97$" role="jymVt">
<property role="TrG5h" value="info" />
<property role="1EzhhJ" value="false" />
<node concept="17QB3L" id="4vBwiiV$97_" role="3clF45" />
<node concept="3Tm1VV" id="NKt6yndP17" role="1B3o_S" />
<node concept="3clFbS" id="4vBwiiV$97C" role="3clF47">
<node concept="3clFbF" id="4vBwiiV$9TT" role="3cqZAp">
<node concept="Xl_RD" id="4vBwiiV$9TS" role="3clFbG">
<property role="Xl_RC" value="showing type" />
</node>
</node>
</node>
<node concept="2AHcQZ" id="4vBwiiV$97D" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="4vBwiiV$8US" role="jymVt" />
<node concept="3clFb_" id="4vBwiiV$ady" role="jymVt">
<property role="TrG5h" value="schedule" />
<property role="1EzhhJ" value="false" />
<node concept="37vLTG" id="4vBwiiV$adz" role="3clF46">
<property role="TrG5h" value="prevStep" />
<property role="TrG5h" value="input" />
<node concept="3uibUv" id="4vBwiiV$ad$" role="1tU5fm">
<ref role="3uigEE" to="unkn:~Single" resolve="Single" />
<node concept="3uibUv" id="7eK3Dxvn9eV" role="11_B2D">
<ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
<node concept="3uibUv" id="3bpBM3PuOmk" role="11_B2D">
<ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
<node concept="3uibUv" id="3bpBM3PuQLw" role="11_B2D">
<ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
</node>
</node>
</node>
</node>
@ -3578,20 +3579,21 @@
</node>
<node concept="3uibUv" id="4vBwiiV$adC" role="3clF45">
<ref role="3uigEE" to="unkn:~Single" resolve="Single" />
<node concept="3qUE_q" id="4vBwiiV$adD" role="11_B2D">
<node concept="3uibUv" id="4vBwiiV$adE" role="3qUE_r">
<ref role="3uigEE" to="1yqb:1pPth$lAzAx" resolve="Step" />
<node concept="3qTvmN" id="4vBwiiV$adF" role="11_B2D" />
<node concept="3uibUv" id="3bpBM3PuNjc" role="11_B2D">
<ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
<node concept="3uibUv" id="3bpBM3PuO4F" role="11_B2D">
<ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
</node>
</node>
</node>
<node concept="3Tmbuc" id="4vBwiiV$adG" role="1B3o_S" />
<node concept="3clFbS" id="4vBwiiV$adJ" role="3clF47">
<node concept="3clFbH" id="3bpBM3PuSfk" role="3cqZAp" />
<node concept="3clFbF" id="4vBwiiV$b$i" role="3cqZAp">
<node concept="2OqwBi" id="4vBwiiV$c5o" role="3clFbG">
<node concept="2OqwBi" id="6kEuCh$3_7M" role="2Oq$k0">
<node concept="37vLTw" id="4vBwiiV$b$g" role="2Oq$k0">
<ref role="3cqZAo" node="4vBwiiV$adz" resolve="prevStep" />
<ref role="3cqZAo" node="4vBwiiV$adz" resolve="input" />
</node>
<node concept="liA8E" id="6kEuCh$3Be5" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.observeOn(io.reactivex.Scheduler)" resolve="observeOn" />
@ -3622,10 +3624,14 @@
<node concept="2OqwBi" id="1GKZK$A9FpR" role="33vP2m">
<node concept="2OqwBi" id="6kEuCh$5lxs" role="2Oq$k0">
<node concept="37vLTw" id="6kEuCh$5lxt" role="2Oq$k0">
<ref role="3cqZAo" node="4vBwiiV$duq" resolve="prev" />
<ref role="3cqZAo" node="4vBwiiV$duq" resolve="inEff" />
</node>
<node concept="liA8E" id="1GKZK$A9uzN" role="2OqNvi">
<ref role="37wK5l" to="tj24:7eK3DxvlKlZ" resolve="getTypesIndex" />
<node concept="liA8E" id="3bpBM3PuYc5" role="2OqNvi">
<ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
<node concept="10M0yZ" id="3bpBM3Pv2ox" role="37wK5m">
<ref role="3cqZAo" to="tj24:2daneBP0TEV" resolve="TYPE_INDEX" />
<ref role="1PxDUh" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
</node>
</node>
</node>
<node concept="liA8E" id="1GKZK$A9KJb" role="2OqNvi">
@ -3936,13 +3942,34 @@
</node>
<node concept="3clFbH" id="4vBwiiV_Ku6" role="3cqZAp" />
<node concept="3clFbF" id="4vBwiiV$eYg" role="3cqZAp">
<node concept="Xjq3P" id="4vBwiiV$eYe" role="3clFbG" />
<node concept="2OqwBi" id="3bpBM3POyXQ" role="3clFbG">
<node concept="37vLTw" id="3bpBM3Pv3ko" role="2Oq$k0">
<ref role="3cqZAo" node="4vBwiiV$duq" resolve="inEff" />
</node>
<node concept="liA8E" id="3bpBM3POzUk" role="2OqNvi">
<ref role="37wK5l" to="1yqb:2daneBOX0cV" resolve="combine" />
<node concept="2ShNRf" id="3bpBM3PO$JE" role="37wK5m">
<node concept="1pGfFk" id="3bpBM3POBkk" role="2ShVmc">
<ref role="37wK5l" to="1yqb:3bpBM3PNk9l" resolve="Effect.NullEffect" />
<node concept="Xl_RD" id="3bpBM3POEvz" role="37wK5m">
<property role="Xl_RC" value="showing type" />
</node>
<node concept="3uibUv" id="3bpBM3POGh1" role="1pMfVU">
<ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="37vLTG" id="4vBwiiV$duq" role="1bW2Oz">
<property role="TrG5h" value="prev" />
<node concept="3uibUv" id="7eK3DxvnaS2" role="1tU5fm">
<ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
<property role="TrG5h" value="inEff" />
<node concept="3uibUv" id="3bpBM3PuT6f" role="1tU5fm">
<ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
<node concept="3uibUv" id="3bpBM3PuV9m" role="11_B2D">
<ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
</node>
</node>
</node>
</node>

1108
coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
View File

File diff suppressed because it is too large Load Diff

1
coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd
View File

@ -14,6 +14,7 @@
<dependency reexport="true">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)</dependency>
<dependency reexport="true">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
<dependency reexport="true">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
<dependency reexport="true">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="9" />

184
coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
View File

@ -1065,11 +1065,6 @@
<node concept="3uibUv" id="3mz2_dYCums" role="1Lm7xW">
<ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
</node>
<node concept="_YKpA" id="5cnt3vhcXDL" role="1Lm7xW">
<node concept="3uibUv" id="6IQb_RxRs4d" role="_ZDj9">
<ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
</node>
</node>
</node>
<node concept="2OqwBi" id="3mz2_dYCumU" role="33vP2m">
<node concept="37vLTw" id="3mz2_dYCumV" role="2Oq$k0">
@ -1121,42 +1116,6 @@
</node>
</node>
</node>
<node concept="1DcWWT" id="5cnt3vhd4Cp" role="3cqZAp">
<node concept="3clFbS" id="5cnt3vhd4Cs" role="2LFqv$">
<node concept="3clFbF" id="3mz2_dYCVlO" role="3cqZAp">
<node concept="2OqwBi" id="3mz2_dYCXfc" role="3clFbG">
<node concept="2YIFZM" id="6Yb9hAqy3Rt" role="2Oq$k0">
<ref role="37wK5l" node="7nPD14Nboty" resolve="get" />
<ref role="1Pybhc" node="7nPD14Nbbbe" resolve="TraceComponent" />
<node concept="37vLTw" id="3mz2_dYCXdJ" role="37wK5m">
<ref role="3cqZAo" node="3mz2_dYDlU7" resolve="mpsProject" />
</node>
</node>
<node concept="liA8E" id="3mz2_dYCXij" role="2OqNvi">
<ref role="37wK5l" node="6IQb_Rxo4au" resolve="closeTab" />
<node concept="37vLTw" id="5cnt3vhd69F" role="37wK5m">
<ref role="3cqZAo" node="5cnt3vhd4Ct" resolve="tt" />
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWsn" id="5cnt3vhd4Ct" role="1Duv9x">
<property role="TrG5h" value="tt" />
<node concept="3uibUv" id="6IQb_RxRx6U" role="1tU5fm">
<ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
</node>
</node>
<node concept="1LFfDK" id="5cnt3vhd4Cy" role="1DdaDG">
<node concept="3cmrfG" id="5cnt3vhd4Cz" role="1LF_Uc">
<property role="3cmrfH" value="1" />
</node>
<node concept="37vLTw" id="5cnt3vhd4C$" role="1LFl5Q">
<ref role="3cqZAo" node="3mz2_dYCumT" resolve="ec_tab" />
</node>
</node>
</node>
<node concept="3clFbH" id="3WU9yfAbRBC" role="3cqZAp" />
</node>
<node concept="3y3z36" id="3mz2_dYCvg1" role="3clFbw">
<node concept="10Nm6u" id="3mz2_dYCvHF" role="3uHU7w" />
@ -1181,14 +1140,6 @@
<ref role="2Oxat5" node="78H58oeT$7J" resolve="editorComponent" />
</node>
</node>
<node concept="2OqwBi" id="78H58oeU6XC" role="1Lso8e">
<node concept="37vLTw" id="78H58oeU5dA" role="2Oq$k0">
<ref role="3cqZAo" node="78H58oeTHIN" resolve="task" />
</node>
<node concept="2OwXpG" id="78H58oeU8WC" role="2OqNvi">
<ref role="2Oxat5" node="78H58oeTuSP" resolve="ttabs" />
</node>
</node>
</node>
</node>
</node>
@ -1607,11 +1558,6 @@
<node concept="3uibUv" id="3mz2_dYCo8k" role="1Lm7xW">
<ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
</node>
<node concept="_YKpA" id="5cnt3vhd6A8" role="1Lm7xW">
<node concept="3uibUv" id="6IQb_RxRh2Y" role="_ZDj9">
<ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
</node>
</node>
</node>
<node concept="2OqwBi" id="3mz2_dYCo8R" role="33vP2m">
<node concept="37vLTw" id="3mz2_dYCo8S" role="2Oq$k0">
@ -1680,42 +1626,6 @@
</node>
</node>
</node>
<node concept="3clFbH" id="3mz2_dYD0RV" role="3cqZAp" />
<node concept="1DcWWT" id="5cnt3vhdhiJ" role="3cqZAp">
<node concept="3clFbS" id="5cnt3vhdhiK" role="2LFqv$">
<node concept="3clFbF" id="5cnt3vhdhiL" role="3cqZAp">
<node concept="2EnYce" id="5cnt3vhdhiM" role="3clFbG">
<node concept="2YIFZM" id="6Yb9hAqy3Rv" role="2Oq$k0">
<ref role="37wK5l" node="7nPD14Nboty" resolve="get" />
<ref role="1Pybhc" node="7nPD14Nbbbe" resolve="TraceComponent" />
<node concept="37vLTw" id="5cnt3vhdhiO" role="37wK5m">
<ref role="3cqZAo" node="3mz2_dYDlU7" resolve="mpsProject" />
</node>
</node>
<node concept="liA8E" id="5cnt3vhdhiP" role="2OqNvi">
<ref role="37wK5l" node="6IQb_Rxo4au" resolve="closeTab" />
<node concept="37vLTw" id="5cnt3vhdhiQ" role="37wK5m">
<ref role="3cqZAo" node="5cnt3vhdhiR" resolve="tt" />
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWsn" id="5cnt3vhdhiR" role="1Duv9x">
<property role="TrG5h" value="tt" />
<node concept="3uibUv" id="6IQb_RxRgx0" role="1tU5fm">
<ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
</node>
</node>
<node concept="1LFfDK" id="5cnt3vhdhiT" role="1DdaDG">
<node concept="3cmrfG" id="5cnt3vhdhiU" role="1LF_Uc">
<property role="3cmrfH" value="1" />
</node>
<node concept="37vLTw" id="5cnt3vhdhiV" role="1LFl5Q">
<ref role="3cqZAo" node="3mz2_dYCo8Q" resolve="ec_tab" />
</node>
</node>
</node>
</node>
<node concept="3y3z36" id="3mz2_dYCnuy" role="3clFbw">
<node concept="10Nm6u" id="3mz2_dYCnTE" role="3uHU7w" />
@ -1782,42 +1692,6 @@
</node>
</node>
</node>
<node concept="3clFbH" id="5cnt3vhdjiJ" role="3cqZAp" />
<node concept="1DcWWT" id="5cnt3vhdilR" role="3cqZAp">
<node concept="3clFbS" id="5cnt3vhdilS" role="2LFqv$">
<node concept="3clFbF" id="5cnt3vhdilT" role="3cqZAp">
<node concept="2EnYce" id="5cnt3vhdilU" role="3clFbG">
<node concept="2YIFZM" id="6Yb9hAqy3Rs" role="2Oq$k0">
<ref role="37wK5l" node="7nPD14Nboty" resolve="get" />
<ref role="1Pybhc" node="7nPD14Nbbbe" resolve="TraceComponent" />
<node concept="37vLTw" id="5cnt3vhdilW" role="37wK5m">
<ref role="3cqZAo" node="3mz2_dYDlU7" resolve="mpsProject" />
</node>
</node>
<node concept="liA8E" id="5cnt3vhdilX" role="2OqNvi">
<ref role="37wK5l" node="6IQb_Rxo4au" resolve="closeTab" />
<node concept="37vLTw" id="5cnt3vhdilY" role="37wK5m">
<ref role="3cqZAo" node="5cnt3vhdilZ" resolve="tt" />
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWsn" id="5cnt3vhdilZ" role="1Duv9x">
<property role="TrG5h" value="tt" />
<node concept="3uibUv" id="6IQb_RxReLS" role="1tU5fm">
<ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
</node>
</node>
<node concept="1LFfDK" id="5cnt3vhdim1" role="1DdaDG">
<node concept="3cmrfG" id="5cnt3vhdim2" role="1LF_Uc">
<property role="3cmrfH" value="1" />
</node>
<node concept="37vLTw" id="5cnt3vhdim3" role="1LFl5Q">
<ref role="3cqZAo" node="3WU9yfAbWeO" resolve="ec_tab" />
</node>
</node>
</node>
</node>
<node concept="3cpWsn" id="3WU9yfAbWeO" role="1Duv9x">
<property role="TrG5h" value="ec_tab" />
@ -1825,11 +1699,6 @@
<node concept="3uibUv" id="3mz2_dYChoq" role="1Lm7xW">
<ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
</node>
<node concept="_YKpA" id="5cnt3vhdgzW" role="1Lm7xW">
<node concept="3uibUv" id="6IQb_RxRfoe" role="_ZDj9">
<ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
</node>
</node>
</node>
</node>
<node concept="37vLTw" id="3WU9yfAbWeT" role="1DdaDG">
@ -1855,11 +1724,6 @@
<node concept="3uibUv" id="3mz2_dYCdYZ" role="1Lm7xW">
<ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
</node>
<node concept="_YKpA" id="5cnt3vhcYi1" role="1Lm7xW">
<node concept="3uibUv" id="6IQb_RxR60y" role="_ZDj9">
<ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
</node>
</node>
</node>
</node>
<node concept="2ShNRf" id="3WU9yfAbIGC" role="33vP2m">
@ -1868,11 +1732,6 @@
<node concept="3uibUv" id="3mz2_dYCgu7" role="1Lm7xW">
<ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
</node>
<node concept="_YKpA" id="5cnt3vhd0nv" role="1Lm7xW">
<node concept="3uibUv" id="6IQb_RxRafU" role="_ZDj9">
<ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
</node>
</node>
</node>
</node>
</node>
@ -2013,40 +1872,6 @@
</node>
</node>
</node>
<node concept="2tJIrI" id="1FOQehx0V$O" role="jymVt" />
<node concept="3clFb_" id="78H58oeTpjT" role="jymVt">
<property role="TrG5h" value="withTracetabs" />
<node concept="37vLTG" id="78H58oeTpjU" role="3clF46">
<property role="TrG5h" value="ttabs" />
<node concept="_YKpA" id="78H58oeTpI5" role="1tU5fm">
<node concept="3uibUv" id="78H58oeTq9z" role="_ZDj9">
<ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
</node>
</node>
</node>
<node concept="3uibUv" id="78H58oeTpjY" role="3clF45">
<ref role="3uigEE" node="78H58oeT9Hs" resolve="HighlightingTask" />
</node>
<node concept="3Tm1VV" id="78H58oeTpjZ" role="1B3o_S" />
<node concept="3clFbS" id="78H58oeTpk0" role="3clF47">
<node concept="3clFbF" id="78H58oeTuSU" role="3cqZAp">
<node concept="37vLTI" id="78H58oeTuSW" role="3clFbG">
<node concept="2OqwBi" id="78H58oeTvCb" role="37vLTJ">
<node concept="Xjq3P" id="78H58oeTw0N" role="2Oq$k0" />
<node concept="2OwXpG" id="78H58oeTvCe" role="2OqNvi">
<ref role="2Oxat5" node="78H58oeTuSP" resolve="ttabs" />
</node>
</node>
<node concept="37vLTw" id="78H58oeTuT0" role="37vLTx">
<ref role="3cqZAo" node="78H58oeTpjU" resolve="ttabs" />
</node>
</node>
</node>
<node concept="3clFbF" id="78H58oeTx4o" role="3cqZAp">
<node concept="Xjq3P" id="78H58oeTx4m" role="3clFbG" />
</node>
</node>
</node>
<node concept="2tJIrI" id="78H58oeTnDT" role="jymVt" />
<node concept="3Tm1VV" id="78H58oeT9Ht" role="1B3o_S" />
<node concept="312cEg" id="78H58oeTrxx" role="jymVt">
@ -2057,15 +1882,6 @@
<node concept="3Tqbb2" id="78H58of1BCf" role="3rvSg0" />
</node>
</node>
<node concept="312cEg" id="78H58oeTuSP" role="jymVt">
<property role="TrG5h" value="ttabs" />
<node concept="3Tmbuc" id="78H58oeTxG0" role="1B3o_S" />
<node concept="_YKpA" id="78H58oeTuSS" role="1tU5fm">
<node concept="3uibUv" id="78H58oeTuST" role="_ZDj9">
<ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
</node>
</node>
</node>
<node concept="312cEg" id="78H58oeTzSd" role="jymVt">
<property role="TrG5h" value="root" />
<node concept="3Tmbuc" id="78H58oeTAnm" role="1B3o_S" />

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

File diff suppressed because it is too large Load Diff

200
coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
View File

@ -202,12 +202,13 @@
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
<child id="1068499141038" name="actualArgument" index="37wK5m" />
</concept>
<concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
<concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk">
<child id="1212687122400" name="typeParameter" index="1pMfVU" />
</concept>
<concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
<property id="521412098689998745" name="nonStatic" index="2bfB8j" />
<child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
</concept>
<concept id="1171903607971" name="jetbrains.mps.baseLanguage.structure.WildCardType" flags="in" index="3qTvmN" />
<concept id="1171903916106" name="jetbrains.mps.baseLanguage.structure.UpperBoundType" flags="in" index="3qUE_q">
<child id="1171903916107" name="bound" index="3qUE_r" />
</concept>
@ -1198,29 +1199,18 @@
</node>
</node>
<node concept="2tJIrI" id="3F6vMxq_3wR" role="jymVt" />
<node concept="3clFb_" id="1pPth$lN12z" role="jymVt">
<property role="TrG5h" value="info" />
<property role="1EzhhJ" value="false" />
<node concept="17QB3L" id="1pPth$lN12$" role="3clF45" />
<node concept="3Tm1VV" id="6kREIVkR$6P" role="1B3o_S" />
<node concept="3clFbS" id="1pPth$lN12B" role="3clF47">
<node concept="3clFbF" id="1pPth$lN1GX" role="3cqZAp">
<node concept="Xl_RD" id="1pPth$lN1GW" role="3clFbG">
<property role="Xl_RC" value="highlighting results" />
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="Hg6EncbjjT" role="jymVt" />
<node concept="3clFb_" id="Hg6EncbkRR" role="jymVt">
<property role="TrG5h" value="schedule" />
<property role="1EzhhJ" value="false" />
<node concept="37vLTG" id="Hg6EncbkRS" role="3clF46">
<property role="TrG5h" value="prevStep" />
<property role="TrG5h" value="input" />
<node concept="3uibUv" id="Hg6EncbkRT" role="1tU5fm">
<ref role="3uigEE" to="unkn:~Single" resolve="Single" />
<node concept="3uibUv" id="6Yb9hAqJLJ$" role="11_B2D">
<ref role="3uigEE" to="fjx4:78H58oeu6dG" resolve="ControlflowStep" />
<node concept="3uibUv" id="3bpBM3PfN8R" role="11_B2D">
<ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
<node concept="3uibUv" id="3bpBM3PfP5x" role="11_B2D">
<ref role="3uigEE" to="fjx4:78H58oeu6dG" resolve="ControlflowStep" />
</node>
</node>
</node>
</node>
@ -1232,8 +1222,11 @@
</node>
<node concept="3uibUv" id="Hg6EncbkRV" role="3clF45">
<ref role="3uigEE" to="unkn:~Single" resolve="Single" />
<node concept="3uibUv" id="Hg6Enc$1Of" role="11_B2D">
<ref role="3uigEE" node="1pPth$lC1vN" resolve="HighlightingControlflowStep" />
<node concept="3uibUv" id="3bpBM3PfLJc" role="11_B2D">
<ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
<node concept="3uibUv" id="3bpBM3PpAsq" role="11_B2D">
<ref role="3uigEE" to="fjx4:78H58oeu6dG" resolve="ControlflowStep" />
</node>
</node>
</node>
<node concept="3Tmbuc" id="Hg6EncFQZO" role="1B3o_S" />
@ -1241,15 +1234,18 @@
<node concept="3clFbF" id="5lxnBcU04KQ" role="3cqZAp">
<node concept="2OqwBi" id="5lxnBcU05yI" role="3clFbG">
<node concept="37vLTw" id="5lxnBcU04KO" role="2Oq$k0">
<ref role="3cqZAo" node="Hg6EncbkRS" resolve="prevStep" />
<ref role="3cqZAo" node="Hg6EncbkRS" resolve="input" />
</node>
<node concept="liA8E" id="5lxnBcU085M" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.flatMap(io.reactivex.functions.Function)" resolve="flatMap" />
<node concept="1bVj0M" id="5lxnBcU08CP" role="37wK5m">
<node concept="37vLTG" id="5lxnBcU09rm" role="1bW2Oz">
<property role="TrG5h" value="prev" />
<node concept="3uibUv" id="6Yb9hAqJMt8" role="1tU5fm">
<ref role="3uigEE" to="fjx4:78H58oeu6dG" resolve="ControlflowStep" />
<property role="TrG5h" value="inEff" />
<node concept="3uibUv" id="3bpBM3PfRqD" role="1tU5fm">
<ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
<node concept="3uibUv" id="3bpBM3PfTa0" role="11_B2D">
<ref role="3uigEE" to="fjx4:78H58oeu6dG" resolve="ControlflowStep" />
</node>
</node>
</node>
<node concept="3clFbS" id="5lxnBcU08CQ" role="1bW5cS">
@ -1294,10 +1290,14 @@
<ref role="37wK5l" to="o35r:1FOQehx0V$P" resolve="withReportItems" />
<node concept="2OqwBi" id="1FOQehx4mRn" role="37wK5m">
<node concept="37vLTw" id="1FOQehx4mRo" role="2Oq$k0">
<ref role="3cqZAo" node="5lxnBcU09rm" resolve="prev" />
<ref role="3cqZAo" node="5lxnBcU09rm" resolve="inEff" />
</node>
<node concept="liA8E" id="1FOQehx4mRp" role="2OqNvi">
<ref role="37wK5l" to="fjx4:1FOQehx4yMT" resolve="getReportItems" />
<node concept="liA8E" id="3bpBM3PpzKI" role="2OqNvi">
<ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
<node concept="10M0yZ" id="3bpBM3Pp_n3" role="37wK5m">
<ref role="3cqZAo" to="fjx4:2daneBP_Jiy" resolve="REPORT_ITEMS" />
<ref role="1PxDUh" to="fjx4:78H58oeu6dG" resolve="ControlflowStep" />
</node>
</node>
</node>
</node>
@ -1307,29 +1307,6 @@
</node>
</node>
</node>
<node concept="3clFbF" id="78H58of3s4V" role="3cqZAp">
<node concept="37vLTI" id="78H58of3s4W" role="3clFbG">
<node concept="2OqwBi" id="78H58of3s4X" role="37vLTx">
<node concept="37vLTw" id="78H58of3s4Y" role="2Oq$k0">
<ref role="3cqZAo" node="78H58of3fK7" resolve="task" />
</node>
<node concept="liA8E" id="78H58of3fKt" role="2OqNvi">
<ref role="37wK5l" to="o35r:78H58oeTpjT" resolve="withTracetabs" />
<node concept="2OqwBi" id="78H58of3fKu" role="37wK5m">
<node concept="liA8E" id="78H58of3fKv" role="2OqNvi">
<ref role="37wK5l" to="fjx4:6kREIVl0T6j" resolve="getTraceTabComponents" />
</node>
<node concept="37vLTw" id="78H58of3fKw" role="2Oq$k0">
<ref role="3cqZAo" node="5lxnBcU09rm" resolve="prev" />
</node>
</node>
</node>
</node>
<node concept="37vLTw" id="78H58of3s53" role="37vLTJ">
<ref role="3cqZAo" node="78H58of3fK7" resolve="task" />
</node>
</node>
</node>
<node concept="3clFbH" id="78H58of3v9B" role="3cqZAp" />
<node concept="3clFbF" id="5lxnBcU0aba" role="3cqZAp">
<node concept="2OqwBi" id="5lxnBcU0d7B" role="3clFbG">
@ -1353,10 +1330,28 @@
<ref role="37wK5l" to="unkn:~Single.fromCallable(java.util.concurrent.Callable)" resolve="fromCallable" />
<node concept="1bVj0M" id="5lxnBcU0iBX" role="37wK5m">
<node concept="3clFbS" id="5lxnBcU0iBY" role="1bW5cS">
<node concept="3clFbF" id="5lxnBcU0nAW" role="3cqZAp">
<node concept="Xjq3P" id="5lxnBcU0nAU" role="3clFbG" />
<node concept="3clFbF" id="3bpBM3PpBWT" role="3cqZAp">
<node concept="2OqwBi" id="3bpBM3PNVOk" role="3clFbG">
<node concept="37vLTw" id="3bpBM3PpBWR" role="2Oq$k0">
<ref role="3cqZAo" node="5lxnBcU09rm" resolve="inEff" />
</node>
<node concept="liA8E" id="3bpBM3PNXAL" role="2OqNvi">
<ref role="37wK5l" to="1yqb:2daneBOX0cV" resolve="combine" />
<node concept="2ShNRf" id="3bpBM3PNZZ2" role="37wK5m">
<node concept="1pGfFk" id="3bpBM3PO9qo" role="2ShVmc">
<ref role="37wK5l" to="1yqb:3bpBM3PNk9l" resolve="Effect.NullEffect" />
<node concept="Xl_RD" id="3bpBM3POaND" role="37wK5m">
<property role="Xl_RC" value="highlighting results" />
</node>
<node concept="3uibUv" id="3bpBM3POczG" role="1pMfVU">
<ref role="3uigEE" to="fjx4:78H58oeu6dG" resolve="ControlflowStep" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="78H58of3wTG" role="3cqZAp" />
<node concept="3clFbH" id="3bpBM3QaYqB" role="3cqZAp" />
</node>
</node>
</node>
@ -1462,14 +1457,17 @@
<property role="TrG5h" value="schedule" />
<property role="1EzhhJ" value="false" />
<node concept="37vLTG" id="6Yb9hAqUr3u" role="3clF46">
<property role="TrG5h" value="prevStep" />
<property role="TrG5h" value="input" />
<node concept="3uibUv" id="6Yb9hAqUr3v" role="1tU5fm">
<ref role="3uigEE" to="unkn:~Single" resolve="Single" />
<node concept="3uibUv" id="6Yb9hAqUr3w" role="11_B2D">
<ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
<node concept="3qUE_q" id="6vFODDAYiK5" role="11_B2D">
<node concept="3uibUv" id="6vFODDAYjpq" role="3qUE_r">
<ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
<node concept="3uibUv" id="3bpBM3PfCSi" role="11_B2D">
<ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
<node concept="3uibUv" id="6Yb9hAqUr3w" role="11_B2D">
<ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
<node concept="3qUE_q" id="6vFODDAYiK5" role="11_B2D">
<node concept="3uibUv" id="6vFODDAYjpq" role="3qUE_r">
<ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
</node>
</node>
</node>
</node>
@ -1484,9 +1482,13 @@
<node concept="3uibUv" id="6Yb9hAqUr3z" role="3clF45">
<ref role="3uigEE" to="unkn:~Single" resolve="Single" />
<node concept="3qUE_q" id="6Yb9hAqUr3$" role="11_B2D">
<node concept="3uibUv" id="6Yb9hAqUr3_" role="3qUE_r">
<ref role="3uigEE" to="1yqb:1pPth$lAzAx" resolve="Step" />
<node concept="3qTvmN" id="6Yb9hAqUr3A" role="11_B2D" />
<node concept="3uibUv" id="2daneBPX0FP" role="3qUE_r">
<ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
<node concept="3qUE_q" id="2daneBPY9kz" role="11_B2D">
<node concept="3uibUv" id="2daneBPYada" role="3qUE_r">
<ref role="3uigEE" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
</node>
</node>
</node>
</node>
</node>
@ -1495,17 +1497,21 @@
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
<node concept="3clFbS" id="6Yb9hAqUr3X" role="3clF47">
<node concept="3clFbH" id="2daneBPXrAq" role="3cqZAp" />
<node concept="3cpWs8" id="6Yb9hAqUIG2" role="3cqZAp">
<node concept="3cpWsn" id="6Yb9hAqUIG3" role="3cpWs9">
<property role="TrG5h" value="withTrace" />
<property role="TrG5h" value="input_trace" />
<node concept="3uibUv" id="6Yb9hAqUIFz" role="1tU5fm">
<ref role="3uigEE" to="unkn:~Single" resolve="Single" />
<node concept="1LlUBW" id="6Yb9hAqUIFG" role="11_B2D">
<node concept="3uibUv" id="6Yb9hAqUIFH" role="1Lm7xW">
<ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
<node concept="3qUE_q" id="6vFODDB6Uux" role="11_B2D">
<node concept="3uibUv" id="6vFODDB6WcU" role="3qUE_r">
<ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
<node concept="3uibUv" id="2daneBPXvOA" role="1Lm7xW">
<ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
<node concept="3uibUv" id="6Yb9hAqUIFH" role="11_B2D">
<ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
<node concept="3qUE_q" id="6vFODDB6Uux" role="11_B2D">
<node concept="3uibUv" id="6vFODDB6WcU" role="3qUE_r">
<ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
</node>
</node>
</node>
</node>
@ -1516,7 +1522,7 @@
</node>
<node concept="2OqwBi" id="6Yb9hAqUIG4" role="33vP2m">
<node concept="37vLTw" id="6Yb9hAqUIG6" role="2Oq$k0">
<ref role="3cqZAo" node="6Yb9hAqUr3u" resolve="prevStep" />
<ref role="3cqZAo" node="6Yb9hAqUr3u" resolve="input" />
</node>
<node concept="liA8E" id="6Yb9hAqUIG9" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
@ -1529,12 +1535,21 @@
<node concept="3uibUv" id="6Yb9hAqUIGf" role="1tU5fm">
<ref role="3uigEE" to="av0y:~Program" resolve="Program" />
</node>
<node concept="2OqwBi" id="6Yb9hAqUIGg" role="33vP2m">
<node concept="liA8E" id="6Yb9hAqUIGh" role="2OqNvi">
<ref role="37wK5l" to="1yqb:6kREIVl0HhM" resolve="getProgram" />
<node concept="2OqwBi" id="2daneBPXQMn" role="33vP2m">
<node concept="2OqwBi" id="6Yb9hAqUIGg" role="2Oq$k0">
<node concept="liA8E" id="2daneBPXMc8" role="2OqNvi">
<ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
<node concept="10M0yZ" id="2daneBPXPgW" role="37wK5m">
<ref role="3cqZAo" to="1yqb:2daneBPSu1V" resolve="PROGRAM_PRODUCER" />
<ref role="1PxDUh" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
</node>
</node>
<node concept="37vLTw" id="6Yb9hAqUIGi" role="2Oq$k0">
<ref role="3cqZAo" node="6Yb9hAqUIHf" resolve="inEff" />
</node>
</node>
<node concept="37vLTw" id="6Yb9hAqUIGi" role="2Oq$k0">
<ref role="3cqZAo" node="6Yb9hAqUIHf" resolve="prev" />
<node concept="liA8E" id="2daneBPXV6g" role="2OqNvi">
<ref role="37wK5l" to="hano:3GlpCDSyO$P" resolve="getProgram" />
</node>
</node>
</node>
@ -1580,7 +1595,7 @@
<node concept="3clFbF" id="6Yb9hAqUIH1" role="3cqZAp">
<node concept="1Ls8ON" id="6Yb9hAqUIH2" role="3clFbG">
<node concept="37vLTw" id="6Yb9hAqUIH3" role="1Lso8e">
<ref role="3cqZAo" node="6Yb9hAqUIHf" resolve="prev" />
<ref role="3cqZAo" node="6Yb9hAqUIHf" resolve="inEff" />
</node>
<node concept="1eOMI4" id="6Yb9hAqUIH4" role="1Lso8e">
<node concept="10QFUN" id="6Yb9hAqUIH5" role="1eOMHV">
@ -1610,12 +1625,15 @@
<node concept="3clFbH" id="6Yb9hAqUIHe" role="3cqZAp" />
</node>
<node concept="37vLTG" id="6Yb9hAqUIHf" role="1bW2Oz">
<property role="TrG5h" value="prev" />
<node concept="3uibUv" id="6Yb9hAqUIHg" role="1tU5fm">
<ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
<node concept="3qUE_q" id="6vFODDAZpMe" role="11_B2D">
<node concept="3uibUv" id="6vFODDAZpMf" role="3qUE_r">
<ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
<property role="TrG5h" value="inEff" />
<node concept="3uibUv" id="2daneBPXE3Y" role="1tU5fm">
<ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
<node concept="3uibUv" id="6Yb9hAqUIHg" role="11_B2D">
<ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
<node concept="3qUE_q" id="6vFODDAZpMe" role="11_B2D">
<node concept="3uibUv" id="6vFODDAZpMf" role="3qUE_r">
<ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
</node>
</node>
</node>
</node>
@ -1632,7 +1650,7 @@
<node concept="1rXfSq" id="55Q$YFtItIY" role="2Oq$k0">
<ref role="37wK5l" to="fjx4:6Yb9hAqJSaM" resolve="scheduleWithTrace" />
<node concept="37vLTw" id="6Yb9hAqUOf4" role="37wK5m">
<ref role="3cqZAo" node="6Yb9hAqUIG3" resolve="withTrace" />
<ref role="3cqZAo" node="6Yb9hAqUIG3" resolve="input_trace" />
</node>
<node concept="37vLTw" id="55Q$YFtIvC0" role="37wK5m">
<ref role="3cqZAo" node="6Yb9hAqUr3x" resolve="subscribeScheduler" />
@ -1771,7 +1789,7 @@
</node>
</node>
</node>
<node concept="3clFbH" id="6IQb_Rxsy3F" role="3cqZAp" />
<node concept="3clFbH" id="2daneBPYcqF" role="3cqZAp" />
</node>
</node>
</node>
@ -1787,6 +1805,13 @@
<ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
</node>
</node>
<node concept="312cEg" id="6IQb_Rxsgb3" role="jymVt">
<property role="TrG5h" value="editorComponent" />
<node concept="3Tm6S6" id="6IQb_Rxsgb4" role="1B3o_S" />
<node concept="3uibUv" id="6IQb_Rxsgb5" role="1tU5fm">
<ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
</node>
</node>
<node concept="312cEg" id="3F6vMxqv_px" role="jymVt">
<property role="TrG5h" value="msgtrace" />
<node concept="3Tm6S6" id="6kREIVkHFzh" role="1B3o_S" />
@ -1801,13 +1826,6 @@
<ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEventsCollector" />
</node>
</node>
<node concept="312cEg" id="6IQb_Rxsgb3" role="jymVt">
<property role="TrG5h" value="editorComponent" />
<node concept="3Tm6S6" id="6IQb_Rxsgb4" role="1B3o_S" />
<node concept="3uibUv" id="6IQb_Rxsgb5" role="1tU5fm">
<ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
</node>
</node>
<node concept="2tJIrI" id="6Yb9hAqUq_7" role="jymVt" />
<node concept="3Tm1VV" id="6Yb9hAqUoyf" role="1B3o_S" />
<node concept="3uibUv" id="6Yb9hAqUo$y" role="1zkMxy">

300
coderules/solutions/jetbrains.mps.controlflow/models/service.mps
View File

@ -70,6 +70,10 @@
</concept>
<concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
<concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
<concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
<child id="1070534934091" name="type" index="10QFUM" />
<child id="1070534934092" name="expression" index="10QFUP" />
</concept>
<concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
<concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
<child id="1095933932569" name="implementedInterface" index="EKbjA" />
@ -97,6 +101,7 @@
<concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_">
<property id="1178608670077" name="isAbstract" index="1EzhhJ" />
</concept>
<concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
<concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
<child id="1068580123156" name="expression" index="3clFbG" />
</concept>
@ -117,6 +122,9 @@
<child id="1068581517676" name="expression" index="3cqZAk" />
</concept>
<concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
<concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
<child id="1079359253376" name="expression" index="1eOMHV" />
</concept>
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
<child id="1068499141038" name="actualArgument" index="37wK5m" />
@ -127,6 +135,7 @@
<property id="521412098689998745" name="nonStatic" index="2bfB8j" />
<child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
</concept>
<concept id="1171903607971" name="jetbrains.mps.baseLanguage.structure.WildCardType" flags="in" index="3qTvmN" />
<concept id="1171903916106" name="jetbrains.mps.baseLanguage.structure.UpperBoundType" flags="in" index="3qUE_q">
<child id="1171903916107" name="bound" index="3qUE_r" />
</concept>
@ -150,6 +159,7 @@
<concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
<concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
<reference id="1170346070688" name="classifier" index="1Y3XeK" />
<child id="1201186121363" name="typeParameter" index="2Ghqu4" />
</concept>
</language>
<language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
@ -187,10 +197,6 @@
</concept>
<concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
<concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
<concept id="7125221305512719026" name="jetbrains.mps.baseLanguage.collections.structure.CollectionType" flags="in" index="3vKaQO" />
<concept id="5686963296372573083" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerType" flags="in" index="3O5elB">
<child id="5686963296372573084" name="elementType" index="3O5elw" />
</concept>
</language>
</registry>
<node concept="312cEu" id="4t7Xo7inNgi">
@ -343,6 +349,165 @@
<node concept="312cEu" id="78H58oeu6dG">
<property role="TrG5h" value="ControlflowStep" />
<node concept="2tJIrI" id="78H58oeu6M4" role="jymVt" />
<node concept="Wx3nA" id="2daneBP_Jiy" role="jymVt">
<property role="TrG5h" value="REPORT_ITEMS" />
<node concept="3Tm1VV" id="2daneBP_Jiz" role="1B3o_S" />
<node concept="3uibUv" id="2daneBP_Ji$" role="1tU5fm">
<ref role="3uigEE" to="1yqb:2daneBOX7Tv" resolve="Effect.ValueKind" />
<node concept="_YKpA" id="2daneBP_OV2" role="11_B2D">
<node concept="3uibUv" id="2daneBP_OV3" role="_ZDj9">
<ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
</node>
</node>
</node>
<node concept="2ShNRf" id="2daneBP_JiC" role="33vP2m">
<node concept="YeOm9" id="2daneBP_JiD" role="2ShVmc">
<node concept="1Y3b0j" id="2daneBP_JiE" role="YeSDq">
<property role="2bfB8j" value="true" />
<ref role="37wK5l" to="1yqb:2daneBPU2_R" resolve="Effect.ValueKind" />
<ref role="1Y3XeK" to="1yqb:2daneBOX7Tv" resolve="Effect.ValueKind" />
<node concept="3Tm1VV" id="2daneBP_JiF" role="1B3o_S" />
<node concept="3clFb_" id="2daneBP_JiG" role="jymVt">
<property role="TrG5h" value="extractValue" />
<node concept="37vLTG" id="2daneBP_JiH" role="3clF46">
<property role="TrG5h" value="eff" />
<node concept="3uibUv" id="2daneBP_JiI" role="1tU5fm">
<ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
</node>
</node>
<node concept="3Tm1VV" id="2daneBP_JiJ" role="1B3o_S" />
<node concept="3clFbS" id="2daneBP_JiK" role="3clF47">
<node concept="3clFbF" id="2daneBP_JiL" role="3cqZAp">
<node concept="2OqwBi" id="2daneBP_JiM" role="3clFbG">
<node concept="1eOMI4" id="2daneBP_JiN" role="2Oq$k0">
<node concept="10QFUN" id="2daneBP_JiO" role="1eOMHV">
<node concept="3uibUv" id="3bpBM3PgvVQ" role="10QFUM">
<ref role="3uigEE" node="2daneBP0KUh" resolve="ControlflowStep.LocalEffect" />
</node>
<node concept="37vLTw" id="2daneBP_JiQ" role="10QFUP">
<ref role="3cqZAo" node="2daneBP_JiH" resolve="eff" />
</node>
</node>
</node>
<node concept="2OwXpG" id="3bpBM3PgwDC" role="2OqNvi">
<ref role="2Oxat5" node="2daneBPUfZ5" resolve="reportItems" />
</node>
</node>
</node>
</node>
<node concept="2AHcQZ" id="2daneBP_JiS" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
<node concept="_YKpA" id="2daneBP_Phf" role="3clF45">
<node concept="3uibUv" id="2daneBP_Phg" role="_ZDj9">
<ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
</node>
</node>
</node>
<node concept="_YKpA" id="2daneBP_OpG" role="2Ghqu4">
<node concept="3uibUv" id="2daneBP_OpH" role="_ZDj9">
<ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="3bpBM3Pg4tg" role="jymVt" />
<node concept="312cEu" id="2daneBP0KUh" role="jymVt">
<property role="TrG5h" value="LocalEffect" />
<node concept="2tJIrI" id="2daneBP0QTj" role="jymVt" />
<node concept="3clFbW" id="2daneBPTXIa" role="jymVt">
<node concept="37vLTG" id="2daneBPUbGa" role="3clF46">
<property role="TrG5h" value="reportItems" />
<node concept="_YKpA" id="2daneBPUcqv" role="1tU5fm">
<node concept="3uibUv" id="2daneBPUcqw" role="_ZDj9">
<ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
</node>
</node>
</node>
<node concept="3cqZAl" id="2daneBPTXIc" role="3clF45" />
<node concept="3Tm6S6" id="2daneBPTZG0" role="1B3o_S" />
<node concept="3clFbS" id="2daneBPTXIe" role="3clF47">
<node concept="3clFbF" id="2daneBPUfZa" role="3cqZAp">
<node concept="37vLTI" id="2daneBPUfZc" role="3clFbG">
<node concept="2OqwBi" id="2daneBPUlok" role="37vLTJ">
<node concept="Xjq3P" id="2daneBPUl$s" role="2Oq$k0" />
<node concept="2OwXpG" id="3bpBM3Pgab4" role="2OqNvi">
<ref role="2Oxat5" node="2daneBPUfZ5" resolve="reportItems" />
</node>
</node>
<node concept="37vLTw" id="2daneBPUfZg" role="37vLTx">
<ref role="3cqZAo" node="2daneBPUbGa" resolve="reportItems" />
</node>
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="2daneBPTWiR" role="jymVt" />
<node concept="3Tm1VV" id="2daneBPTV4k" role="1B3o_S" />
<node concept="3uibUv" id="2daneBP0QoL" role="1zkMxy">
<ref role="3uigEE" to="1yqb:2daneBOXQpd" resolve="Effect.SingularEffect" />
<node concept="3uibUv" id="3bpBM3PgxRb" role="11_B2D">
<ref role="3uigEE" node="78H58oeu6dG" resolve="ControlflowStep" />
</node>
</node>
<node concept="3clFb_" id="2daneBP0Ra_" role="jymVt">
<property role="TrG5h" value="hasValue" />
<node concept="37vLTG" id="2daneBP0RaA" role="3clF46">
<property role="TrG5h" value="valueKind" />
<node concept="3uibUv" id="2daneBP0RaB" role="1tU5fm">
<ref role="3uigEE" to="1yqb:2daneBOX7Tv" resolve="Effect.ValueKind" />
<node concept="3qTvmN" id="2daneBP0RaC" role="11_B2D" />
</node>
</node>
<node concept="10P_77" id="2daneBP0RaD" role="3clF45" />
<node concept="3Tm1VV" id="2daneBP0RaE" role="1B3o_S" />
<node concept="3clFbS" id="2daneBP0RaH" role="3clF47">
<node concept="3clFbF" id="2daneBPzZmL" role="3cqZAp">
<node concept="3clFbC" id="2daneBPNnMj" role="3clFbG">
<node concept="37vLTw" id="2daneBPNoe9" role="3uHU7w">
<ref role="3cqZAo" node="2daneBP_Jiy" resolve="REPORT_ITEMS" />
</node>
<node concept="37vLTw" id="2daneBPNnn5" role="3uHU7B">
<ref role="3cqZAo" node="2daneBP0RaA" resolve="valueKind" />
</node>
</node>
</node>
</node>
<node concept="2AHcQZ" id="2daneBP0RaI" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="2daneBP0S6b" role="jymVt" />
<node concept="3clFb_" id="3bpBM3PHGeJ" role="jymVt">
<property role="TrG5h" value="info" />
<node concept="17QB3L" id="3bpBM3PHGeK" role="3clF45" />
<node concept="3Tm1VV" id="3bpBM3PHGeL" role="1B3o_S" />
<node concept="3clFbS" id="3bpBM3PHGeQ" role="3clF47">
<node concept="3clFbF" id="3bpBM3PHHjf" role="3cqZAp">
<node concept="Xl_RD" id="3bpBM3PHHje" role="3clFbG">
<property role="Xl_RC" value="evaluating controlflow" />
</node>
</node>
</node>
<node concept="2AHcQZ" id="3bpBM3PHGeR" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="3bpBM3PNKMv" role="jymVt" />
<node concept="312cEg" id="2daneBPUfZ5" role="jymVt">
<property role="TrG5h" value="reportItems" />
<node concept="3Tm6S6" id="2daneBPUfZ6" role="1B3o_S" />
<node concept="_YKpA" id="2daneBPUfZ8" role="1tU5fm">
<node concept="3uibUv" id="2daneBPUfZ9" role="_ZDj9">
<ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="3bpBM3Pg4v$" role="jymVt" />
<node concept="2tJIrI" id="3bpBM3Pg1sT" role="jymVt" />
<node concept="3clFbW" id="78H58oeu6OE" role="jymVt">
<node concept="37vLTG" id="78H58oeu6VL" role="3clF46">
<property role="TrG5h" value="repository" />
@ -366,15 +531,18 @@
<property role="TrG5h" value="scheduleWithTrace" />
<property role="1EzhhJ" value="false" />
<node concept="37vLTG" id="6Yb9hAqJSaN" role="3clF46">
<property role="TrG5h" value="prevStepWithTrace" />
<property role="TrG5h" value="input_trace" />
<node concept="3uibUv" id="6Yb9hAqJSaO" role="1tU5fm">
<ref role="3uigEE" to="unkn:~Single" resolve="Single" />
<node concept="1LlUBW" id="6Yb9hAqJSaP" role="11_B2D">
<node concept="3uibUv" id="6Yb9hAqJSaQ" role="1Lm7xW">
<ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
<node concept="3qUE_q" id="6vFODDAYiK5" role="11_B2D">
<node concept="3uibUv" id="6vFODDAZfM0" role="3qUE_r">
<ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
<node concept="3uibUv" id="2daneBPX56x" role="1Lm7xW">
<ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
<node concept="3uibUv" id="6Yb9hAqJSaQ" role="11_B2D">
<ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
<node concept="3qUE_q" id="6vFODDAYiK5" role="11_B2D">
<node concept="3uibUv" id="6vFODDAZfM0" role="3qUE_r">
<ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
</node>
</node>
</node>
</node>
@ -392,52 +560,70 @@
</node>
<node concept="3uibUv" id="6Yb9hAqJSaU" role="3clF45">
<ref role="3uigEE" to="unkn:~Single" resolve="Single" />
<node concept="3uibUv" id="6Yb9hAqJSaV" role="11_B2D">
<ref role="3uigEE" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
<node concept="3uibUv" id="2daneBPXiSD" role="11_B2D">
<ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
<node concept="3qUE_q" id="3bpBM3Pb9xV" role="11_B2D">
<node concept="3uibUv" id="3bpBM3Pb9SC" role="3qUE_r">
<ref role="3uigEE" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
</node>
</node>
</node>
</node>
<node concept="3Tmbuc" id="6Yb9hAqJSaW" role="1B3o_S" />
<node concept="3clFbS" id="6Yb9hAqJSf8" role="3clF47">
<node concept="3clFbH" id="2daneBPX9B2" role="3cqZAp" />
<node concept="3clFbF" id="6Yb9hAqJSfd" role="3cqZAp">
<node concept="2OqwBi" id="6Yb9hAqJTeO" role="3clFbG">
<node concept="2OqwBi" id="3bpBM3Pga$_" role="3clFbG">
<node concept="3nyPlj" id="6Yb9hAqJSfc" role="2Oq$k0">
<ref role="37wK5l" to="1yqb:55Q$YFtHM07" resolve="scheduleWithTrace" />
<node concept="37vLTw" id="6Yb9hAqJSfa" role="37wK5m">
<ref role="3cqZAo" node="6Yb9hAqJSaN" resolve="prevStepWithTrace" />
<ref role="3cqZAo" node="6Yb9hAqJSaN" resolve="input_trace" />
</node>
<node concept="37vLTw" id="6Yb9hAqJSfb" role="37wK5m">
<ref role="3cqZAo" node="6Yb9hAqJSaS" resolve="subscribeScheduler" />
</node>
</node>
<node concept="liA8E" id="6Yb9hAqJTJO" role="2OqNvi">
<node concept="liA8E" id="3bpBM3PgbYD" role="2OqNvi">
<ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
<node concept="1bVj0M" id="6Yb9hAqJUtw" role="37wK5m">
<node concept="37vLTG" id="6Yb9hAqJUBz" role="1bW2Oz">
<property role="TrG5h" value="step" />
<node concept="3uibUv" id="6Yb9hAqJUJy" role="1tU5fm">
<ref role="3uigEE" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
</node>
</node>
<node concept="3clFbS" id="6Yb9hAqJUtx" role="1bW5cS">
<node concept="3clFbH" id="6Yb9hAqJV$G" role="3cqZAp" />
<node concept="3SKdUt" id="6Yb9hAqKbak" role="3cqZAp">
<node concept="1PaTwC" id="589APehYy_y" role="3ndbpf">
<node concept="3oM_SD" id="589APehYy_z" role="1PaTwD">
<property role="3oM_SC" value="NOP" />
<node concept="1bVj0M" id="3bpBM3PgcUx" role="37wK5m">
<node concept="37vLTG" id="3bpBM3PgdJB" role="1bW2Oz">
<property role="TrG5h" value="superEff" />
<node concept="3uibUv" id="3bpBM3PgejS" role="1tU5fm">
<ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
<node concept="3qUE_q" id="3bpBM3PgFax" role="11_B2D">
<node concept="3uibUv" id="3bpBM3PgGj_" role="3qUE_r">
<ref role="3uigEE" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
</node>
</node>
</node>
<node concept="3clFbH" id="6Yb9hAqJV$L" role="3cqZAp" />
<node concept="3clFbF" id="6Yb9hAqJVMD" role="3cqZAp">
<node concept="37vLTw" id="6Yb9hAqJVMB" role="3clFbG">
<ref role="3cqZAo" node="6Yb9hAqJUBz" resolve="step" />
</node>
<node concept="3clFbS" id="3bpBM3PgcUy" role="1bW5cS">
<node concept="3clFbH" id="3bpBM3PghJA" role="3cqZAp" />
<node concept="3clFbF" id="3bpBM3PgizQ" role="3cqZAp">
<node concept="2OqwBi" id="3bpBM3Pgj8F" role="3clFbG">
<node concept="37vLTw" id="3bpBM3PgizO" role="2Oq$k0">
<ref role="3cqZAo" node="3bpBM3PgdJB" resolve="superEff" />
</node>
<node concept="liA8E" id="3bpBM3Pgj_S" role="2OqNvi">
<ref role="37wK5l" to="1yqb:2daneBOX0cV" resolve="combine" />
<node concept="2ShNRf" id="3bpBM3Pgkr_" role="37wK5m">
<node concept="1pGfFk" id="3bpBM3Pglr7" role="2ShVmc">
<ref role="37wK5l" node="2daneBPTXIa" resolve="ControlflowStep.LocalEffect" />
<node concept="37vLTw" id="3bpBM3PgtRB" role="37wK5m">
<ref role="3cqZAo" node="1FOQehx4tIV" resolve="reportItems" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="3bpBM3Pgi5m" role="3cqZAp" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="3bpBM3Pb9r4" role="3cqZAp" />
</node>
<node concept="2AHcQZ" id="6Yb9hAqJSf9" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
@ -587,56 +773,6 @@
</node>
</node>
<node concept="2tJIrI" id="78H58oeubmD" role="jymVt" />
<node concept="3clFb_" id="1FOQehx4yMT" role="jymVt">
<property role="TrG5h" value="getReportItems" />
<node concept="3Tm1VV" id="1FOQehx4yMX" role="1B3o_S" />
<node concept="3clFbS" id="1FOQehx4yMY" role="3clF47">
<node concept="3clFbF" id="1FOQehx4BDl" role="3cqZAp">
<node concept="37vLTw" id="1FOQehx4BDk" role="3clFbG">
<ref role="3cqZAo" node="1FOQehx4tIV" resolve="reportItems" />
</node>
</node>
</node>
<node concept="3vKaQO" id="1FOQehx4$tY" role="3clF45">
<node concept="3uibUv" id="1FOQehx4_l3" role="3O5elw">
<ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
</node>
</node>
</node>
<node concept="2tJIrI" id="1FOQehx4yMS" role="jymVt" />
<node concept="3clFb_" id="6kREIVl0T6j" role="jymVt">
<property role="TrG5h" value="getTraceTabComponents" />
<node concept="_YKpA" id="6kREIVl0T6k" role="3clF45">
<node concept="3uibUv" id="6IQb_RxROcP" role="_ZDj9">
<ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
</node>
</node>
<node concept="3Tm1VV" id="6kREIVl0T6m" role="1B3o_S" />
<node concept="3clFbS" id="6kREIVl0T6n" role="3clF47">
<node concept="3clFbF" id="6kREIVl0T6o" role="3cqZAp">
<node concept="37vLTw" id="6IQb_Rx$Mfp" role="3clFbG">
<ref role="3cqZAo" node="6IQb_RxsBvb" resolve="traceTabComponents" />
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="78H58oeuecU" role="jymVt" />
<node concept="312cEg" id="6IQb_RxsBvb" role="jymVt">
<property role="TrG5h" value="traceTabComponents" />
<node concept="3Tmbuc" id="78H58of7l2T" role="1B3o_S" />
<node concept="_YKpA" id="6IQb_RxsBvd" role="1tU5fm">
<node concept="3uibUv" id="6IQb_RxRQS7" role="_ZDj9">
<ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
</node>
</node>
<node concept="2ShNRf" id="6IQb_RxsBvf" role="33vP2m">
<node concept="Tc6Ow" id="6IQb_RxsBvg" role="2ShVmc">
<node concept="3uibUv" id="6IQb_RxRP6h" role="HW$YZ">
<ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
</node>
</node>
</node>
</node>
<node concept="312cEg" id="1FOQehx4tIV" role="jymVt">
<property role="TrG5h" value="reportItems" />
<node concept="3Tm6S6" id="1FOQehx4tIW" role="1B3o_S" />