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

Adapt to the changes in reactor API.

This commit is contained in:
Fedor Isakov 2019-05-05 14:15:37 +02:00
parent cc2774d66d
commit aaec11de9b
6 changed files with 780 additions and 819 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

984
coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
View File

File diff suppressed because it is too large Load Diff

278
coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
View File

@ -609,284 +609,6 @@
</node>
</node>
<node concept="2tJIrI" id="5jCHAT2R0T$" role="jymVt" />
<node concept="3clFb_" id="60zk4o6Suoh" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="TrG5h" value="instantiateArguments" />
<property role="DiZV1" value="false" />
<property role="od$2w" value="false" />
<node concept="3Tm1VV" id="60zk4o6Suoi" role="1B3o_S" />
<node concept="3uibUv" id="60zk4o6Suok" role="3clF45">
<ref role="3uigEE" to="33ny:~List" resolve="List" />
<node concept="3qTvmN" id="60zk4o6Suol" role="11_B2D" />
</node>
<node concept="37vLTG" id="60zk4o6Suom" role="3clF46">
<property role="TrG5h" value="arguments" />
<node concept="3uibUv" id="60zk4o6Suon" role="1tU5fm">
<ref role="3uigEE" to="33ny:~List" resolve="List" />
<node concept="3qTvmN" id="60zk4o6Suoo" role="11_B2D" />
</node>
</node>
<node concept="37vLTG" id="60zk4o6Suop" role="3clF46">
<property role="TrG5h" value="logicalContext" />
<node concept="3uibUv" id="60zk4o6Suoq" role="1tU5fm">
<ref role="3uigEE" to="bj13:~LogicalContext" resolve="LogicalContext" />
</node>
</node>
<node concept="37vLTG" id="4jcOV4hkQup" role="3clF46">
<property role="TrG5h" value="invocationContext" />
<node concept="3uibUv" id="4jcOV4hkSdQ" role="1tU5fm">
<ref role="3uigEE" to="w7la:~InvocationContext" resolve="InvocationContext" />
</node>
</node>
<node concept="3clFbS" id="60zk4o6Suor" role="3clF47">
<node concept="3cpWs8" id="60zk4o6SxJ0" role="3cqZAp">
<node concept="3cpWsn" id="60zk4o6SxJ1" role="3cpWs9">
<property role="TrG5h" value="res" />
<node concept="3uibUv" id="60zk4o6SxJ2" role="1tU5fm">
<ref role="3uigEE" to="33ny:~ArrayList" resolve="ArrayList" />
<node concept="3uibUv" id="60zk4o6SxJ3" role="11_B2D">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
</node>
<node concept="2ShNRf" id="60zk4o6SxJ4" role="33vP2m">
<node concept="1pGfFk" id="60zk4o6SxJ5" role="2ShVmc">
<ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;(int)" resolve="ArrayList" />
<node concept="2OqwBi" id="60zk4o6SxJ6" role="37wK5m">
<node concept="37vLTw" id="60zk4o6Szda" role="2Oq$k0">
<ref role="3cqZAo" node="60zk4o6Suom" resolve="arguments" />
</node>
<node concept="liA8E" id="60zk4o6SxJa" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
</node>
</node>
<node concept="3uibUv" id="60zk4o6SxJb" role="1pMfVU">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
</node>
</node>
</node>
</node>
<node concept="1DcWWT" id="60zk4o6SxJc" role="3cqZAp">
<node concept="3clFbS" id="60zk4o6SxJd" role="2LFqv$">
<node concept="3clFbJ" id="60zk4o6SxJe" role="3cqZAp">
<node concept="3eNFk2" id="60zk4o6SxJf" role="3eNLev">
<node concept="2ZW3vV" id="60zk4o6SxJg" role="3eO9$A">
<node concept="3uibUv" id="60zk4o6SxJh" role="2ZW6by">
<ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
</node>
<node concept="37vLTw" id="60zk4o6SxJi" role="2ZW6bz">
<ref role="3cqZAo" node="60zk4o6SxJP" resolve="a" />
</node>
</node>
<node concept="3clFbS" id="60zk4o6SxJj" role="3eOfB_">
<node concept="3clFbF" id="60zk4o6SxJk" role="3cqZAp">
<node concept="2OqwBi" id="60zk4o6SxJl" role="3clFbG">
<node concept="37vLTw" id="60zk4o6SxJm" role="2Oq$k0">
<ref role="3cqZAo" node="60zk4o6SxJ1" resolve="res" />
</node>
<node concept="liA8E" id="60zk4o6SxJn" role="2OqNvi">
<ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
<node concept="2OqwBi" id="60zk4o6SxJo" role="37wK5m">
<node concept="37vLTw" id="60zk4o6SxJp" role="2Oq$k0">
<ref role="3cqZAo" node="60zk4o6Suop" resolve="logicalContext" />
</node>
<node concept="liA8E" id="60zk4o6SxJq" role="2OqNvi">
<ref role="37wK5l" to="bj13:~LogicalContext.variable(jetbrains.mps.logic.reactor.logical.MetaLogical):jetbrains.mps.logic.reactor.logical.Logical" resolve="variable" />
<node concept="10QFUN" id="60zk4o6SxJr" role="37wK5m">
<node concept="37vLTw" id="60zk4o6SxJs" role="10QFUP">
<ref role="3cqZAo" node="60zk4o6SxJP" resolve="a" />
</node>
<node concept="3uibUv" id="60zk4o6SxJt" role="10QFUM">
<ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
<node concept="3uibUv" id="60zk4o6SxJu" role="11_B2D">
<ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="60zk4o6SxJv" role="3cqZAp" />
</node>
</node>
<node concept="3eNFk2" id="5WBVN_M1CZI" role="3eNLev">
<node concept="2ZW3vV" id="5WBVN_M1Djq" role="3eO9$A">
<node concept="3uibUv" id="5WBVN_M1Dpb" role="2ZW6by">
<ref role="3uigEE" to="i348:5WBVN_M1BKE" resolve="LateExpression" />
</node>
<node concept="37vLTw" id="5WBVN_M1DbI" role="2ZW6bz">
<ref role="3cqZAo" node="60zk4o6SxJP" resolve="a" />
</node>
</node>
<node concept="3clFbS" id="5WBVN_M1CZK" role="3eOfB_">
<node concept="3cpWs8" id="5WBVN_M1J07" role="3cqZAp">
<node concept="3cpWsn" id="5WBVN_M1J08" role="3cpWs9">
<property role="TrG5h" value="exp" />
<node concept="3uibUv" id="5WBVN_M1J02" role="1tU5fm">
<ref role="3uigEE" to="i348:5WBVN_M1BKE" resolve="LateExpression" />
<node concept="3qTvmN" id="5WBVN_M1J05" role="11_B2D" />
</node>
<node concept="1eOMI4" id="5WBVN_M1J09" role="33vP2m">
<node concept="10QFUN" id="5WBVN_M1J0a" role="1eOMHV">
<node concept="3uibUv" id="5WBVN_M1J0b" role="10QFUM">
<ref role="3uigEE" to="i348:5WBVN_M1BKE" resolve="LateExpression" />
<node concept="3qTvmN" id="5WBVN_M1J0c" role="11_B2D" />
</node>
<node concept="37vLTw" id="5WBVN_M1J0d" role="10QFUP">
<ref role="3cqZAo" node="60zk4o6SxJP" resolve="a" />
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="5WBVN_M1GEt" role="3cqZAp">
<node concept="3cpWsn" id="5WBVN_M1GEu" role="3cpWs9">
<property role="TrG5h" value="expArgs" />
<node concept="3uibUv" id="5WBVN_M1GEk" role="1tU5fm">
<ref role="3uigEE" to="33ny:~List" resolve="List" />
<node concept="3qTvmN" id="5WBVN_M1GEn" role="11_B2D" />
</node>
<node concept="1rXfSq" id="5WBVN_M1GEv" role="33vP2m">
<ref role="37wK5l" node="60zk4o6Suoh" resolve="instantiateArguments" />
<node concept="2YIFZM" id="5WBVN_MlGya" role="37wK5m">
<ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...):java.util.List" resolve="asList" />
<ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
<node concept="2OqwBi" id="5WBVN_M1GEw" role="37wK5m">
<node concept="37vLTw" id="5WBVN_M1J0e" role="2Oq$k0">
<ref role="3cqZAo" node="5WBVN_M1J08" resolve="exp" />
</node>
<node concept="liA8E" id="5WBVN_M1GEA" role="2OqNvi">
<ref role="37wK5l" to="i348:5WBVN_M1BSf" resolve="metaArgs" />
</node>
</node>
</node>
<node concept="37vLTw" id="5WBVN_M1GEB" role="37wK5m">
<ref role="3cqZAo" node="60zk4o6Suop" resolve="logicalContext" />
</node>
<node concept="37vLTw" id="4jcOV4hkYUG" role="37wK5m">
<ref role="3cqZAo" node="4jcOV4hkQup" resolve="invocationContext" />
</node>
</node>
</node>
</node>
<node concept="3SKdUt" id="5WBVN_M1MSf" role="3cqZAp">
<node concept="3SKdUq" id="5WBVN_M1MSh" role="3SKWNk">
<property role="3SKdUp" value="TODO: user code" />
</node>
</node>
<node concept="3clFbF" id="5WBVN_M1Hyh" role="3cqZAp">
<node concept="2OqwBi" id="5WBVN_M1HRh" role="3clFbG">
<node concept="37vLTw" id="5WBVN_M1Hyf" role="2Oq$k0">
<ref role="3cqZAo" node="60zk4o6SxJ1" resolve="res" />
</node>
<node concept="liA8E" id="5WBVN_M1IHI" role="2OqNvi">
<ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
<node concept="2OqwBi" id="5WBVN_M1JzG" role="37wK5m">
<node concept="37vLTw" id="5WBVN_M1JhL" role="2Oq$k0">
<ref role="3cqZAo" node="5WBVN_M1J08" resolve="exp" />
</node>
<node concept="liA8E" id="5WBVN_M1JVL" role="2OqNvi">
<ref role="37wK5l" to="i348:5WBVN_M1BLN" resolve="eval" />
<node concept="37vLTw" id="6yUEjXvTvSG" role="37wK5m">
<ref role="3cqZAo" node="60zk4o6Suop" resolve="logicalContext" />
</node>
<node concept="37vLTw" id="4jcOV4hlseO" role="37wK5m">
<ref role="3cqZAo" node="4jcOV4hkQup" resolve="invocationContext" />
</node>
<node concept="2OqwBi" id="5WBVN_M1KyJ" role="37wK5m">
<node concept="37vLTw" id="5WBVN_M1K7z" role="2Oq$k0">
<ref role="3cqZAo" node="5WBVN_M1GEu" resolve="expArgs" />
</node>
<node concept="liA8E" id="5WBVN_M1L1T" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.toArray():java.lang.Object[]" resolve="toArray" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="5WBVN_M1Hs2" role="3cqZAp" />
</node>
</node>
<node concept="3clFbS" id="60zk4o6SxJw" role="3clFbx">
<node concept="3clFbF" id="60zk4o6SxJx" role="3cqZAp">
<node concept="2OqwBi" id="60zk4o6SxJy" role="3clFbG">
<node concept="37vLTw" id="60zk4o6SxJz" role="2Oq$k0">
<ref role="3cqZAo" node="60zk4o6SxJ1" resolve="res" />
</node>
<node concept="liA8E" id="60zk4o6SxJ$" role="2OqNvi">
<ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
<node concept="2YIFZM" id="3gNap3fNlJv" role="37wK5m">
<ref role="37wK5l" to="oy3s:4TCblo5NqWF" resolve="instantiateMetaLogicals" />
<ref role="1Pybhc" to="oy3s:677NV565N1x" resolve="LogicalUtil" />
<node concept="10QFUN" id="60zk4o6SxJA" role="37wK5m">
<node concept="3uibUv" id="60zk4o6SxJB" role="10QFUM">
<ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
</node>
<node concept="37vLTw" id="60zk4o6SxJC" role="10QFUP">
<ref role="3cqZAo" node="60zk4o6SxJP" resolve="a" />
</node>
</node>
<node concept="37vLTw" id="60zk4o6SxJD" role="37wK5m">
<ref role="3cqZAo" node="60zk4o6Suop" resolve="logicalContext" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="60zk4o6SxJE" role="3cqZAp" />
</node>
<node concept="2ZW3vV" id="60zk4o6SxJF" role="3clFbw">
<node concept="3uibUv" id="60zk4o6SxJG" role="2ZW6by">
<ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
</node>
<node concept="37vLTw" id="60zk4o6SxJH" role="2ZW6bz">
<ref role="3cqZAo" node="60zk4o6SxJP" resolve="a" />
</node>
</node>
<node concept="9aQIb" id="60zk4o6SxJI" role="9aQIa">
<node concept="3clFbS" id="60zk4o6SxJJ" role="9aQI4">
<node concept="3clFbF" id="60zk4o6SxJK" role="3cqZAp">
<node concept="2OqwBi" id="60zk4o6SxJL" role="3clFbG">
<node concept="37vLTw" id="60zk4o6SxJM" role="2Oq$k0">
<ref role="3cqZAo" node="60zk4o6SxJ1" resolve="res" />
</node>
<node concept="liA8E" id="60zk4o6SxJN" role="2OqNvi">
<ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
<node concept="37vLTw" id="60zk4o6SxJO" role="37wK5m">
<ref role="3cqZAo" node="60zk4o6SxJP" resolve="a" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWsn" id="60zk4o6SxJP" role="1Duv9x">
<property role="TrG5h" value="a" />
<node concept="3uibUv" id="60zk4o6SxJQ" role="1tU5fm">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
</node>
<node concept="37vLTw" id="60zk4o6SI6n" role="1DdaDG">
<ref role="3cqZAo" node="60zk4o6Suom" resolve="arguments" />
</node>
</node>
<node concept="3clFbF" id="60zk4o6SxJU" role="3cqZAp">
<node concept="37vLTw" id="60zk4o6SxJV" role="3clFbG">
<ref role="3cqZAo" node="60zk4o6SxJ1" resolve="res" />
</node>
</node>
</node>
<node concept="2AHcQZ" id="60zk4o6Suos" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="60zk4o6RdRN" role="jymVt" />
<node concept="3clFb_" id="7Oc59RSE1WF" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="TrG5h" value="toString" />

