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

Drop support for HandlingStage. Stages no longer necessary in presence of queries.

This commit is contained in:
Fedor Isakov 2018-06-11 19:15:46 +02:00
parent 4a8e0bd846
commit a58caa24ef
9 changed files with 1483 additions and 3511 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -166,7 +166,6 @@
<child id="6691972578451986151" name="input" index="2t_VXX" />
</concept>
<concept id="8335224865066015764" name="jetbrains.mps.lang.typesystem2.structure.Handler" flags="ng" index="AVZre">
<property id="2316688792951788157" name="stage" index="3J8TDj" />
<child id="1980609059185345194" name="constraint" index="8PkJo" />
<child id="3575255234175157601" name="template" index="1nK1Vg" />
</concept>
@ -706,7 +705,6 @@
</node>
</node>
<node concept="AVZre" id="7lt0LtPOZVe">
<property role="3J8TDj" value="recover" />
<property role="TrG5h" value="Recover" />
<node concept="3AqmO8" id="7lt0LtPOZVl" role="8PkJo">
<property role="TrG5h" value="recover" />

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

@ -50,15 +50,6 @@
<import index="1g4i" ref="r:102178da-67ba-49f6-ba73-eb29fa352fe7(jetbrains.mps.typechecking)" />
</imports>
<registry>
<language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
<concept id="1238852151516" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleType" flags="in" index="1LlUBW">
<child id="1238852204892" name="componentType" index="1Lm7xW" />
</concept>
<concept id="1238857743184" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleMemberAccessExpression" flags="nn" index="1LFfDK">
<child id="1238857764950" name="tuple" index="1LFl5Q" />
<child id="1238857834412" name="index" index="1LF_Uc" />
</concept>
</language>
<language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
<concept id="1211979288880" name="jetbrains.mps.lang.test.structure.AssertMatch" flags="nn" index="JA50E">
<child id="1211979305365" name="before" index="JA92f" />
@ -98,9 +89,6 @@
<child id="1153952416686" name="body" index="2GV8ay" />
<child id="1153952429843" name="finallyBody" index="2GVbov" />
</concept>
<concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
<child id="1154032183016" name="body" index="2LFqv$" />
</concept>
<concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
<child id="1197027771414" name="operand" index="2Oq$k0" />
<child id="1197027833540" name="operation" index="2OqNvi" />
@ -135,7 +123,6 @@
</concept>
<concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
<concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
<concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
<concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
<child id="5680397130376446158" name="type" index="1tU5fm" />
</concept>
@ -190,12 +177,6 @@
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
<child id="1178549979242" name="visibility" index="1B3o_S" />
</concept>
<concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
<child id="1144226360166" name="iterable" index="1DdaDG" />
</concept>
<concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
<child id="1144230900587" name="variable" index="1Duv9x" />
</concept>
<concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
<property id="6329021646629104958" name="text" index="3SKdUp" />
</concept>
@ -1024,69 +1005,54 @@
</node>
</node>
</node>
<node concept="1DcWWT" id="1CcQBrQrTBa" role="3cqZAp">
<node concept="3clFbS" id="1CcQBrQrTBd" role="2LFqv$">
<node concept="3clFbF" id="1CcQBrQrYPT" role="3cqZAp">
<node concept="37vLTI" id="1CcQBrQrYPV" role="3clFbG">
<node concept="37vLTw" id="1CcQBrQrYPZ" role="37vLTJ">
<ref role="3cqZAo" node="6QH_LDtbV6b" resolve="res2" />
</node>
<node concept="2OqwBi" id="1CcQBrQs3mU" role="37vLTx">
<node concept="37vLTw" id="1CcQBrQs3e7" role="2Oq$k0">
<ref role="3cqZAo" node="6QH_LDtbV6b" resolve="res2" />
<node concept="3cpWs8" id="6tPOoeTbYY_" role="3cqZAp">
<node concept="3cpWsn" id="6tPOoeTbYYA" role="3cpWs9">
<property role="TrG5h" value="program" />
<node concept="3uibUv" id="6tPOoeTbYYx" role="1tU5fm">
<ref role="3uigEE" to="av0y:~Program" resolve="Program" />
</node>
<node concept="2OqwBi" id="6tPOoeTbYYB" role="33vP2m">
<node concept="37vLTw" id="6tPOoeTbYYC" role="2Oq$k0">
<ref role="3cqZAo" node="6$7vuu2ugt3" resolve="tplApp" />
</node>
<node concept="liA8E" id="6tPOoeTbYYD" role="2OqNvi">
<ref role="37wK5l" to="hano:3GlpCDSyO$P" resolve="getProgram" />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="1CcQBrQrYPT" role="3cqZAp">
<node concept="37vLTI" id="1CcQBrQrYPV" role="3clFbG">
<node concept="37vLTw" id="1CcQBrQrYPZ" role="37vLTJ">
<ref role="3cqZAo" node="6QH_LDtbV6b" resolve="res2" />
</node>
<node concept="2OqwBi" id="1CcQBrQs3mU" role="37vLTx">
<node concept="37vLTw" id="1CcQBrQs3e7" role="2Oq$k0">
<ref role="3cqZAo" node="6QH_LDtbV6b" resolve="res2" />
</node>
<node concept="liA8E" id="1CcQBrQs3tX" role="2OqNvi">
<ref role="37wK5l" to="hano:7nkyKX7v7xb" resolve="and" />
<node concept="2OqwBi" id="6QH_LDtbV6d" role="37wK5m">
<node concept="37vLTw" id="6QH_LDtbV6e" role="2Oq$k0">
<ref role="3cqZAo" node="6QH_LDtbV5Q" resolve="evaluator" />
</node>
<node concept="liA8E" id="1CcQBrQs3tX" role="2OqNvi">
<ref role="37wK5l" to="hano:7nkyKX7v7xb" resolve="and" />
<node concept="2OqwBi" id="6QH_LDtbV6d" role="37wK5m">
<node concept="37vLTw" id="6QH_LDtbV6e" role="2Oq$k0">
<ref role="3cqZAo" node="6QH_LDtbV5Q" resolve="evaluator" />
</node>
<node concept="liA8E" id="6QH_LDtbV6f" role="2OqNvi">
<ref role="37wK5l" to="hano:HV6urVFrQ9" resolve="eval" />
<node concept="1LFfDK" id="7WKNeR9lNYN" role="37wK5m">
<node concept="3cmrfG" id="7WKNeR9lNYW" role="1LF_Uc">
<property role="3cmrfH" value="0" />
</node>
<node concept="37vLTw" id="7lt0LtQtMIX" role="1LFl5Q">
<ref role="3cqZAo" node="1CcQBrQrTBe" resolve="stage_program" />
</node>
</node>
<node concept="1LFfDK" id="7WKNeR9G7WA" role="37wK5m">
<node concept="3cmrfG" id="7WKNeR9G7WB" role="1LF_Uc">
<property role="3cmrfH" value="1" />
</node>
<node concept="37vLTw" id="7WKNeR9G7WC" role="1LFl5Q">
<ref role="3cqZAo" node="1CcQBrQrTBe" resolve="stage_program" />
</node>
</node>
<node concept="10M0yZ" id="6QH_LDtbV6h" role="37wK5m">
<ref role="1PxDUh" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
<ref role="3cqZAo" to="yg8f:24Vro6cS5rK" resolve="NULL" />
</node>
</node>
<node concept="liA8E" id="6QH_LDtbV6f" role="2OqNvi">
<ref role="37wK5l" to="hano:HV6urVFrQ9" resolve="eval" />
<node concept="Xl_RD" id="6tPOoeTc4db" role="37wK5m">
<property role="Xl_RC" value=".initial" />
</node>
<node concept="37vLTw" id="6tPOoeTc7DG" role="37wK5m">
<ref role="3cqZAo" node="6tPOoeTbYYA" resolve="program" />
</node>
<node concept="10M0yZ" id="6QH_LDtbV6h" role="37wK5m">
<ref role="1PxDUh" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
<ref role="3cqZAo" to="yg8f:24Vro6cS5rK" resolve="NULL" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWsn" id="1CcQBrQrTBe" role="1Duv9x">
<property role="TrG5h" value="stage_program" />
<node concept="1LlUBW" id="7WKNeR9lHxD" role="1tU5fm">
<node concept="17QB3L" id="7WKNeR9lJcK" role="1Lm7xW" />
<node concept="3uibUv" id="7WKNeR9lK4q" role="1Lm7xW">
<ref role="3uigEE" to="av0y:~Program" resolve="Program" />
</node>
</node>
</node>
<node concept="2OqwBi" id="1CcQBrQrTBj" role="1DdaDG">
<node concept="37vLTw" id="1CcQBrQrTBk" role="2Oq$k0">
<ref role="3cqZAo" node="6$7vuu2ugt3" resolve="tplApp" />
</node>
<node concept="liA8E" id="1CcQBrQrTBl" role="2OqNvi">
<ref role="37wK5l" to="hano:3GlpCDSyO$P" resolve="getPrograms" />
</node>
</node>
</node>
<node concept="3vwNmj" id="6$7vuu2uk9h" role="3cqZAp">
<node concept="2OqwBi" id="6$7vuu2uktV" role="3vwVQn">

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

@ -640,14 +640,6 @@
<concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
<concept id="6126991172893676625" name="jetbrains.mps.baseLanguage.collections.structure.ContainsAllOperation" flags="nn" index="BjQpj" />
<concept id="3358009230509553641" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListType" flags="in" index="2BANLN" />
<concept id="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
<child id="1153944400369" name="variable" index="2Gsz3X" />
<child id="1153944424730" name="inputSequence" index="2GsD0m" />
</concept>
<concept id="1153944193378" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariable" flags="nr" index="2GrKxI" />
<concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
<reference id="1153944258490" name="variable" index="2Gs0qQ" />
</concept>
<concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
<concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
<child id="1237721435808" name="initValue" index="HW$Y0" />
@ -26053,13 +26045,8 @@
<ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
<node concept="3qTvmN" id="3IIf9OADXsN" role="11_B2D" />
</node>
<node concept="1LFfDK" id="1CcQBrPeqBv" role="33vP2m">
<node concept="3cmrfG" id="1CcQBrPeqBw" role="1LF_Uc">
<property role="3cmrfH" value="1" />
</node>
<node concept="37vLTw" id="1CcQBrPeqBx" role="1LFl5Q">
<ref role="3cqZAo" node="3YJ7yg2N2M5" resolve="tpl" />
</node>
<node concept="37vLTw" id="6tPOoeTdjBM" role="33vP2m">
<ref role="3cqZAo" node="3YJ7yg2N2M5" resolve="tpl" />
</node>
</node>
</node>
@ -26126,16 +26113,11 @@
</node>
<node concept="3cpWsn" id="3YJ7yg2N2M5" role="1Duv9x">
<property role="TrG5h" value="tpl" />
<node concept="1LlUBW" id="3YJ7yg2N3dO" role="1tU5fm">
<node concept="3uibUv" id="1CcQBrPepNg" role="1Lm7xW">
<ref role="3uigEE" to="hano:1CcQBrPcZVG" resolve="HandlingStage" />
</node>
<node concept="3uibUv" id="1ffsG7c4ezn" role="1Lm7xW">
<ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
<node concept="3qUE_q" id="7XdbJdyRKIf" role="11_B2D">
<node concept="3uibUv" id="7XdbJdyRMGp" role="3qUE_r">
<ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
</node>
<node concept="3uibUv" id="1ffsG7c4ezn" role="1tU5fm">
<ref role="3uigEE" to="i348:1ffsG7bUbCM" resolve="BaseRuleTemplate" />
<node concept="3qUE_q" id="7XdbJdyRKIf" role="11_B2D">
<node concept="3uibUv" id="7XdbJdyRMGp" role="3qUE_r">
<ref role="3uigEE" to="i348:2RRx4MZ6_68" resolve="RuleTemplateToken" />
</node>
</node>
</node>
@ -29220,10 +29202,8 @@
<node concept="3uibUv" id="Hg6EncXnsU" role="1Lm7xW">
<ref role="3uigEE" to="tj24:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
</node>
<node concept="_YKpA" id="4BHjwwGBkzR" role="1Lm7xW">
<node concept="3uibUv" id="4BHjwwGBkzS" role="_ZDj9">
<ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
</node>
<node concept="3uibUv" id="6tPOoeTcJfS" role="1Lm7xW">
<ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
</node>
</node>
</node>
@ -29253,18 +29233,13 @@
<node concept="3clFbH" id="Hg6EncXnu2" role="3cqZAp" />
<node concept="3cpWs8" id="Hg6EncXnu7" role="3cqZAp">
<node concept="3cpWsn" id="Hg6EncXnu8" role="3cpWs9">
<property role="TrG5h" value="stage_programs" />
<node concept="_YKpA" id="Hg6EncXnu9" role="1tU5fm">
<node concept="1LlUBW" id="7WKNeR9lXEL" role="_ZDj9">
<node concept="17QB3L" id="7WKNeR9m1oQ" role="1Lm7xW" />
<node concept="3uibUv" id="7WKNeR9m3mk" role="1Lm7xW">
<ref role="3uigEE" to="av0y:~Program" resolve="Program" />
</node>
</node>
<property role="TrG5h" value="program" />
<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="tj24:6kREIVl0HhM" resolve="getPrograms" />
<ref role="37wK5l" to="tj24:6kREIVl0HhM" resolve="getProgram" />
</node>
<node concept="37vLTw" id="Hg6EncXnud" role="2Oq$k0">
<ref role="3cqZAo" node="Hg6EncXntZ" resolve="prev" />
@ -29272,23 +29247,6 @@
</node>
</node>
</node>
<node concept="3cpWs8" id="4BHjwwG$czY" role="3cqZAp">
<node concept="3cpWsn" id="4BHjwwG$c$1" role="3cpWs9">
<property role="TrG5h" value="traces" />
<node concept="_YKpA" id="4BHjwwG$czU" role="1tU5fm">
<node concept="3uibUv" id="4BHjwwG$e8C" role="_ZDj9">
<ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
</node>
</node>
<node concept="2ShNRf" id="4BHjwwG$hn7" role="33vP2m">
<node concept="Tc6Ow" id="4BHjwwG$heA" role="2ShVmc">
<node concept="3uibUv" id="4BHjwwG$heB" role="HW$YZ">
<ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="4BHjwwGBcqL" role="3cqZAp" />
<node concept="3cpWs8" id="3wxtToE2Oej" role="3cqZAp">
<node concept="3cpWsn" id="3wxtToE2Oek" role="3cpWs9">
@ -29299,161 +29257,131 @@
<node concept="10Nm6u" id="3wxtToE2ZF7" role="33vP2m" />
</node>
</node>
<node concept="2Gpval" id="7WKNeR9m8wE" role="3cqZAp">
<node concept="3clFbS" id="Hg6EncXnuf" role="2LFqv$">
<node concept="3cpWs8" id="Hg6EncXnuj" role="3cqZAp">
<node concept="3cpWsn" id="Hg6EncXnuk" role="3cpWs9">
<property role="TrG5h" value="activationTrace" />
<node concept="3uibUv" id="Hg6EncXnul" role="1tU5fm">
<ref role="3uigEE" node="7nPD14Nbbbe" resolve="TraceComponent" />
</node>
<node concept="2YIFZM" id="Hg6EncXnum" role="33vP2m">
<ref role="1Pybhc" node="7nPD14Nbbbe" resolve="TraceComponent" />
<ref role="37wK5l" node="7nPD14Nboty" resolve="get" />
<node concept="37vLTw" id="443LGHBSKBD" role="37wK5m">
<ref role="3cqZAo" node="443LGHBSGGx" resolve="mpsProject" />
</node>
</node>
<node concept="3cpWs8" id="Hg6EncXnuj" role="3cqZAp">
<node concept="3cpWsn" id="Hg6EncXnuk" role="3cpWs9">
<property role="TrG5h" value="activationTrace" />
<node concept="3uibUv" id="Hg6EncXnul" role="1tU5fm">
<ref role="3uigEE" node="7nPD14Nbbbe" resolve="TraceComponent" />
</node>
<node concept="2YIFZM" id="Hg6EncXnum" role="33vP2m">
<ref role="1Pybhc" node="7nPD14Nbbbe" resolve="TraceComponent" />
<ref role="37wK5l" node="7nPD14Nboty" resolve="get" />
<node concept="37vLTw" id="443LGHBSKBD" role="37wK5m">
<ref role="3cqZAo" node="443LGHBSGGx" resolve="mpsProject" />
</node>
</node>
<node concept="3cpWs8" id="6IQb_Rxph$E" role="3cqZAp">
<node concept="3cpWsn" id="6IQb_Rxph$F" role="3cpWs9">
<property role="TrG5h" value="openedTab" />
<node concept="3uibUv" id="6IQb_Rxph$B" role="1tU5fm">
<ref role="3uigEE" node="5X6ji59z5Fa" resolve="TraceTab" />
</node>
<node concept="2OqwBi" id="6IQb_Rxph$G" role="33vP2m">
<node concept="37vLTw" id="6IQb_Rxph$H" role="2Oq$k0">
<ref role="3cqZAo" node="Hg6EncXnuk" resolve="activationTrace" />
</node>
<node concept="liA8E" id="6IQb_Rxph$I" role="2OqNvi">
<ref role="37wK5l" node="7nPD14Nb$fz" resolve="openTab" />
<node concept="2OqwBi" id="6IQb_Rxph$J" role="37wK5m">
<node concept="1LFfDK" id="7WKNeR9miXX" role="2Oq$k0">
<node concept="3cmrfG" id="7WKNeR9mkiK" role="1LF_Uc">
<property role="3cmrfH" value="1" />
</node>
<node concept="2GrUjf" id="7WKNeR9m8$s" role="1LFl5Q">
<ref role="2Gs0qQ" node="7WKNeR9m8$q" resolve="stage_program" />
</node>
</node>
<node concept="liA8E" id="6IQb_Rxph$L" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Program.name():java.lang.String" resolve="name" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbJ" id="3wxtToE3355" role="3cqZAp">
<node concept="3clFbS" id="3wxtToE3357" role="3clFbx">
<node concept="3clFbF" id="3wxtToE38WG" role="3cqZAp">
<node concept="2OqwBi" id="3wxtToE3c$I" role="3clFbG">
<node concept="37vLTw" id="3wxtToE38WE" role="2Oq$k0">
<ref role="3cqZAo" node="6IQb_Rxph$F" resolve="openedTab" />
</node>
<node concept="liA8E" id="3wxtToE46Do" role="2OqNvi">
<ref role="37wK5l" node="3wxtToE3p8y" resolve="setPreviousTab" />
<node concept="37vLTw" id="3wxtToE4aLH" role="37wK5m">
<ref role="3cqZAo" node="3wxtToE2Oek" resolve="prevTab" />
</node>
</node>
</node>
</node>
</node>
<node concept="3y3z36" id="3wxtToE36KU" role="3clFbw">
<node concept="10Nm6u" id="3wxtToE36Tu" role="3uHU7w" />
<node concept="37vLTw" id="3wxtToE34Wu" role="3uHU7B">
<ref role="3cqZAo" node="3wxtToE2Oek" resolve="prevTab" />
</node>
</node>
</node>
<node concept="3clFbF" id="6IQb_RxS2eX" role="3cqZAp">
<node concept="2OqwBi" id="6IQb_RxS6MS" role="3clFbG">
<node concept="2OqwBi" id="6IQb_RxS3tz" role="2Oq$k0">
<node concept="Xjq3P" id="6IQb_RxS2eV" role="2Oq$k0" />
<node concept="2OwXpG" id="6IQb_RxS4TP" role="2OqNvi">
<ref role="2Oxat5" node="6IQb_RxRUPR" resolve="traceTabs" />
</node>
</node>
<node concept="TSZUe" id="6IQb_RxS8FU" role="2OqNvi">
<node concept="37vLTw" id="6IQb_RxSc3P" role="25WWJ7">
<ref role="3cqZAo" node="6IQb_Rxph$F" resolve="openedTab" />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="6IQb_RxsFCj" role="3cqZAp">
<node concept="2OqwBi" id="6IQb_RxsL_H" role="3clFbG">
<node concept="2OqwBi" id="6IQb_RxsHi8" role="2Oq$k0">
<node concept="Xjq3P" id="6IQb_RxsFCh" role="2Oq$k0" />
<node concept="2OwXpG" id="6IQb_RxsJ8V" role="2OqNvi">
<ref role="2Oxat5" node="6IQb_RxsBvb" resolve="traceTabComponents" />
</node>
</node>
<node concept="TSZUe" id="6IQb_RxsNKt" role="2OqNvi">
<node concept="2OqwBi" id="6IQb_RxRYGQ" role="25WWJ7">
<node concept="37vLTw" id="6IQb_RxsSZ4" role="2Oq$k0">
<ref role="3cqZAo" node="6IQb_Rxph$F" resolve="openedTab" />
</node>
<node concept="liA8E" id="6IQb_RxRZZh" role="2OqNvi">
<ref role="37wK5l" node="5X6ji59z7r_" resolve="getTabComponent" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="4BHjwwG$kvV" role="3cqZAp">
<node concept="2OqwBi" id="4BHjwwG$noo" role="3clFbG">
<node concept="37vLTw" id="4BHjwwG$kvT" role="2Oq$k0">
<ref role="3cqZAo" node="4BHjwwG$c$1" resolve="traces" />
</node>
<node concept="TSZUe" id="4BHjwwG$pAm" role="2OqNvi">
<node concept="2ShNRf" id="443LGHBTehJ" role="25WWJ7">
<node concept="1pGfFk" id="443LGHBTu9d" role="2ShVmc">
<ref role="37wK5l" to="tj24:7nPD14NbIzp" resolve="MultiTrace" />
<node concept="2OqwBi" id="4BHjwwG$rgu" role="37wK5m">
<node concept="37vLTw" id="4BHjwwG$rgv" role="2Oq$k0">
<ref role="3cqZAo" node="6IQb_Rxph$F" resolve="openedTab" />
</node>
<node concept="liA8E" id="4BHjwwG$rgw" role="2OqNvi">
<ref role="37wK5l" node="YGS68MEx_L" resolve="trace" />
</node>
</node>
<node concept="37vLTw" id="443LGHBT_F3" role="37wK5m">
<ref role="3cqZAo" node="3F6vMxqv_px" resolve="msgtrace" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="3wxtToE2UCB" role="3cqZAp">
<node concept="37vLTI" id="3wxtToE2UCD" role="3clFbG">
<node concept="37vLTw" id="3wxtToE2Oel" role="37vLTx">
<ref role="3cqZAo" node="6IQb_Rxph$F" resolve="openedTab" />
</node>
<node concept="37vLTw" id="3wxtToE2UCH" role="37vLTJ">
<ref role="3cqZAo" node="3wxtToE2Oek" resolve="prevTab" />
</node>
</node>
</node>
</node>
<node concept="37vLTw" id="Hg6EncXnuM" role="2GsD0m">
<ref role="3cqZAo" node="Hg6EncXnu8" resolve="stage_programs" />
</node>
<node concept="2GrKxI" id="7WKNeR9m8$q" role="2Gsz3X">
<property role="TrG5h" value="stage_program" />
</node>
</node>
<node concept="3clFbH" id="4BHjwwGBaFZ" role="3cqZAp" />
<node concept="3cpWs8" id="6IQb_Rxph$E" role="3cqZAp">
<node concept="3cpWsn" id="6IQb_Rxph$F" role="3cpWs9">
<property role="TrG5h" value="openedTab" />
<node concept="3uibUv" id="6IQb_Rxph$B" role="1tU5fm">
<ref role="3uigEE" node="5X6ji59z5Fa" resolve="TraceTab" />
</node>
<node concept="2OqwBi" id="6IQb_Rxph$G" role="33vP2m">
<node concept="37vLTw" id="6IQb_Rxph$H" role="2Oq$k0">
<ref role="3cqZAo" node="Hg6EncXnuk" resolve="activationTrace" />
</node>
<node concept="liA8E" id="6IQb_Rxph$I" role="2OqNvi">
<ref role="37wK5l" node="7nPD14Nb$fz" resolve="openTab" />
<node concept="2OqwBi" id="6IQb_Rxph$J" role="37wK5m">
<node concept="37vLTw" id="6tPOoeTcFbx" role="2Oq$k0">
<ref role="3cqZAo" node="Hg6EncXnu8" resolve="program" />
</node>
<node concept="liA8E" id="6IQb_Rxph$L" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Program.name():java.lang.String" resolve="name" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbJ" id="3wxtToE3355" role="3cqZAp">
<node concept="3clFbS" id="3wxtToE3357" role="3clFbx">
<node concept="3clFbF" id="3wxtToE38WG" role="3cqZAp">
<node concept="2OqwBi" id="3wxtToE3c$I" role="3clFbG">
<node concept="37vLTw" id="3wxtToE38WE" role="2Oq$k0">
<ref role="3cqZAo" node="6IQb_Rxph$F" resolve="openedTab" />
</node>
<node concept="liA8E" id="3wxtToE46Do" role="2OqNvi">
<ref role="37wK5l" node="3wxtToE3p8y" resolve="setPreviousTab" />
<node concept="37vLTw" id="3wxtToE4aLH" role="37wK5m">
<ref role="3cqZAo" node="3wxtToE2Oek" resolve="prevTab" />
</node>
</node>
</node>
</node>
</node>
<node concept="3y3z36" id="3wxtToE36KU" role="3clFbw">
<node concept="10Nm6u" id="3wxtToE36Tu" role="3uHU7w" />
<node concept="37vLTw" id="3wxtToE34Wu" role="3uHU7B">
<ref role="3cqZAo" node="3wxtToE2Oek" resolve="prevTab" />
</node>
</node>
</node>
<node concept="3clFbF" id="6IQb_RxS2eX" role="3cqZAp">
<node concept="2OqwBi" id="6IQb_RxS6MS" role="3clFbG">
<node concept="2OqwBi" id="6IQb_RxS3tz" role="2Oq$k0">
<node concept="Xjq3P" id="6IQb_RxS2eV" role="2Oq$k0" />
<node concept="2OwXpG" id="6IQb_RxS4TP" role="2OqNvi">
<ref role="2Oxat5" node="6IQb_RxRUPR" resolve="traceTabs" />
</node>
</node>
<node concept="TSZUe" id="6IQb_RxS8FU" role="2OqNvi">
<node concept="37vLTw" id="6IQb_RxSc3P" role="25WWJ7">
<ref role="3cqZAo" node="6IQb_Rxph$F" resolve="openedTab" />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="6IQb_RxsFCj" role="3cqZAp">
<node concept="2OqwBi" id="6IQb_RxsL_H" role="3clFbG">
<node concept="2OqwBi" id="6IQb_RxsHi8" role="2Oq$k0">
<node concept="Xjq3P" id="6IQb_RxsFCh" role="2Oq$k0" />
<node concept="2OwXpG" id="6IQb_RxsJ8V" role="2OqNvi">
<ref role="2Oxat5" node="6IQb_RxsBvb" resolve="traceTabComponents" />
</node>
</node>
<node concept="TSZUe" id="6IQb_RxsNKt" role="2OqNvi">
<node concept="2OqwBi" id="6IQb_RxRYGQ" role="25WWJ7">
<node concept="37vLTw" id="6IQb_RxsSZ4" role="2Oq$k0">
<ref role="3cqZAo" node="6IQb_Rxph$F" resolve="openedTab" />
</node>
<node concept="liA8E" id="6IQb_RxRZZh" role="2OqNvi">
<ref role="37wK5l" node="5X6ji59z7r_" resolve="getTabComponent" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="6tPOoeTcNvA" role="3cqZAp" />
<node concept="3clFbF" id="Hg6EncXnuO" role="3cqZAp">
<node concept="1Ls8ON" id="Hg6EncXnuP" role="3clFbG">
<node concept="37vLTw" id="Hg6EncXnuQ" role="1Lso8e">
<ref role="3cqZAo" node="Hg6EncXntZ" resolve="prev" />
</node>
<node concept="37vLTw" id="4BHjwwGB9H3" role="1Lso8e">
<ref role="3cqZAo" node="4BHjwwG$c$1" resolve="traces" />
<node concept="1eOMI4" id="6tPOoeTcTIQ" role="1Lso8e">
<node concept="10QFUN" id="6tPOoeTcTIN" role="1eOMHV">
<node concept="3uibUv" id="6tPOoeTcV1_" role="10QFUM">
<ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
</node>
<node concept="2ShNRf" id="6tPOoeTcTIS" role="10QFUP">
<node concept="1pGfFk" id="6tPOoeTcTIT" role="2ShVmc">
<ref role="37wK5l" to="tj24:7nPD14NbIzp" resolve="MultiTrace" />
<node concept="2OqwBi" id="6tPOoeTcTIU" role="37wK5m">
<node concept="37vLTw" id="6tPOoeTcTIV" role="2Oq$k0">
<ref role="3cqZAo" node="6IQb_Rxph$F" resolve="openedTab" />
</node>
<node concept="liA8E" id="6tPOoeTcTIW" role="2OqNvi">
<ref role="37wK5l" node="YGS68MEx_L" resolve="trace" />
</node>
</node>
<node concept="37vLTw" id="6tPOoeTcTIX" role="37wK5m">
<ref role="3cqZAo" node="3F6vMxqv_px" resolve="msgtrace" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>