17
coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps
View File

@ -8537,15 +8537,14 @@
</node>
<node concept="liA8E" id="4jcOV4hxy0C" role="2OqNvi">
<ref role="37wK5l" to="w7la:~InvocationContext.report(jetbrains.mps.logic.reactor.evaluation.EvaluationFeedback):void" resolve="report" />
<node concept="2ShNRf" id="4jcOV4hxy6V" role="37wK5m">
<node concept="1pGfFk" id="4jcOV4hxypF" role="2ShVmc">
<ref role="37wK5l" to="w7la:~DetailedFeedback.&lt;init&gt;(java.lang.String,jetbrains.mps.logic.reactor.evaluation.EvaluationFeedback$Severity)" resolve="DetailedFeedback" />
<node concept="37vLTw" id="4jcOV4hxNNG" role="37wK5m">
<ref role="3cqZAo" node="4jcOV4hx_1_" resolve="msg" />
</node>
<node concept="37vLTw" id="4jcOV4hxO4P" role="37wK5m">
<ref role="3cqZAo" node="4jcOV4hxMnf" resolve="severity" />
</node>
<node concept="2YIFZM" id="473$26GHA4W" role="37wK5m">
<ref role="1Pybhc" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
<ref role="37wK5l" to="w7la:~EvaluationFeedback.details(java.lang.String,jetbrains.mps.logic.reactor.evaluation.EvaluationFeedback$Severity)" resolve="details" />
<node concept="37vLTw" id="473$26GHB0q" role="37wK5m">
<ref role="3cqZAo" node="4jcOV4hx_1_" resolve="msg" />
</node>
<node concept="37vLTw" id="473$26GHB77" role="37wK5m">
<ref role="3cqZAo" node="4jcOV4hxMnf" resolve="severity" />
</node>
</node>
</node>

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

@ -6178,21 +6178,18 @@
</node>
</node>
<node concept="2tJIrI" id="7vxJ_H4trvc" role="jymVt" />
<node concept="3clFb_" id="8odmgCdhBu" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="TrG5h" value="failure" />
<property role="DiZV1" value="false" />
<property role="od$2w" value="false" />
<node concept="3Tm1VV" id="8odmgCdhBv" role="1B3o_S" />
<node concept="3cqZAl" id="8odmgCdhBx" role="3clF45" />
<node concept="37vLTG" id="8odmgCdhBy" role="3clF46">
<property role="TrG5h" value="failure" />
<node concept="3uibUv" id="8odmgCdhBz" role="1tU5fm">
<ref role="3uigEE" to="w7la:~EvaluationFailure" resolve="EvaluationFailure" />
<node concept="3clFb_" id="473$26GERaw" role="jymVt">
<property role="TrG5h" value="feedback" />
<node concept="3Tm1VV" id="473$26GERay" role="1B3o_S" />
<node concept="3cqZAl" id="473$26GERa$" role="3clF45" />
<node concept="37vLTG" id="473$26GERa_" role="3clF46">
<property role="TrG5h" value="feedback" />
<node concept="3uibUv" id="473$26GERaA" role="1tU5fm">
<ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
</node>
</node>
<node concept="3clFbS" id="8odmgCdhB_" role="3clF47" />
<node concept="2AHcQZ" id="8odmgCdhBA" role="2AJF6D">
<node concept="3clFbS" id="473$26GERaC" role="3clF47" />
<node concept="2AHcQZ" id="473$26GERaD" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
@ -29545,78 +29542,76 @@
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="7vxJ_H4twbw" role="jymVt" />
<node concept="3clFb_" id="8odmgCdik5" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="TrG5h" value="failure" />
<property role="DiZV1" value="false" />
<property role="od$2w" value="false" />
<node concept="3Tm1VV" id="8odmgCdik6" role="1B3o_S" />
<node concept="3cqZAl" id="8odmgCdik7" role="3clF45" />
<node concept="37vLTG" id="8odmgCdik8" role="3clF46">
<property role="TrG5h" value="failure" />
<node concept="3uibUv" id="8odmgCdik9" role="1tU5fm">
<ref role="3uigEE" to="w7la:~EvaluationFailure" resolve="EvaluationFailure" />
<node concept="2tJIrI" id="473$26GDJDY" role="jymVt" />
<node concept="3clFb_" id="473$26GDEOc" role="jymVt">
<property role="TrG5h" value="feedback" />
<node concept="3Tm1VV" id="473$26GDEOe" role="1B3o_S" />
<node concept="3cqZAl" id="473$26GDEOg" role="3clF45" />
<node concept="37vLTG" id="473$26GDEOh" role="3clF46">
<property role="TrG5h" value="feedback" />
<node concept="3uibUv" id="473$26GDEOi" role="1tU5fm">
<ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
</node>
</node>
<node concept="2AHcQZ" id="8odmgCdikb" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
<node concept="3clFbS" id="8odmgCdikc" role="3clF47">
<node concept="3clFbJ" id="8odmgCmxf1" role="3cqZAp">
<node concept="3clFbS" id="8odmgCmxf3" role="3clFbx">
<node concept="3clFbF" id="8odmgCmD0E" role="3cqZAp">
<node concept="37vLTI" id="8odmgCmFOB" role="3clFbG">
<node concept="37vLTw" id="8odmgCmGm6" role="37vLTx">
<ref role="3cqZAo" node="8odmgCdik8" resolve="failure" />
</node>
<node concept="3EllGN" id="8odmgCmFa4" role="37vLTJ">
<node concept="37vLTw" id="8odmgCmFFm" role="3ElVtu">
<ref role="3cqZAo" node="8odmgCdik8" resolve="failure" />
</node>
<node concept="37vLTw" id="8odmgCmD0C" role="3ElQJh">
<ref role="3cqZAo" node="8odmgCm2gs" resolve="seenFailures" />
<node concept="3clFbS" id="473$26GDEOm" role="3clF47">
<node concept="3clFbJ" id="473$26GEqy0" role="3cqZAp">
<node concept="3clFbS" id="473$26GEqy2" role="3clFbx">
<node concept="3clFbJ" id="8odmgCmxf1" role="3cqZAp">
<node concept="3clFbS" id="8odmgCmxf3" role="3clFbx">
<node concept="3clFbF" id="8odmgCmD0E" role="3cqZAp">
<node concept="37vLTI" id="8odmgCmFOB" role="3clFbG">
<node concept="37vLTw" id="473$26GEwNk" role="37vLTx">
<ref role="3cqZAo" node="473$26GDEOh" resolve="feedback" />
</node>
<node concept="3EllGN" id="8odmgCmFa4" role="37vLTJ">
<node concept="37vLTw" id="473$26GEvTK" role="3ElVtu">
<ref role="3cqZAo" node="473$26GDEOh" resolve="feedback" />
</node>
<node concept="37vLTw" id="8odmgCmD0C" role="3ElQJh">
<ref role="3cqZAo" node="8odmgCm2gs" resolve="seenFailures" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="8odmgCdi_U" role="3cqZAp">
<node concept="1rXfSq" id="8odmgCdi_V" role="3clFbG">
<ref role="37wK5l" node="YGS68MDG_7" resolve="recordActivationEvent" />
<node concept="Rm8GO" id="8odmgCdi_W" role="37wK5m">
<ref role="Rm8GQ" node="7vxJ_H4mnTR" resolve="FAILURE" />
<ref role="1Px2BO" node="5X6ji59xezw" resolve="ActivationEvent" />
</node>
<node concept="1bVj0M" id="8odmgCdi_X" role="37wK5m">
<node concept="37vLTG" id="8odmgCdi_Y" role="1bW2Oz">
<property role="TrG5h" value="id" />
<node concept="10Oyi0" id="8odmgCdi_Z" role="1tU5fm" />
</node>
<node concept="3clFbS" id="8odmgCdiA0" role="1bW5cS">
<node concept="3clFbF" id="8odmgCdiA1" role="3cqZAp">
<node concept="2OqwBi" id="8odmgCdiA2" role="3clFbG">
<node concept="37vLTw" id="8odmgCdiA3" role="2Oq$k0">
<ref role="3cqZAo" node="YGS68MDFfZ" resolve="activationModelBuilder" />
</node>
<node concept="liA8E" id="8odmgCdiA4" role="2OqNvi">
<ref role="37wK5l" node="7vxJ_H4mqbm" resolve="failure" />
<node concept="37vLTw" id="8odmgCdiA5" role="37wK5m">
<ref role="3cqZAo" node="8odmgCdi_Y" resolve="id" />
</node>
<node concept="2OqwBi" id="8odmgCdiA6" role="37wK5m">
<node concept="37vLTw" id="8odmgCdCxt" role="2Oq$k0">
<ref role="3cqZAo" node="8odmgCdik8" resolve="failure" />
<node concept="3clFbF" id="8odmgCdi_U" role="3cqZAp">
<node concept="1rXfSq" id="8odmgCdi_V" role="3clFbG">
<ref role="37wK5l" node="YGS68MDG_7" resolve="recordActivationEvent" />
<node concept="Rm8GO" id="8odmgCdi_W" role="37wK5m">
<ref role="Rm8GQ" node="7vxJ_H4mnTR" resolve="FAILURE" />
<ref role="1Px2BO" node="5X6ji59xezw" resolve="ActivationEvent" />
</node>
<node concept="1bVj0M" id="8odmgCdi_X" role="37wK5m">
<node concept="37vLTG" id="8odmgCdi_Y" role="1bW2Oz">
<property role="TrG5h" value="id" />
<node concept="10Oyi0" id="8odmgCdi_Z" role="1tU5fm" />
</node>
<node concept="3clFbS" id="8odmgCdiA0" role="1bW5cS">
<node concept="3clFbF" id="8odmgCdiA1" role="3cqZAp">
<node concept="2OqwBi" id="8odmgCdiA2" role="3clFbG">
<node concept="37vLTw" id="8odmgCdiA3" role="2Oq$k0">
<ref role="3cqZAo" node="YGS68MDFfZ" resolve="activationModelBuilder" />
</node>
<node concept="liA8E" id="8odmgCdiA8" role="2OqNvi">
<ref role="37wK5l" to="w7la:~EvaluationFailure.getMessage():java.lang.String" resolve="getMessage" />
</node>
</node>
<node concept="2OqwBi" id="8odmgCdDm4" role="37wK5m">
<node concept="37vLTw" id="8odmgCdCUB" role="2Oq$k0">
<ref role="3cqZAo" node="8odmgCdik8" resolve="failure" />
</node>
<node concept="liA8E" id="8odmgCdDFQ" role="2OqNvi">
<ref role="37wK5l" to="w7la:~EvaluationFailure.getCause():jetbrains.mps.logic.reactor.evaluation.EvaluationFailureException" resolve="getCause" />
<node concept="liA8E" id="8odmgCdiA4" role="2OqNvi">
<ref role="37wK5l" node="7vxJ_H4mqbm" resolve="failure" />
<node concept="37vLTw" id="8odmgCdiA5" role="37wK5m">
<ref role="3cqZAo" node="8odmgCdi_Y" resolve="id" />
</node>
<node concept="2OqwBi" id="8odmgCdiA6" role="37wK5m">
<node concept="37vLTw" id="473$26GEBot" role="2Oq$k0">
<ref role="3cqZAo" node="473$26GDEOh" resolve="feedback" />
</node>
<node concept="liA8E" id="8odmgCdiA8" role="2OqNvi">
<ref role="37wK5l" to="w7la:~EvaluationFeedback.getMessage()" resolve="getMessage" />
</node>
</node>
<node concept="2OqwBi" id="8odmgCdDm4" role="37wK5m">
<node concept="37vLTw" id="473$26GECos" role="2Oq$k0">
<ref role="3cqZAo" node="473$26GDEOh" resolve="feedback" />
</node>
<node concept="liA8E" id="473$26GEDg8" role="2OqNvi">
<ref role="37wK5l" to="w7la:~EvaluationFeedback.failureCause()" resolve="failureCause" />
</node>
</node>
</node>
</node>
</node>
@ -29625,22 +29620,33 @@
</node>
</node>
</node>
</node>
</node>
<node concept="3fqX7Q" id="8odmgCmCii" role="3clFbw">
<node concept="2OqwBi" id="8odmgCmCik" role="3fr31v">
<node concept="37vLTw" id="8odmgCmCil" role="2Oq$k0">
<ref role="3cqZAo" node="8odmgCm2gs" resolve="seenFailures" />
</node>
<node concept="2Nt0df" id="8odmgCmCim" role="2OqNvi">
<node concept="37vLTw" id="8odmgCmCin" role="38cxEo">
<ref role="3cqZAo" node="8odmgCdik8" resolve="failure" />
<node concept="3fqX7Q" id="8odmgCmCii" role="3clFbw">
<node concept="2OqwBi" id="8odmgCmCik" role="3fr31v">
<node concept="37vLTw" id="8odmgCmCil" role="2Oq$k0">
<ref role="3cqZAo" node="8odmgCm2gs" resolve="seenFailures" />
</node>
<node concept="2Nt0df" id="8odmgCmCim" role="2OqNvi">
<node concept="37vLTw" id="473$26GEv2L" role="38cxEo">
<ref role="3cqZAo" node="473$26GDEOh" resolve="feedback" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2OqwBi" id="473$26GErE1" role="3clFbw">
<node concept="37vLTw" id="473$26GEqZV" role="2Oq$k0">
<ref role="3cqZAo" node="473$26GDEOh" resolve="feedback" />
</node>
<node concept="liA8E" id="473$26GEsl_" role="2OqNvi">
<ref role="37wK5l" to="w7la:~EvaluationFeedback.isFailure()" resolve="isFailure" />
</node>
</node>
</node>
</node>
<node concept="2AHcQZ" id="473$26GDEOn" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="8odmgCdDFT" role="jymVt" />
<node concept="3clFb_" id="YGS68MESJW" role="jymVt">
@ -31035,20 +31041,20 @@
<node concept="2ShNRf" id="8odmgCm3Jw" role="33vP2m">
<node concept="1pGfFk" id="8odmgCmvu2" role="2ShVmc">
<ref role="37wK5l" to="33ny:~IdentityHashMap.&lt;init&gt;()" resolve="IdentityHashMap" />
<node concept="3uibUv" id="8odmgCnuy$" role="1pMfVU">
<ref role="3uigEE" to="w7la:~EvaluationFailure" resolve="EvaluationFailure" />
<node concept="3uibUv" id="473$26GEu3N" role="1pMfVU">
<ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
</node>
<node concept="3uibUv" id="8odmgCn4Rw" role="1pMfVU">
<ref role="3uigEE" to="w7la:~EvaluationFailure" resolve="EvaluationFailure" />
<node concept="3uibUv" id="473$26GE_uL" role="1pMfVU">
<ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
</node>
</node>
</node>
<node concept="3rvAFt" id="8odmgCmv_S" role="1tU5fm">
<node concept="3uibUv" id="8odmgCnuqK" role="3rvQeY">
<ref role="3uigEE" to="w7la:~EvaluationFailure" resolve="EvaluationFailure" />
<node concept="3uibUv" id="473$26GEtgu" role="3rvQeY">
<ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
</node>
<node concept="3uibUv" id="8odmgCn4BR" role="3rvSg0">
<ref role="3uigEE" to="w7la:~EvaluationFailure" resolve="EvaluationFailure" />
<node concept="3uibUv" id="473$26GE$G5" role="3rvSg0">
<ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
</node>
</node>
</node>

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