560
typechecking/solutions/jetbrains.mps.typechecking/models/service.mps
View File

@ -431,24 +431,12 @@
<concept id="7125221305512719026" name="jetbrains.mps.baseLanguage.collections.structure.CollectionType" flags="in" index="3vKaQO" />
<concept id="1208542034276" name="jetbrains.mps.baseLanguage.collections.structure.MapClearOperation" flags="nn" index="1yHZxX" />
<concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
<concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
<concept id="9042586985346099698" name="jetbrains.mps.baseLanguage.collections.structure.MultiForEachStatement" flags="nn" index="1_o_46">
<child id="9042586985346099734" name="forEach" index="1_o_by" />
</concept>
<concept id="9042586985346099733" name="jetbrains.mps.baseLanguage.collections.structure.MultiForEachPair" flags="ng" index="1_o_bx">
<child id="9042586985346099778" name="variable" index="1_o_aQ" />
<child id="9042586985346099735" name="input" index="1_o_bz" />
</concept>
<concept id="9042586985346099736" name="jetbrains.mps.baseLanguage.collections.structure.MultiForEachVariable" flags="ng" index="1_o_bG" />
<concept id="1240824834947" name="jetbrains.mps.baseLanguage.collections.structure.ValueAccessOperation" flags="nn" index="3AV6Ez" />
<concept id="1240825616499" name="jetbrains.mps.baseLanguage.collections.structure.KeyAccessOperation" flags="nn" index="3AY5_j" />
<concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
<child id="1197932505799" name="map" index="3ElQJh" />
<child id="1197932525128" name="key" index="3ElVtu" />
</concept>
<concept id="8293956702609956630" name="jetbrains.mps.baseLanguage.collections.structure.MultiForEachVariableReference" flags="nn" index="3M$PaV">
<reference id="8293956702609966325" name="variable" index="3M$S_o" />
</concept>
<concept id="1522217801069396578" name="jetbrains.mps.baseLanguage.collections.structure.FoldLeftOperation" flags="nn" index="1MD8d$">
<child id="1522217801069421796" name="seed" index="1MDeny" />
</concept>
@ -2241,34 +2229,9 @@
<node concept="37vLTw" id="55Q$YFtJUbX" role="1Lso8e">
<ref role="3cqZAo" node="55Q$YFtJUbS" resolve="prev" />
</node>
<node concept="2OqwBi" id="4BHjwwGAC8l" role="1Lso8e">
<node concept="2OqwBi" id="4BHjwwGAC8m" role="2Oq$k0">
<node concept="2OqwBi" id="4BHjwwGAC8n" role="2Oq$k0">
<node concept="37vLTw" id="4BHjwwGAC8o" role="2Oq$k0">
<ref role="3cqZAo" node="55Q$YFtJUbS" resolve="prev" />
</node>
<node concept="liA8E" id="4BHjwwGAC8p" role="2OqNvi">
<ref role="37wK5l" node="6kREIVl0HhM" resolve="getPrograms" />
</node>
</node>
<node concept="3$u5V9" id="4BHjwwGAC8q" role="2OqNvi">
<node concept="1bVj0M" id="4BHjwwGAC8r" role="23t8la">
<node concept="3clFbS" id="4BHjwwGAC8s" role="1bW5cS">
<node concept="3clFbF" id="4BHjwwGAC8t" role="3cqZAp">
<node concept="10M0yZ" id="4BHjwwGAC8u" role="3clFbG">
<ref role="1PxDUh" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
<ref role="3cqZAo" to="yg8f:24Vro6cS5rK" resolve="NULL" />
</node>
</node>
</node>
<node concept="Rh6nW" id="4BHjwwGAC8v" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="4BHjwwGAC8w" role="1tU5fm" />
</node>
</node>
</node>
</node>
<node concept="ANE8D" id="4BHjwwGAC8x" role="2OqNvi" />
<node concept="10M0yZ" id="6tPOoeTcfZY" role="1Lso8e">
<ref role="1PxDUh" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
<ref role="3cqZAo" to="yg8f:24Vro6cS5rK" resolve="NULL" />
</node>
</node>
</node>
@ -2299,10 +2262,8 @@
<node concept="3uibUv" id="55Q$YFtI23G" role="1Lm7xW">
<ref role="3uigEE" node="1pPth$lAwc0" resolve="ApplyTemplatesStep" />
</node>
<node concept="_YKpA" id="4BHjwwGA78d" role="1Lm7xW">
<node concept="3uibUv" id="4BHjwwGA78e" role="_ZDj9">
<ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
</node>
<node concept="3uibUv" id="6tPOoeTcgU8" role="1Lm7xW">
<ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
</node>
</node>
</node>
@ -2357,12 +2318,7 @@
</node>
<node concept="3cpWs8" id="Hg6Enc9_Rb" role="3cqZAp">
<node concept="3cpWsn" id="Hg6Enc9_Rc" role="3cpWs9">
<property role="TrG5h" value="traces" />
<node concept="_YKpA" id="4BHjwwGAao_" role="1tU5fm">
<node concept="3uibUv" id="4BHjwwGAaoA" role="_ZDj9">
<ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
</node>
</node>
<property role="TrG5h" value="trace" />
<node concept="1LFfDK" id="Hg6Enc9_Rd" role="33vP2m">
<node concept="3cmrfG" id="Hg6Enc9_Re" role="1LF_Uc">
<property role="3cmrfH" value="1" />
@ -2371,6 +2327,9 @@
<ref role="3cqZAo" node="Hg6Enc8tAo" resolve="prev_trace" />
</node>
</node>
<node concept="3uibUv" id="6tPOoeTciTG" role="1tU5fm">
<ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
</node>
</node>
</node>
<node concept="3clFbH" id="Hg6Enc7kMq" role="3cqZAp" />
@ -2619,95 +2578,65 @@
</node>
</node>
<node concept="3clFbH" id="7WKNeR9GfTo" role="3cqZAp" />
<node concept="1_o_46" id="4BHjwwGAILv" role="3cqZAp">
<node concept="1_o_bx" id="4BHjwwGAILx" role="1_o_by">
<node concept="1_o_bG" id="4BHjwwGAILz" role="1_o_aQ">
<property role="TrG5h" value="stage_program" />
<node concept="3cpWs8" id="7WKNeR9AkUc" role="3cqZAp">
<node concept="3cpWsn" id="7WKNeR9AkUd" role="3cpWs9">
<property role="TrG5h" value="stage" />
<property role="3TUv4t" value="true" />
<node concept="17QB3L" id="7WKNeR9AkTR" role="1tU5fm" />
<node concept="Xl_RD" id="6tPOoeTcswg" role="33vP2m">
<property role="Xl_RC" value=".initial" />
</node>
<node concept="2OqwBi" id="4BHjwwGB8a_" role="1_o_bz">
<node concept="liA8E" id="4BHjwwGB8aA" role="2OqNvi">
<ref role="37wK5l" node="6kREIVl0HhM" resolve="getPrograms" />
</node>
<node concept="37vLTw" id="4BHjwwGB8aB" role="2Oq$k0">
</node>
</node>
<node concept="3cpWs8" id="7WKNeR9AoxH" role="3cqZAp">
<node concept="3cpWsn" id="7WKNeR9AoxI" role="3cpWs9">
<property role="TrG5h" value="program" />
<property role="3TUv4t" value="true" />
<node concept="3uibUv" id="7WKNeR9AowU" role="1tU5fm">
<ref role="3uigEE" to="av0y:~Program" resolve="Program" />
</node>
<node concept="2OqwBi" id="6tPOoeTcqr5" role="33vP2m">
<node concept="37vLTw" id="6tPOoeTcp$e" role="2Oq$k0">
<ref role="3cqZAo" node="Hg6Enc9a3G" resolve="prev" />
</node>
</node>
</node>
<node concept="1_o_bx" id="4BHjwwGAPcU" role="1_o_by">
<node concept="1_o_bG" id="4BHjwwGAPcV" role="1_o_aQ">
<property role="TrG5h" value="trace" />
</node>
<node concept="37vLTw" id="4BHjwwGAVzF" role="1_o_bz">
<ref role="3cqZAo" node="Hg6Enc9_Rc" resolve="traces" />
</node>
</node>
<node concept="3clFbS" id="4BHjwwGAILB" role="2LFqv$">
<node concept="3cpWs8" id="7WKNeR9AkUc" role="3cqZAp">
<node concept="3cpWsn" id="7WKNeR9AkUd" role="3cpWs9">
<property role="TrG5h" value="stage" />
<property role="3TUv4t" value="true" />
<node concept="17QB3L" id="7WKNeR9AkTR" role="1tU5fm" />
<node concept="1LFfDK" id="7WKNeR9AkUe" role="33vP2m">
<node concept="3cmrfG" id="7WKNeR9AkUf" role="1LF_Uc">
<property role="3cmrfH" value="0" />
</node>
<node concept="3M$PaV" id="7WKNeR9AkUg" role="1LFl5Q">
<ref role="3M$S_o" node="4BHjwwGAILz" resolve="stage_program" />
</node>
</node>
<node concept="liA8E" id="6tPOoeTcr$$" role="2OqNvi">
<ref role="37wK5l" node="6kREIVl0HhM" resolve="getProgram" />
</node>
</node>
<node concept="3cpWs8" id="7WKNeR9AoxH" role="3cqZAp">
<node concept="3cpWsn" id="7WKNeR9AoxI" role="3cpWs9">
<property role="TrG5h" value="program" />
<property role="3TUv4t" value="true" />
<node concept="3uibUv" id="7WKNeR9AowU" role="1tU5fm">
<ref role="3uigEE" to="av0y:~Program" resolve="Program" />
</node>
<node concept="1LFfDK" id="7WKNeR9AoxJ" role="33vP2m">
<node concept="3cmrfG" id="7WKNeR9AoxK" role="1LF_Uc">
<property role="3cmrfH" value="1" />
</node>
<node concept="3M$PaV" id="7WKNeR9AoxL" role="1LFl5Q">
<ref role="3M$S_o" node="4BHjwwGAILz" resolve="stage_program" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="7WKNeR9AmNV" role="3cqZAp" />
<node concept="3clFbF" id="Hg6Enc7CQd" role="3cqZAp">
<node concept="37vLTI" id="Hg6Enc7CQe" role="3clFbG">
<node concept="37vLTw" id="Hg6Enc7CQf" role="37vLTJ">
<ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
</node>
<node concept="3clFbH" id="7WKNeR9AmNV" role="3cqZAp" />
<node concept="3clFbF" id="Hg6Enc7CQd" role="3cqZAp">
<node concept="37vLTI" id="Hg6Enc7CQe" role="3clFbG">
<node concept="37vLTw" id="Hg6Enc7CQf" role="37vLTJ">
<ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
</node>
<node concept="2OqwBi" id="Hg6Enc7CQg" role="37vLTx">
<node concept="37vLTw" id="Hg6Enc7CQh" role="2Oq$k0">
<ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
<node concept="2OqwBi" id="Hg6Enc7CQg" role="37vLTx">
<node concept="37vLTw" id="Hg6Enc7CQh" role="2Oq$k0">
<ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
</node>
<node concept="liA8E" id="Hg6Enc7CQi" role="2OqNvi">
<ref role="37wK5l" to="hano:7nkyKX7v7xb" resolve="and" />
<node concept="2OqwBi" id="Hg6Enc7CQj" role="37wK5m">
<node concept="37vLTw" id="Hg6Enc7CQk" role="2Oq$k0">
<ref role="3cqZAo" node="Hg6Enc7CPL" resolve="progEval" />
</node>
<node concept="liA8E" id="Hg6Enc7CQi" role="2OqNvi">
<ref role="37wK5l" to="hano:7nkyKX7v7xb" resolve="and" />
<node concept="2OqwBi" id="Hg6Enc7CQj" role="37wK5m">
<node concept="37vLTw" id="Hg6Enc7CQk" role="2Oq$k0">
<ref role="3cqZAo" node="Hg6Enc7CPL" resolve="progEval" />
</node>
<node concept="liA8E" id="Hg6Enc7CQl" role="2OqNvi">
<ref role="37wK5l" to="hano:HV6urVFrQ9" resolve="eval" />
<node concept="37vLTw" id="7WKNeR9GipL" role="37wK5m">
<ref role="3cqZAo" node="7WKNeR9AkUd" resolve="stage" />
<node concept="liA8E" id="Hg6Enc7CQl" role="2OqNvi">
<ref role="37wK5l" to="hano:HV6urVFrQ9" resolve="eval" />
<node concept="37vLTw" id="7WKNeR9GipL" role="37wK5m">
<ref role="3cqZAo" node="7WKNeR9AkUd" resolve="stage" />
</node>
<node concept="37vLTw" id="7WKNeR9AoxM" role="37wK5m">
<ref role="3cqZAo" node="7WKNeR9AoxI" resolve="program" />
</node>
<node concept="2ShNRf" id="7WKNeR9Gjbf" role="37wK5m">
<node concept="1pGfFk" id="7WKNeR9Gjbg" role="2ShVmc">
<ref role="37wK5l" node="7nPD14NbIzp" resolve="MultiTrace" />
<node concept="37vLTw" id="6tPOoeTco$P" role="37wK5m">
<ref role="3cqZAo" node="Hg6Enc9_Rc" resolve="trace" />
</node>
<node concept="37vLTw" id="7WKNeR9AoxM" role="37wK5m">
<ref role="3cqZAo" node="7WKNeR9AoxI" resolve="program" />
</node>
<node concept="2ShNRf" id="7WKNeR9Gjbf" role="37wK5m">
<node concept="1pGfFk" id="7WKNeR9Gjbg" role="2ShVmc">
<ref role="37wK5l" node="7nPD14NbIzp" resolve="MultiTrace" />
<node concept="3M$PaV" id="7WKNeR9Gjbh" role="37wK5m">
<ref role="3M$S_o" node="4BHjwwGAPcV" resolve="trace" />
</node>
<node concept="1rXfSq" id="7WKNeR9Gjbi" role="37wK5m">
<ref role="37wK5l" node="6kREIVky9Kx" resolve="timeout" />
</node>
</node>
<node concept="1rXfSq" id="7WKNeR9Gjbi" role="37wK5m">
<ref role="37wK5l" node="6kREIVky9Kx" resolve="timeout" />
</node>
</node>
</node>
@ -2715,192 +2644,192 @@
</node>
</node>
</node>
<node concept="3clFbH" id="Hg6Enc7CQo" role="3cqZAp" />
<node concept="3clFbJ" id="Hg6Enc7CQp" role="3cqZAp">
<node concept="2OqwBi" id="Hg6Enc7CQr" role="3clFbw">
<node concept="37vLTw" id="Hg6Enc7CQs" role="2Oq$k0">
<ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
</node>
<node concept="liA8E" id="Hg6Enc7CQt" role="2OqNvi">
<ref role="37wK5l" to="hano:7Oc59RS_hsj" resolve="isSuccessful" />
</node>
</node>
<node concept="3clFbS" id="7WKNeR9zVo8" role="3clFbx">
<node concept="3clFbJ" id="7WKNeR9$rEF" role="3cqZAp">
<node concept="3clFbS" id="7WKNeR9$rEG" role="3clFbx">
<node concept="3clFbF" id="7WKNeR9$Mkw" role="3cqZAp">
<node concept="2OqwBi" id="7WKNeR9$N7D" role="3clFbG">
<node concept="2OqwBi" id="7WKNeR9_x9U" role="2Oq$k0">
<node concept="37vLTw" id="7WKNeR9_qKx" role="2Oq$k0">
<ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
</node>
<node concept="liA8E" id="7WKNeR9_ybk" role="2OqNvi">
<ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
</node>
</node>
<node concept="liA8E" id="7WKNeR9$NVL" role="2OqNvi">
<ref role="37wK5l" to="i348:7P_FdVQ_jFm" resolve="onNext" />
<node concept="37vLTw" id="7WKNeR9AuTl" role="37wK5m">
<ref role="3cqZAo" node="7WKNeR9AkUd" resolve="stage" />
</node>
<node concept="2OqwBi" id="7WKNeR9$Y1M" role="37wK5m">
<node concept="37vLTw" id="7WKNeR9$Xd$" role="2Oq$k0">
<ref role="3cqZAo" node="Hg6Enc7CPL" resolve="progEval" />
</node>
<node concept="liA8E" id="7WKNeR9$YSO" role="2OqNvi">
<ref role="37wK5l" to="hano:5cnt3vh3pb_" resolve="storeView" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3y3z36" id="7WKNeR9$rEM" role="3clFbw">
<node concept="10Nm6u" id="7WKNeR9$rEN" role="3uHU7w" />
<node concept="2OqwBi" id="7WKNeR9_vhW" role="3uHU7B">
<node concept="37vLTw" id="7WKNeR9_um5" role="2Oq$k0">
</node>
</node>
<node concept="3clFbH" id="Hg6Enc7CQo" role="3cqZAp" />
<node concept="3clFbJ" id="Hg6Enc7CQp" role="3cqZAp">
<node concept="2OqwBi" id="Hg6Enc7CQr" role="3clFbw">
<node concept="37vLTw" id="Hg6Enc7CQs" role="2Oq$k0">
<ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
</node>
<node concept="liA8E" id="Hg6Enc7CQt" role="2OqNvi">
<ref role="37wK5l" to="hano:7Oc59RS_hsj" resolve="isSuccessful" />
</node>
</node>
<node concept="3clFbS" id="7WKNeR9zVo8" role="3clFbx">
<node concept="3clFbJ" id="7WKNeR9$rEF" role="3cqZAp">
<node concept="3clFbS" id="7WKNeR9$rEG" role="3clFbx">
<node concept="3clFbF" id="7WKNeR9$Mkw" role="3cqZAp">
<node concept="2OqwBi" id="7WKNeR9$N7D" role="3clFbG">
<node concept="2OqwBi" id="7WKNeR9_x9U" role="2Oq$k0">
<node concept="37vLTw" id="7WKNeR9_qKx" role="2Oq$k0">
<ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
</node>
<node concept="liA8E" id="7WKNeR9_waj" role="2OqNvi">
<node concept="liA8E" id="7WKNeR9_ybk" role="2OqNvi">
<ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
</node>
</node>
<node concept="liA8E" id="7WKNeR9$NVL" role="2OqNvi">
<ref role="37wK5l" to="i348:7P_FdVQ_jFm" resolve="onNext" />
<node concept="37vLTw" id="7WKNeR9AuTl" role="37wK5m">
<ref role="3cqZAo" node="7WKNeR9AkUd" resolve="stage" />
</node>
<node concept="2OqwBi" id="7WKNeR9$Y1M" role="37wK5m">
<node concept="37vLTw" id="7WKNeR9$Xd$" role="2Oq$k0">
<ref role="3cqZAo" node="Hg6Enc7CPL" resolve="progEval" />
</node>
<node concept="liA8E" id="7WKNeR9$YSO" role="2OqNvi">
<ref role="37wK5l" to="hano:5cnt3vh3pb_" resolve="storeView" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="7WKNeR9zZA8" role="3cqZAp" />
</node>
<node concept="9aQIb" id="7WKNeR9zW7_" role="9aQIa">
<node concept="3clFbS" id="Hg6Enc7CQu" role="9aQI4">
<node concept="3cpWs8" id="19wqdqOkjca" role="3cqZAp">
<node concept="3cpWsn" id="19wqdqOkjcb" role="3cpWs9">
<property role="TrG5h" value="ex" />
<node concept="3uibUv" id="19wqdqOkjc9" role="1tU5fm">
<ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
</node>
<node concept="2EnYce" id="19wqdqOszQK" role="33vP2m">
<node concept="2OqwBi" id="19wqdqOkjcd" role="2Oq$k0">
<node concept="1eOMI4" id="19wqdqOkjce" role="2Oq$k0">
<node concept="10QFUN" id="19wqdqOkjcf" role="1eOMHV">
<node concept="A3Dl8" id="19wqdqOkjcg" role="10QFUM">
<node concept="3uibUv" id="19wqdqOkjch" role="A3Ik2">
<ref role="3uigEE" to="hano:6i42QSs$lgC" resolve="Result.ReportedError" />
</node>
</node>
<node concept="2OqwBi" id="19wqdqOkjci" role="10QFUP">
<node concept="37vLTw" id="19wqdqOkjcj" role="2Oq$k0">
<ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
</node>
<node concept="liA8E" id="19wqdqOkjck" role="2OqNvi">
<ref role="37wK5l" to="hano:7Oc59RSEnG3" resolve="errors" />
</node>
</node>
<node concept="3y3z36" id="7WKNeR9$rEM" role="3clFbw">
<node concept="10Nm6u" id="7WKNeR9$rEN" role="3uHU7w" />
<node concept="2OqwBi" id="7WKNeR9_vhW" role="3uHU7B">
<node concept="37vLTw" id="7WKNeR9_um5" role="2Oq$k0">
<ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
</node>
<node concept="liA8E" id="7WKNeR9_waj" role="2OqNvi">
<ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="7WKNeR9zZA8" role="3cqZAp" />
</node>
<node concept="9aQIb" id="7WKNeR9zW7_" role="9aQIa">
<node concept="3clFbS" id="Hg6Enc7CQu" role="9aQI4">
<node concept="3cpWs8" id="19wqdqOkjca" role="3cqZAp">
<node concept="3cpWsn" id="19wqdqOkjcb" role="3cpWs9">
<property role="TrG5h" value="ex" />
<node concept="3uibUv" id="19wqdqOkjc9" role="1tU5fm">
<ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
</node>
<node concept="2EnYce" id="19wqdqOszQK" role="33vP2m">
<node concept="2OqwBi" id="19wqdqOkjcd" role="2Oq$k0">
<node concept="1eOMI4" id="19wqdqOkjce" role="2Oq$k0">
<node concept="10QFUN" id="19wqdqOkjcf" role="1eOMHV">
<node concept="A3Dl8" id="19wqdqOkjcg" role="10QFUM">
<node concept="3uibUv" id="19wqdqOkjch" role="A3Ik2">
<ref role="3uigEE" to="hano:6i42QSs$lgC" resolve="Result.ReportedError" />
</node>
</node>
<node concept="1z4cxt" id="19wqdqOkjcl" role="2OqNvi">
<node concept="1bVj0M" id="19wqdqOkjcm" role="23t8la">
<node concept="3clFbS" id="19wqdqOkjcn" role="1bW5cS">
<node concept="3clFbF" id="19wqdqOkjco" role="3cqZAp">
<node concept="1Wc70l" id="19wqdqOs4QT" role="3clFbG">
<node concept="3y3z36" id="19wqdqOs6wx" role="3uHU7B">
<node concept="10Nm6u" id="19wqdqOs7ae" role="3uHU7w" />
<node concept="37vLTw" id="19wqdqOs5Mh" role="3uHU7B">
<ref role="3cqZAo" node="19wqdqOkjcu" resolve="it" />
</node>
<node concept="2OqwBi" id="19wqdqOkjci" role="10QFUP">
<node concept="37vLTw" id="19wqdqOkjcj" role="2Oq$k0">
<ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
</node>
<node concept="liA8E" id="19wqdqOkjck" role="2OqNvi">
<ref role="37wK5l" to="hano:7Oc59RSEnG3" resolve="errors" />
</node>
</node>
</node>
</node>
<node concept="1z4cxt" id="19wqdqOkjcl" role="2OqNvi">
<node concept="1bVj0M" id="19wqdqOkjcm" role="23t8la">
<node concept="3clFbS" id="19wqdqOkjcn" role="1bW5cS">
<node concept="3clFbF" id="19wqdqOkjco" role="3cqZAp">
<node concept="1Wc70l" id="19wqdqOs4QT" role="3clFbG">
<node concept="3y3z36" id="19wqdqOs6wx" role="3uHU7B">
<node concept="10Nm6u" id="19wqdqOs7ae" role="3uHU7w" />
<node concept="37vLTw" id="19wqdqOs5Mh" role="3uHU7B">
<ref role="3cqZAo" node="19wqdqOkjcu" resolve="it" />
</node>
</node>
<node concept="3y3z36" id="19wqdqOkjcp" role="3uHU7w">
<node concept="10Nm6u" id="19wqdqOkjcq" role="3uHU7w" />
<node concept="2OqwBi" id="19wqdqOkjcr" role="3uHU7B">
<node concept="37vLTw" id="19wqdqOkjcs" role="2Oq$k0">
<ref role="3cqZAo" node="19wqdqOkjcu" resolve="it" />
</node>
<node concept="3y3z36" id="19wqdqOkjcp" role="3uHU7w">
<node concept="10Nm6u" id="19wqdqOkjcq" role="3uHU7w" />
<node concept="2OqwBi" id="19wqdqOkjcr" role="3uHU7B">
<node concept="37vLTw" id="19wqdqOkjcs" role="2Oq$k0">
<ref role="3cqZAo" node="19wqdqOkjcu" resolve="it" />
</node>
<node concept="liA8E" id="19wqdqOkjct" role="2OqNvi">
<ref role="37wK5l" to="hano:6i42QSs$lhc" resolve="exception" />
</node>
</node>
<node concept="liA8E" id="19wqdqOkjct" role="2OqNvi">
<ref role="37wK5l" to="hano:6i42QSs$lhc" resolve="exception" />
</node>
</node>
</node>
</node>
<node concept="Rh6nW" id="19wqdqOkjcu" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="19wqdqOkjcv" role="1tU5fm" />
</node>
</node>
</node>
</node>
<node concept="liA8E" id="19wqdqOs$W0" role="2OqNvi">
<ref role="37wK5l" to="hano:6i42QSs$lhc" resolve="exception" />
<node concept="Rh6nW" id="19wqdqOkjcu" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="19wqdqOkjcv" role="1tU5fm" />
</node>
</node>
</node>
</node>
<node concept="liA8E" id="19wqdqOs$W0" role="2OqNvi">
<ref role="37wK5l" to="hano:6i42QSs$lhc" resolve="exception" />
</node>
</node>
<node concept="3clFbJ" id="7WKNeR9$11B" role="3cqZAp">
<node concept="3clFbS" id="7WKNeR9$11D" role="3clFbx">
<node concept="3clFbF" id="7WKNeR9$kQ6" role="3cqZAp">
<node concept="2OqwBi" id="7WKNeR9$lHy" role="3clFbG">
<node concept="2OqwBi" id="7WKNeR9_BAK" role="2Oq$k0">
<node concept="37vLTw" id="7WKNeR9_AAA" role="2Oq$k0">
<ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
</node>
<node concept="liA8E" id="7WKNeR9_Cwm" role="2OqNvi">
<ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
</node>
</node>
<node concept="liA8E" id="7WKNeR9$mx1" role="2OqNvi">
<ref role="37wK5l" to="i348:7P_FdVQ_jU$" resolve="onFailure" />
<node concept="37vLTw" id="7WKNeR9$o3_" role="37wK5m">
<ref role="3cqZAo" node="19wqdqOkjcb" resolve="ex" />
</node>
</node>
</node>
</node>
</node>
<node concept="3y3z36" id="7WKNeR9$jSU" role="3clFbw">
<node concept="10Nm6u" id="7WKNeR9$jXg" role="3uHU7w" />
<node concept="2OqwBi" id="7WKNeR9_$Ih" role="3uHU7B">
<node concept="37vLTw" id="7WKNeR9_zLu" role="2Oq$k0">
</node>
</node>
<node concept="3clFbJ" id="7WKNeR9$11B" role="3cqZAp">
<node concept="3clFbS" id="7WKNeR9$11D" role="3clFbx">
<node concept="3clFbF" id="7WKNeR9$kQ6" role="3cqZAp">
<node concept="2OqwBi" id="7WKNeR9$lHy" role="3clFbG">
<node concept="2OqwBi" id="7WKNeR9_BAK" role="2Oq$k0">
<node concept="37vLTw" id="7WKNeR9_AAA" role="2Oq$k0">
<ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
</node>
<node concept="liA8E" id="7WKNeR9__Ke" role="2OqNvi">
<node concept="liA8E" id="7WKNeR9_Cwm" role="2OqNvi">
<ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
</node>
</node>
<node concept="liA8E" id="7WKNeR9$mx1" role="2OqNvi">
<ref role="37wK5l" to="i348:7P_FdVQ_jU$" resolve="onFailure" />
<node concept="37vLTw" id="7WKNeR9$o3_" role="37wK5m">
<ref role="3cqZAo" node="19wqdqOkjcb" resolve="ex" />
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="7WKNeR9$0ha" role="3cqZAp" />
<node concept="YS8fn" id="6kREIVkirxV" role="3cqZAp">
<node concept="2ShNRf" id="6kREIVkitlD" role="YScLw">
<node concept="1pGfFk" id="6kREIVkix5J" role="2ShVmc">
<ref role="37wK5l" node="6kREIVkwjAo" resolve="ResumeNextStepException" />
<node concept="2OqwBi" id="6kREIVkwoyV" role="37wK5m">
<node concept="37vLTw" id="6kREIVkwoyW" role="2Oq$k0">
<ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
</node>
<node concept="3y3z36" id="7WKNeR9$jSU" role="3clFbw">
<node concept="10Nm6u" id="7WKNeR9$jXg" role="3uHU7w" />
<node concept="2OqwBi" id="7WKNeR9_$Ih" role="3uHU7B">
<node concept="37vLTw" id="7WKNeR9_zLu" role="2Oq$k0">
<ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
</node>
<node concept="liA8E" id="7WKNeR9__Ke" role="2OqNvi">
<ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="7WKNeR9$0ha" role="3cqZAp" />
<node concept="YS8fn" id="6kREIVkirxV" role="3cqZAp">
<node concept="2ShNRf" id="6kREIVkitlD" role="YScLw">
<node concept="1pGfFk" id="6kREIVkix5J" role="2ShVmc">
<ref role="37wK5l" node="6kREIVkwjAo" resolve="ResumeNextStepException" />
<node concept="2OqwBi" id="6kREIVkwoyV" role="37wK5m">
<node concept="37vLTw" id="6kREIVkwoyW" role="2Oq$k0">
<ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
</node>
<node concept="liA8E" id="6kREIVkwoyX" role="2OqNvi">
<ref role="37wK5l" to="hano:6i42QSsna8j" resolve="message" />
</node>
</node>
<node concept="Xjq3P" id="6kREIVkiCK$" role="37wK5m" />
<node concept="2ShNRf" id="4BHjwwGKNNn" role="37wK5m">
<node concept="1pGfFk" id="4BHjwwGKP9i" role="2ShVmc">
<ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String,java.lang.Throwable)" resolve="RuntimeException" />
<node concept="3cpWs3" id="4BHjwwGKTpz" role="37wK5m">
<node concept="Xl_RD" id="4BHjwwGKU2M" role="3uHU7B">
<property role="Xl_RC" value="Failure evaluating rules: " />
</node>
<node concept="liA8E" id="6kREIVkwoyX" role="2OqNvi">
<ref role="37wK5l" to="hano:6i42QSsna8j" resolve="message" />
<node concept="2OqwBi" id="4BHjwwGKQQi" role="3uHU7w">
<node concept="37vLTw" id="4BHjwwGKQb5" role="2Oq$k0">
<ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
</node>
<node concept="liA8E" id="4BHjwwGKR$K" role="2OqNvi">
<ref role="37wK5l" to="hano:6i42QSsna8j" resolve="message" />
</node>
</node>
</node>
<node concept="Xjq3P" id="6kREIVkiCK$" role="37wK5m" />
<node concept="2ShNRf" id="4BHjwwGKNNn" role="37wK5m">
<node concept="1pGfFk" id="4BHjwwGKP9i" role="2ShVmc">
<ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String,java.lang.Throwable)" resolve="RuntimeException" />
<node concept="3cpWs3" id="4BHjwwGKTpz" role="37wK5m">
<node concept="Xl_RD" id="4BHjwwGKU2M" role="3uHU7B">
<property role="Xl_RC" value="Failure evaluating rules: " />
</node>
<node concept="2OqwBi" id="4BHjwwGKQQi" role="3uHU7w">
<node concept="37vLTw" id="4BHjwwGKQb5" role="2Oq$k0">
<ref role="3cqZAo" node="Hg6Enc7CPS" resolve="result" />
</node>
<node concept="liA8E" id="4BHjwwGKR$K" role="2OqNvi">
<ref role="37wK5l" to="hano:6i42QSsna8j" resolve="message" />
</node>
</node>
</node>
<node concept="37vLTw" id="19wqdqOklYq" role="37wK5m">
<ref role="3cqZAo" node="19wqdqOkjcb" resolve="ex" />
</node>
</node>
<node concept="37vLTw" id="19wqdqOklYq" role="37wK5m">
<ref role="3cqZAo" node="19wqdqOkjcb" resolve="ex" />
</node>
</node>
</node>
@ -2908,28 +2837,28 @@
</node>
</node>
</node>
<node concept="3clFbH" id="7WKNeR9zC9b" role="3cqZAp" />
<node concept="3SKdUt" id="7WKNeR9zDBE" role="3cqZAp">
<node concept="3SKdUq" id="7WKNeR9zDBG" role="3SKWNk">
<property role="3SKdUp" value="the store view after the last successful stage evaluation" />
</node>
</node>
<node concept="3clFbH" id="7WKNeR9zC9b" role="3cqZAp" />
<node concept="3SKdUt" id="7WKNeR9zDBE" role="3cqZAp">
<node concept="3SKdUq" id="7WKNeR9zDBG" role="3SKWNk">
<property role="3SKdUp" value="the store view after the last successful stage evaluation" />
</node>
</node>
<node concept="3clFbF" id="Hg6Enc7CQZ" role="3cqZAp">
<node concept="37vLTI" id="Hg6Enc7CR0" role="3clFbG">
<node concept="2OqwBi" id="Hg6Enc7CR1" role="37vLTJ">
<node concept="Xjq3P" id="Hg6Enc7CR2" role="2Oq$k0" />
<node concept="2OwXpG" id="Hg6Enc7CR3" role="2OqNvi">
<ref role="2Oxat5" node="1CcQBrQoJoP" resolve="storeView" />
</node>
</node>
<node concept="3clFbF" id="Hg6Enc7CQZ" role="3cqZAp">
<node concept="37vLTI" id="Hg6Enc7CR0" role="3clFbG">
<node concept="2OqwBi" id="Hg6Enc7CR1" role="37vLTJ">
<node concept="Xjq3P" id="Hg6Enc7CR2" role="2Oq$k0" />
<node concept="2OwXpG" id="Hg6Enc7CR3" role="2OqNvi">
<ref role="2Oxat5" node="1CcQBrQoJoP" resolve="storeView" />
</node>
</node>
<node concept="2OqwBi" id="Hg6Enc7CR4" role="37vLTx">
<node concept="37vLTw" id="Hg6Enc7CR5" role="2Oq$k0">
<ref role="3cqZAo" node="Hg6Enc7CPL" resolve="progEval" />
</node>
<node concept="liA8E" id="Hg6Enc7CR6" role="2OqNvi">
<ref role="37wK5l" to="hano:5cnt3vh3pb_" resolve="storeView" />
</node>
</node>
<node concept="2OqwBi" id="Hg6Enc7CR4" role="37vLTx">
<node concept="37vLTw" id="Hg6Enc7CR5" role="2Oq$k0">
<ref role="3cqZAo" node="Hg6Enc7CPL" resolve="progEval" />
</node>
<node concept="liA8E" id="Hg6Enc7CR6" role="2OqNvi">
<ref role="37wK5l" to="hano:5cnt3vh3pb_" resolve="storeView" />
</node>
</node>
</node>
@ -2989,10 +2918,8 @@
<node concept="3uibUv" id="Hg6Enc8A8x" role="1Lm7xW">
<ref role="3uigEE" node="1pPth$lAwc0" resolve="ApplyTemplatesStep" />
</node>
<node concept="_YKpA" id="4BHjwwGA9fg" role="1Lm7xW">
<node concept="3uibUv" id="4BHjwwGA9fh" role="_ZDj9">
<ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
</node>
<node concept="3uibUv" id="4BHjwwGA78e" role="1Lm7xW">
<ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
</node>
</node>
</node>
@ -4011,14 +3938,9 @@
</node>
<node concept="2tJIrI" id="20Ay2VeQP0v" role="jymVt" />
<node concept="3clFb_" id="6kREIVl0HhM" role="jymVt">
<property role="TrG5h" value="getPrograms" />
<node concept="_YKpA" id="6kREIVl0HhN" role="3clF45">
<node concept="1LlUBW" id="7WKNeR9lnVH" role="_ZDj9">
<node concept="17QB3L" id="7WKNeR9loeH" role="1Lm7xW" />
<node concept="3uibUv" id="7WKNeR9look" role="1Lm7xW">
<ref role="3uigEE" to="av0y:~Program" resolve="Program" />
</node>
</node>
<property role="TrG5h" value="getProgram" />
<node concept="3uibUv" id="6tPOoeTcatz" role="3clF45">
<ref role="3uigEE" to="av0y:~Program" resolve="Program" />
</node>
<node concept="3Tm1VV" id="6kREIVl0HhP" role="1B3o_S" />
<node concept="3clFbS" id="6kREIVl0HhQ" role="3clF47">
@ -4028,7 +3950,7 @@
<ref role="3cqZAo" node="3GlpCDSzA$E" resolve="programProducer" />
</node>
<node concept="liA8E" id="4QPCta1h7Ts" role="2OqNvi">
<ref role="37wK5l" to="hano:3GlpCDSyO$P" resolve="getPrograms" />
<ref role="37wK5l" to="hano:3GlpCDSyO$P" resolve="getProgram" />
</node>
</node>
</node>

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