@ -3203,66 +3203,66 @@
</node>
</node>
</node>
<node concept="3clFb_" id="8odmgCdE5K" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="TrG5h" value="failure" />
<property role="DiZV1" value="false" />
<property role="od$2w" value="false" />
<node concept="3Tm1VV" id="8odmgCdE5L" role="1B3o_S" />
<node concept="3cqZAl" id="8odmgCdE5N" role="3clF45" />
<node concept="37vLTG" id="8odmgCdE5O" role="3clF46">
<property role="TrG5h" value="failure" />
<node concept="3uibUv" id="8odmgCdE5P" role="1tU5fm">
<ref role="3uigEE" to="w7la:~EvaluationFailure" resolve="EvaluationFailure" />
<node concept="3clFb_" id="473$26GEGuJ" role="jymVt">
<property role="TrG5h" value="feedback" />
<node concept="3Tm1VV" id="473$26GEGuL" role="1B3o_S" />
<node concept="3cqZAl" id="473$26GEGuN" role="3clF45" />
<node concept="37vLTG" id="473$26GEGuO" role="3clF46">
<property role="TrG5h" value="feedback" />
<node concept="3uibUv" id="473$26GEGuP" role="1tU5fm">
<ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
</node>
</node>
<node concept="3clFbS" id="8odmgCdE5R" role="3clF47">
<node concept="1Dw8fO" id="8odmgCdEcC" role="3cqZAp">
<node concept="3clFbS" id="8odmgCdEcD" role="2LFqv$">
<node concept="3clFbF" id="8odmgCdEcE" role="3cqZAp">
<node concept="2OqwBi" id="8odmgCdEcF" role="3clFbG">
<node concept="AH0OO" id="8odmgCdEcG" role="2Oq$k0">
<node concept="37vLTw" id="8odmgCdEcH" role="AHEQo">
<ref role="3cqZAo" node="8odmgCdEcL" resolve="i" />
<node concept="3clFbS" id="473$26GEGuR" role="3clF47">
<node concept="1Dw8fO" id="473$26GEHw4" role="3cqZAp">
<node concept="3clFbS" id="473$26GEHw5" role="2LFqv$">
<node concept="3clFbF" id="473$26GEHw6" role="3cqZAp">
<node concept="2OqwBi" id="473$26GEHw7" role="3clFbG">
<node concept="AH0OO" id="473$26GEHw8" role="2Oq$k0">
<node concept="37vLTw" id="473$26GEHw9" role="AHEQo">
<ref role="3cqZAo" node="473$26GEHwd" resolve="i" />
</node>
<node concept="37vLTw" id="8odmgCdEcI" role="AHHXb">
<node concept="37vLTw" id="473$26GEHwa" role="AHHXb">
<ref role="3cqZAo" node="7nPD14NbJdt" resolve="traces" />
</node>
</node>
<node concept="liA8E" id="8odmgCdEcJ" role="2OqNvi">
<ref role="37wK5l" to="w7la:~EvaluationTrace.failure(jetbrains.mps.logic.reactor.evaluation.EvaluationFailure):void" resolve="failure" />
<node concept="37vLTw" id="8odmgCdFs5" role="37wK5m">
<ref role="3cqZAo" node="8odmgCdE5O" resolve="failure" />
<node concept="liA8E" id="473$26GEHwb" role="2OqNvi">
<ref role="37wK5l" to="w7la:~EvaluationTrace.feedback(jetbrains.mps.logic.reactor.evaluation.EvaluationFeedback)" resolve="feedback" />
<node concept="37vLTw" id="473$26GEJiC" role="37wK5m">
<ref role="3cqZAo" node="473$26GEGuO" resolve="feedback" />
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWsn" id="8odmgCdEcL" role="1Duv9x">
<node concept="3cpWsn" id="473$26GEHwd" role="1Duv9x">
<property role="TrG5h" value="i" />
<node concept="10Oyi0" id="8odmgCdEcM" role="1tU5fm" />
<node concept="3cmrfG" id="8odmgCdEcN" role="33vP2m">
<node concept="10Oyi0" id="473$26GEHwe" role="1tU5fm" />
<node concept="3cmrfG" id="473$26GEHwf" role="33vP2m">
<property role="3cmrfH" value="0" />
</node>
</node>
<node concept="3eOVzh" id="8odmgCdEcO" role="1Dwp0S">
<node concept="2OqwBi" id="8odmgCdEcP" role="3uHU7w">
<node concept="37vLTw" id="8odmgCdEcQ" role="2Oq$k0">
<node concept="3eOVzh" id="473$26GEHwg" role="1Dwp0S">
<node concept="2OqwBi" id="473$26GEHwh" role="3uHU7w">
<node concept="37vLTw" id="473$26GEHwi" role="2Oq$k0">
<ref role="3cqZAo" node="7nPD14NbJdt" resolve="traces" />
</node>
<node concept="1Rwk04" id="8odmgCdEcR" role="2OqNvi" />
<node concept="1Rwk04" id="473$26GEHwj" role="2OqNvi" />
</node>
<node concept="37vLTw" id="8odmgCdEcS" role="3uHU7B">
<ref role="3cqZAo" node="8odmgCdEcL" resolve="i" />
<node concept="37vLTw" id="473$26GEHwk" role="3uHU7B">
<ref role="3cqZAo" node="473$26GEHwd" resolve="i" />
</node>
</node>
<node concept="3uNrnE" id="8odmgCdEcT" role="1Dwrff">
<node concept="37vLTw" id="8odmgCdEcU" role="2$L3a6">
<ref role="3cqZAo" node="8odmgCdEcL" resolve="i" />
<node concept="3uNrnE" id="473$26GEHwl" role="1Dwrff">
<node concept="37vLTw" id="473$26GEHwm" role="2$L3a6">
<ref role="3cqZAo" node="473$26GEHwd" resolve="i" />
</node>
</node>
</node>
</node>
<node concept="2AHcQZ" id="473$26GEGuS" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="3clFb_" id="5cnt3vhiq52" role="jymVt">
<property role="1EzhhJ" value="false" />

46
coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
View File

@ -221,6 +221,25 @@
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="3clFb_" id="473$26H5WxC" role="jymVt">
<property role="TrG5h" value="supervisor" />
<node concept="3Tm1VV" id="473$26H5WxD" role="1B3o_S" />
<node concept="3uibUv" id="473$26H5WxF" role="3clF45">
<ref role="3uigEE" to="w7la:~Supervisor" resolve="Supervisor" />
</node>
<node concept="3clFbS" id="473$26H5WxG" role="3clF47">
<node concept="YS8fn" id="473$26H5X1i" role="3cqZAp">
<node concept="2ShNRf" id="473$26H5X1j" role="YScLw">
<node concept="1pGfFk" id="473$26H5X1k" role="2ShVmc">
<ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
</node>
</node>
</node>
</node>
<node concept="2AHcQZ" id="473$26H5WxH" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="3clFb_" id="YbzkzL3h5R" role="jymVt">
<property role="TrG5h" value="ask" />
<node concept="3Tm1VV" id="YbzkzL3h5S" role="1B3o_S" />
@ -527,29 +546,14 @@
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="3clFb_" id="3GEs5q_5NBQ" role="jymVt">
<property role="TrG5h" value="withFeedbackHandler" />
<node concept="3Tm1VV" id="3GEs5q_5NBR" role="1B3o_S" />
<node concept="3uibUv" id="3GEs5q_5NBT" role="3clF45">
<ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
</node>
<node concept="37vLTG" id="3GEs5q_5NBU" role="3clF46">
<property role="TrG5h" value="handler" />
<node concept="3uibUv" id="3GEs5q_5NBV" role="1tU5fm">
<ref role="3uigEE" to="w7la:~EvaluationFeedbackHandler" resolve="EvaluationFeedbackHandler" />
</node>
</node>
<node concept="3clFbS" id="3GEs5q_5NBW" role="3clF47">
<node concept="3clFbF" id="3GEs5q_5NBZ" role="3cqZAp">
<node concept="10Nm6u" id="3GEs5q_5NBY" role="3clFbG" />
</node>
</node>
<node concept="2AHcQZ" id="3GEs5q_5NBX" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="3clFb_" id="YbzkzL3b6d" role="jymVt">
<property role="TrG5h" value="start" />
<node concept="37vLTG" id="473$26H5W7o" role="3clF46">
<property role="TrG5h" value="supervisor" />
<node concept="3uibUv" id="473$26H5WmP" role="1tU5fm">
<ref role="3uigEE" to="w7la:~Supervisor" resolve="Supervisor" />
</node>
</node>
<node concept="3Tm1VV" id="YbzkzL3b6e" role="1B3o_S" />
<node concept="3uibUv" id="YbzkzL3b6g" role="3clF45">
<ref role="3uigEE" to="w7la:~EvaluationResult" resolve="EvaluationResult" />