File diff suppressed because it is too large Load Diff

31
typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
View File

@ -232,7 +232,6 @@
<property id="1214560368769" name="emptyNoTargetText" index="39s7Ar" />
<property id="1139852716018" name="noTargetText" index="1$x2rV" />
<property id="1140017977771" name="readOnly" index="1Intyy" />
<property id="1140114345053" name="allowEmptyText" index="1O74Pk" />
<reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
</concept>
<concept id="7667708318090725848" name="jetbrains.mps.lang.editor.structure.IndentLayoutIndentAnchorStyleClassItem" flags="ln" index="1Bsynf" />
@ -1123,19 +1122,6 @@
<node concept="24kQdi" id="6p0DfM0dr8L">
<ref role="1XX52x" to="wq2x:7eGEHDlgPKk" resolve="Handler" />
<node concept="3EZMnI" id="6p0DfM0drav" role="2wV5jI">
<node concept="3F0ifn" id="1HWyn8jLJSL" role="3EZMnx">
<property role="3F0ifm" value="(" />
<ref role="1k5W1q" to="tpen:hFCSAw$" resolve="LeftParen" />
</node>
<node concept="3F0A7n" id="20Ay2Vf2Tqw" role="3EZMnx">
<property role="1$x2rV" value="initial" />
<property role="1O74Pk" value="true" />
<ref role="1NtTu8" to="wq2x:20Ay2Vf1h9X" resolve="stage" />
</node>
<node concept="3F0ifn" id="1HWyn8jLK3W" role="3EZMnx">
<property role="3F0ifm" value=")" />
<ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
</node>
<node concept="PMmxH" id="6p0DfM0drif" role="3EZMnx">
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
<ref role="1k5W1q" to="zer4:4aJUH_hW38r" resolve="RuleKeyword" />
@ -6785,23 +6771,6 @@
<property role="3GE5qa" value="query" />
<ref role="1XX52x" to="wq2x:7P_FdVQ_S6B" resolve="QueryTemplate" />
<node concept="3EZMnI" id="7P_FdVQ_S6R" role="2wV5jI">
<node concept="3F0ifn" id="2BZXJecJG8q" role="3EZMnx">
<property role="3F0ifm" value="(" />
<node concept="11LMrY" id="2BZXJecKocH" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
<node concept="3F0A7n" id="6OXbTD$fGKx" role="3EZMnx">
<property role="1$x2rV" value="initial" />
<property role="1O74Pk" value="true" />
<ref role="1NtTu8" to="wq2x:6OXbTD$fGCg" resolve="stage" />
</node>
<node concept="3F0ifn" id="2BZXJecJG9E" role="3EZMnx">
<property role="3F0ifm" value=")" />
<node concept="11L4FC" id="2BZXJecKocJ" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
<node concept="3F0A7n" id="7P_FdVQ_S77" role="3EZMnx">
<ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
<node concept="ljvvj" id="2BZXJecJGb_" role="3F10Kt">

13
typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
View File

@ -89,12 +89,6 @@
<property role="20kJfa" value="extends" />
<ref role="20lvS9" node="7eGEHDlgPKk" resolve="Handler" />
</node>
<node concept="1TJgyi" id="20Ay2Vf1h9X" role="1TKVEl">
<property role="IQ2nx" value="2316688792951788157" />
<property role="TrG5h" value="stage" />
<ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
<node concept="asaX9" id="6tPOoeT2Eq$" role="lGtFl" />
</node>
<node concept="1TJgyj" id="6p0DfM0bRQj" role="1TKVEi">
<property role="20lmBu" value="aggregation" />
<property role="20kJfa" value="rule" />
@ -1612,12 +1606,6 @@
<property role="TrG5h" value="QueryTemplate" />
<property role="3GE5qa" value="query" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="1TJgyi" id="6OXbTD$fGCg" role="1TKVEl">
<property role="IQ2nx" value="7871500063866800656" />
<property role="TrG5h" value="stage" />
<ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
<node concept="asaX9" id="6tPOoeT2O6f" role="lGtFl" />
</node>
<node concept="1TJgyj" id="6OXbTDyyU9U" role="1TKVEi">
<property role="IQ2ns" value="7871500063838282362" />
<property role="20lmBu" value="aggregation" />
@ -1665,6 +1653,7 @@
<property role="20kJfa" value="queryStage" />
<property role="20lbJX" value="0..n" />
<ref role="20lvS9" node="7P_FdVQ_S6B" resolve="QueryTemplate" />
<node concept="asaX9" id="6tPOoeT5KFi" role="lGtFl" />
</node>
<node concept="1TJgyj" id="2BZXJecNeMM" role="1TKVEi">
<property role="IQ2ns" value="3026409000515988658" />

2230
typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains.mps.lang.typesystem2.evaluation.mps
View File

File diff suppressed because it is too large Load Diff

163
typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.rule.mps
View File

@ -1690,18 +1690,6 @@
<node concept="3clFbS" id="7P_FdVQoGPx" role="3clF47" />
</node>
<node concept="2tJIrI" id="7P_FdVQoNeh" role="jymVt" />
<node concept="3clFb_" id="20Ay2Vf1i5R" role="jymVt">
<property role="1EzhhJ" value="true" />
<property role="2aFKle" value="false" />
<property role="TrG5h" value="stage" />
<node concept="3clFbS" id="20Ay2Vf1i5U" role="3clF47" />
<node concept="3Tm1VV" id="20Ay2Vf1i5V" role="1B3o_S" />
<node concept="17QB3L" id="20Ay2Vf1hOi" role="3clF45" />
<node concept="2AHcQZ" id="6tPOoeT2Lyf" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
</node>
</node>
<node concept="2tJIrI" id="20Ay2Vf1hyH" role="jymVt" />
<node concept="3clFb_" id="4MqhgXU9lmo" role="jymVt">
<property role="1EzhhJ" value="true" />
<property role="TrG5h" value="primarySymbols" />
@ -1930,114 +1918,6 @@
<node concept="2tJIrI" id="36tQV5AIeEy" role="jymVt" />
<node concept="3Tm1VV" id="36tQV5AurZX" role="1B3o_S" />
</node>
<node concept="3HP615" id="7P_FdVPs4aA">
<property role="TrG5h" value="QueryStageTemplate" />
<node concept="2tJIrI" id="7P_FdVPs4b8" role="jymVt" />
<node concept="3clFb_" id="6OXbTD$oRWJ" role="jymVt">
<property role="1EzhhJ" value="true" />
<property role="2aFKle" value="false" />
<property role="TrG5h" value="stageName" />
<node concept="3clFbS" id="6OXbTD$oRWM" role="3clF47" />
<node concept="3Tm1VV" id="6OXbTD$oRWN" role="1B3o_S" />
<node concept="17QB3L" id="6OXbTD$oRqh" role="3clF45" />
<node concept="2AHcQZ" id="6tPOoeT2QhK" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
</node>
</node>
<node concept="2tJIrI" id="6OXbTD$oQQW" role="jymVt" />
<node concept="3clFb_" id="mJ_D14Alpb" role="jymVt">
<property role="1EzhhJ" value="true" />
<property role="TrG5h" value="newToken" />
<node concept="37vLTG" id="mJ_D14AlJJ" role="3clF46">
<property role="TrG5h" value="parameter" />
<node concept="8X2XB" id="mJ_D14AlWD" role="1tU5fm">
<node concept="3uibUv" id="mJ_D14AlQr" role="8Xvag">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
</node>
</node>
<node concept="16syzq" id="mJ_D14Alxk" role="3clF45">
<ref role="16sUi3" node="mJ_D14AkFa" resolve="Token" />
</node>
<node concept="3Tm1VV" id="mJ_D14Alpe" role="1B3o_S" />
<node concept="3clFbS" id="mJ_D14Alpf" role="3clF47" />
</node>
<node concept="2tJIrI" id="7P_FdVQ_jBm" role="jymVt" />
<node concept="3Tm1VV" id="7P_FdVPs4aB" role="1B3o_S" />
<node concept="16euLQ" id="mJ_D14AkFa" role="16eVyc">
<property role="TrG5h" value="Token" />
<node concept="3uibUv" id="mJ_D14Ald9" role="3ztrMU">
<ref role="3uigEE" node="mJ_D14woL$" resolve="TemplateToken" />
</node>
</node>
</node>
<node concept="312cEu" id="7P_FdVPsPNk">
<property role="3GE5qa" value="ruleTemplate" />
<property role="TrG5h" value="BaseQueryStageTemplate" />
<property role="1sVAO0" value="true" />
<node concept="2tJIrI" id="6OXbTDz035d" role="jymVt" />
<node concept="3clFbW" id="6OXbTDz039g" role="jymVt">
<node concept="37vLTG" id="6OXbTDz03ly" role="3clF46">
<property role="TrG5h" value="templateRef" />
<node concept="3uibUv" id="6OXbTDz03q5" role="1tU5fm">
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
</node>
</node>
<node concept="3cqZAl" id="6OXbTDz039i" role="3clF45" />
<node concept="3Tm1VV" id="6OXbTDz039j" role="1B3o_S" />
<node concept="3clFbS" id="6OXbTDz039k" role="3clF47">
<node concept="3clFbF" id="6OXbTDz03UI" role="3cqZAp">
<node concept="37vLTI" id="6OXbTDz03UJ" role="3clFbG">
<node concept="2OqwBi" id="6OXbTDz03UK" role="37vLTJ">
<node concept="Xjq3P" id="6OXbTDz03UL" role="2Oq$k0" />
<node concept="2OwXpG" id="6OXbTDz03UM" role="2OqNvi">
<ref role="2Oxat5" node="6OXbTDz03H0" resolve="templateRef" />
</node>
</node>
<node concept="37vLTw" id="6OXbTDz03UN" role="37vLTx">
<ref role="3cqZAo" node="6OXbTDz03ly" resolve="templateRef" />
</node>
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="6OXbTDz03CP" role="jymVt" />
<node concept="3clFb_" id="6OXbTDz054k" role="jymVt">
<property role="TrG5h" value="templateRef" />
<node concept="3uibUv" id="6OXbTDz05bG" role="3clF45">
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
</node>
<node concept="3Tm1VV" id="6OXbTDz054n" role="1B3o_S" />
<node concept="3clFbS" id="6OXbTDz054o" role="3clF47">
<node concept="3clFbF" id="6OXbTDz05BR" role="3cqZAp">
<node concept="37vLTw" id="6OXbTDz05BQ" role="3clFbG">
<ref role="3cqZAo" node="6OXbTDz03H0" resolve="templateRef" />
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="6OXbTDz047G" role="jymVt" />
<node concept="312cEg" id="6OXbTDz03H0" role="jymVt">
<property role="TrG5h" value="templateRef" />
<node concept="3Tm6S6" id="6OXbTDz03H1" role="1B3o_S" />
<node concept="3uibUv" id="6OXbTDz03H2" role="1tU5fm">
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
</node>
</node>
<node concept="3Tm1VV" id="7P_FdVPsPNl" role="1B3o_S" />
<node concept="3uibUv" id="7P_FdVPsPOy" role="EKbjA">
<ref role="3uigEE" node="7P_FdVPs4aA" resolve="QueryStageTemplate" />
<node concept="16syzq" id="mJ_D14ApBL" role="11_B2D">
<ref role="16sUi3" node="mJ_D14ApAA" resolve="Token" />
</node>
</node>
<node concept="16euLQ" id="mJ_D14ApAA" role="16eVyc">
<property role="TrG5h" value="Token" />
<node concept="3uibUv" id="mJ_D14ApBe" role="3ztrMU">
<ref role="3uigEE" node="mJ_D14woL$" resolve="TemplateToken" />
</node>
</node>
</node>
<node concept="3HP615" id="mJ_D14woL$">
<property role="3GE5qa" value="ruleTemplate.token" />
<property role="TrG5h" value="TemplateToken" />
@ -2102,34 +1982,25 @@
<node concept="3Tm1VV" id="6OXbTD$iO0H" role="1B3o_S" />
<node concept="3clFbS" id="6OXbTD$iO0I" role="3clF47" />
</node>
<node concept="2tJIrI" id="6OXbTD$iO0j" role="jymVt" />
<node concept="3clFb_" id="6OXbTD$jl18" role="jymVt">
<node concept="2tJIrI" id="6OXbTD$iO0n" role="jymVt" />
<node concept="3clFb_" id="6tPOoeT3pU7" role="jymVt">
<property role="1EzhhJ" value="true" />
<property role="TrG5h" value="stageTemplates" />
<node concept="A3Dl8" id="6OXbTD$jl19" role="3clF45">
<node concept="3uibUv" id="6OXbTD$jl3W" role="A3Ik2">
<ref role="3uigEE" node="7P_FdVPs4aA" resolve="QueryStageTemplate" />
<node concept="3qTvmN" id="6OXbTD$JJM1" role="11_B2D" />
<property role="TrG5h" value="newToken" />
<node concept="37vLTG" id="6tPOoeT3pU8" role="3clF46">
<property role="TrG5h" value="parameter" />
<node concept="8X2XB" id="6tPOoeT3pU9" role="1tU5fm">
<node concept="3uibUv" id="6tPOoeT3pUa" role="8Xvag">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
</node>
</node>
<node concept="3Tm1VV" id="6OXbTD$jl1b" role="1B3o_S" />
<node concept="3clFbS" id="6OXbTD$jl1c" role="3clF47" />
</node>
<node concept="2tJIrI" id="6OXbTD$oHqU" role="jymVt" />
<node concept="3clFb_" id="6OXbTD$oET6" role="jymVt">
<property role="1EzhhJ" value="true" />
<property role="TrG5h" value="stageTemplate" />
<node concept="37vLTG" id="6OXbTD$oIHv" role="3clF46">
<property role="TrG5h" value="stage" />
<node concept="17QB3L" id="6OXbTD$oII$" role="1tU5fm" />
<node concept="16syzq" id="6tPOoeT3qes" role="3clF45">
<ref role="16sUi3" node="6tPOoeT3qak" resolve="Token" />
</node>
<node concept="3uibUv" id="6OXbTD$oIFy" role="3clF45">
<ref role="3uigEE" node="7P_FdVPs4aA" resolve="QueryStageTemplate" />
</node>
<node concept="3Tm1VV" id="6OXbTD$oET9" role="1B3o_S" />
<node concept="3clFbS" id="6OXbTD$oETa" role="3clF47" />
<node concept="3Tm1VV" id="6tPOoeT3pUc" role="1B3o_S" />
<node concept="3clFbS" id="6tPOoeT3pUd" role="3clF47" />
</node>
<node concept="2tJIrI" id="6OXbTD$iO0n" role="jymVt" />
<node concept="2tJIrI" id="6tPOoeT3pQI" role="jymVt" />
<node concept="3Tm1VV" id="6OXbTD$iNPQ" role="1B3o_S" />
<node concept="3clFb_" id="7P_FdVPsDM6" role="jymVt">
<property role="1EzhhJ" value="true" />
@ -2254,6 +2125,12 @@
<node concept="2tJIrI" id="7P_FdVQ_jEt" role="jymVt" />
<node concept="3Tm1VV" id="7P_FdVQ_jCp" role="1B3o_S" />
</node>
<node concept="16euLQ" id="6tPOoeT3qak" role="16eVyc">
<property role="TrG5h" value="Token" />
<node concept="3uibUv" id="6tPOoeT3qal" role="3ztrMU">
<ref role="3uigEE" node="mJ_D14woL$" resolve="TemplateToken" />
</node>
</node>
</node>
<node concept="3HP615" id="4t7Xo7inshN">
<property role="TrG5h" value="QueryKind" />