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

refactoring: Adjust uniqueTag usages for Rule.Tag refactoring 

Fix rule basetag generation to coincide with templateName

Needed for PrincipalStore (occurrence cache) which uses
info about occurrence source rule template name.
This commit is contained in:
Grigorii Kirgizov 2020-12-03 15:23:08 +03:00
parent fd43cc560c
commit 27ed01c447
7 changed files with 803 additions and 854 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
View File

@ -12484,10 +12484,23 @@
<node concept="37vLTw" id="5yr01fE1Y_1" role="37wK5m">
<ref role="3cqZAo" node="36tQV5AxhPV" resolve="session" />
</node>
<node concept="Xl_RD" id="6xVZN2uAsCL" role="37wK5m">
<property role="Xl_RC" value="" />
<node concept="5jKBG" id="6xVZN2uAt2r" role="lGtFl">
<ref role="v9R2y" node="6xVZN2uppfW" resolve="rule_basename" />
<node concept="Xl_RD" id="1vsv9tPom8U" role="37wK5m">
<property role="Xl_RC" value="templateName" />
<node concept="17Uvod" id="1vsv9tPoo5i" role="lGtFl">
<property role="2qtEX9" value="value" />
<property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
<node concept="3zFVjK" id="1vsv9tPoo5j" role="3zH0cK">
<node concept="3clFbS" id="1vsv9tPoo5k" role="2VODD2">
<node concept="3clFbF" id="1vsv9tPop_1" role="3cqZAp">
<node concept="2OqwBi" id="1vsv9tPopLX" role="3clFbG">
<node concept="30H73N" id="1vsv9tPop_0" role="2Oq$k0" />
<node concept="2qgKlT" id="1vsv9tPoq0E" role="2OqNvi">
<ref role="37wK5l" to="x5bw:5BtuWK5zJKH" resolve="templateName" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="Xl_RD" id="36tQV5AxhQ6" role="37wK5m">
@ -13136,9 +13149,23 @@
<ref role="3cqZAo" to="xnrr:6b4eZz$Q4Ea" resolve="principalRulesTags" />
</node>
<node concept="TSZUe" id="19q1ULB0QZe" role="2OqNvi">
<node concept="Xl_RD" id="19q1ULB0QZf" role="25WWJ7">
<node concept="5jKBG" id="19q1ULB0QZg" role="lGtFl">
<ref role="v9R2y" node="6xVZN2uppfW" resolve="rule_basename" />
<node concept="Xl_RD" id="1vsv9tPovaU" role="25WWJ7">
<property role="Xl_RC" value="template.name" />
<node concept="17Uvod" id="1vsv9tPovnP" role="lGtFl">
<property role="2qtEX9" value="value" />
<property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
<node concept="3zFVjK" id="1vsv9tPovnQ" role="3zH0cK">
<node concept="3clFbS" id="1vsv9tPovnR" role="2VODD2">
<node concept="3clFbF" id="1vsv9tPovJW" role="3cqZAp">
<node concept="2OqwBi" id="1vsv9tPovXn" role="3clFbG">
<node concept="30H73N" id="1vsv9tPovJV" role="2Oq$k0" />
<node concept="2qgKlT" id="1vsv9tPowGX" role="2OqNvi">
<ref role="37wK5l" to="x5bw:5BtuWK5zJKH" resolve="templateName" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
@ -13168,7 +13195,7 @@
<ref role="3cqZAo" node="5BtuWK5yEHM" resolve="it" />
</node>
<node concept="2qgKlT" id="5BtuWK5zMBL" role="2OqNvi">
<ref role="37wK5l" to="x5bw:5BtuWK5zJKH" resolve="baseName" />
<ref role="37wK5l" to="x5bw:5BtuWK5zJKH" resolve="templateName" />
</node>
</node>
</node>
@ -13314,8 +13341,8 @@
<node concept="3clFbF" id="5BtuWK5zLce" role="3cqZAp">
<node concept="2OqwBi" id="5BtuWK5zLju" role="3clFbG">
<node concept="30H73N" id="5BtuWK5zLcd" role="2Oq$k0" />
<node concept="2qgKlT" id="5BtuWK5zLpL" role="2OqNvi">
<ref role="37wK5l" to="x5bw:5BtuWK5zJKH" resolve="baseName" />
<node concept="2qgKlT" id="1vsv9tPosGb" role="2OqNvi">
<ref role="37wK5l" to="x5bw:1vsv9tPo5GP" resolve="baseName" />
</node>
</node>
</node>

281
coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
View File

@ -142,6 +142,11 @@
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
<child id="1178549979242" name="visibility" index="1B3o_S" />
</concept>
<concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
<child id="1163668914799" name="condition" index="3K4Cdx" />
<child id="1163668922816" name="ifTrue" index="3K4E3e" />
<child id="1163668934364" name="ifFalse" index="3K4GZi" />
</concept>
<concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
<concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
<concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
@ -828,146 +833,95 @@
</node>
</node>
<node concept="13i0hz" id="5BtuWK5zJKH" role="13h7CS">
<property role="TrG5h" value="baseName" />
<property role="TrG5h" value="templateName" />
<node concept="3Tm1VV" id="5BtuWK5zJKI" role="1B3o_S" />
<node concept="17QB3L" id="5BtuWK5zK5F" role="3clF45" />
<node concept="3clFbS" id="5BtuWK5zJKK" role="3clF47">
<node concept="3cpWs8" id="5BtuWK5z21x" role="3cqZAp">
<node concept="3cpWsn" id="5BtuWK5z21$" role="3cpWs9">
<property role="TrG5h" value="ruleName" />
<node concept="17QB3L" id="5BtuWK5z21v" role="1tU5fm" />
<node concept="Xl_RD" id="5BtuWK5zeF9" role="33vP2m">
<property role="Xl_RC" value="__anonymous__" />
</node>
</node>
</node>
<node concept="3cpWs8" id="6xVZN2upvmT" role="3cqZAp">
<node concept="3cpWsn" id="6xVZN2upvmU" role="3cpWs9">
<property role="TrG5h" value="rulesTemplate" />
<property role="TrG5h" value="ruleTemplate" />
<node concept="3Tqbb2" id="6xVZN2upvmV" role="1tU5fm">
<ref role="ehGHo" to="tpck:h0TrEE$" resolve="INamedConcept" />
</node>
<node concept="10Nm6u" id="7L9cSENFXPa" role="33vP2m" />
</node>
</node>
<node concept="3clFbH" id="7L9cSENFSBk" role="3cqZAp" />
<node concept="3cpWs8" id="5BtuWK5zd88" role="3cqZAp">
<node concept="3cpWsn" id="5BtuWK5zd8b" role="3cpWs9">
<property role="TrG5h" value="root" />
<node concept="3Tqbb2" id="5BtuWK5zd86" role="1tU5fm" />
<node concept="2OqwBi" id="5BtuWK5zbqC" role="33vP2m">
<node concept="2Rxl7S" id="5BtuWK5zbzb" role="2OqNvi" />
<node concept="13iPFW" id="5BtuWK5zK$V" role="2Oq$k0" />
<node concept="BsUDl" id="1vsv9tPo8y7" role="33vP2m">
<ref role="37wK5l" node="1vsv9tPo6DN" resolve="ruleTemplate" />
</node>
</node>
</node>
<node concept="3clFbJ" id="5BtuWK5zaCW" role="3cqZAp">
<node concept="3clFbS" id="5BtuWK5zaCY" role="3clFbx">
<node concept="3clFbF" id="7L9cSENFTOw" role="3cqZAp">
<node concept="37vLTI" id="7L9cSENFUbG" role="3clFbG">
<node concept="37vLTw" id="7L9cSENFTOu" role="37vLTJ">
<ref role="3cqZAo" node="6xVZN2upvmU" resolve="rulesTemplate" />
</node>
<node concept="2OqwBi" id="6xVZN2upvmW" role="37vLTx">
<node concept="13iPFW" id="5BtuWK5zKGu" role="2Oq$k0" />
<node concept="2Xjw5R" id="6xVZN2upvmY" role="2OqNvi">
<node concept="1xMEDy" id="6xVZN2upvmZ" role="1xVPHs">
<node concept="chp4Y" id="6xVZN2upvn0" role="ri$Ld">
<ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
</node>
</node>
</node>
</node>
<node concept="3cpWs6" id="5BtuWK5zEEV" role="3cqZAp">
<node concept="3K4zz7" id="1vsv9tPoafl" role="3cqZAk">
<node concept="2OqwBi" id="1vsv9tPobF4" role="3K4Cdx">
<node concept="37vLTw" id="1vsv9tPobF5" role="2Oq$k0">
<ref role="3cqZAo" node="6xVZN2upvmU" resolve="ruleTemplate" />
</node>
<node concept="3x8VRR" id="1vsv9tPobUV" role="2OqNvi" />
</node>
<node concept="2OqwBi" id="1vsv9tPobF8" role="3K4E3e">
<node concept="37vLTw" id="1vsv9tPobF9" role="2Oq$k0">
<ref role="3cqZAo" node="6xVZN2upvmU" resolve="ruleTemplate" />
</node>
<node concept="3TrcHB" id="1vsv9tPobFa" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
<node concept="3clFbF" id="5BtuWK5zmdI" role="3cqZAp">
<node concept="37vLTI" id="5BtuWK5zosk" role="3clFbG">
<node concept="2OqwBi" id="5BtuWK5zoUH" role="37vLTx">
<node concept="37vLTw" id="5BtuWK5zoHh" role="2Oq$k0">
<ref role="3cqZAo" node="6xVZN2upvmU" resolve="rulesTemplate" />
<node concept="Xl_RD" id="1vsv9tPobF7" role="3K4GZi">
<property role="Xl_RC" value="__noname__" />
</node>
</node>
</node>
</node>
</node>
<node concept="13i0hz" id="1vsv9tPo5GP" role="13h7CS">
<property role="TrG5h" value="baseName" />
<node concept="3Tm1VV" id="1vsv9tPo5GQ" role="1B3o_S" />
<node concept="17QB3L" id="1vsv9tPo63q" role="3clF45" />
<node concept="3clFbS" id="1vsv9tPo5GS" role="3clF47">
<node concept="3cpWs8" id="1vsv9tPogH6" role="3cqZAp">
<node concept="3cpWsn" id="1vsv9tPogH7" role="3cpWs9">
<property role="TrG5h" value="ruleTemplate" />
<node concept="3Tqbb2" id="1vsv9tPogH8" role="1tU5fm">
<ref role="ehGHo" to="tpck:h0TrEE$" resolve="INamedConcept" />
</node>
<node concept="BsUDl" id="1vsv9tPogH9" role="33vP2m">
<ref role="37wK5l" node="1vsv9tPo6DN" resolve="ruleTemplate" />
</node>
</node>
</node>
<node concept="3cpWs8" id="1vsv9tPoidS" role="3cqZAp">
<node concept="3cpWsn" id="1vsv9tPoidV" role="3cpWs9">
<property role="TrG5h" value="ruleName" />
<node concept="17QB3L" id="1vsv9tPoihL" role="1tU5fm" />
<node concept="Xl_RD" id="1vsv9tPoij8" role="33vP2m">
<property role="Xl_RC" value="__noname__" />
</node>
</node>
</node>
<node concept="3clFbH" id="1vsv9tPojQd" role="3cqZAp" />
<node concept="3clFbJ" id="7L9cSENFWKp" role="3cqZAp">
<node concept="3clFbS" id="7L9cSENFWKr" role="3clFbx">
<node concept="3clFbF" id="1vsv9tPoiuW" role="3cqZAp">
<node concept="37vLTI" id="1vsv9tPoiQ2" role="3clFbG">
<node concept="2OqwBi" id="1vsv9tPoj1Q" role="37vLTx">
<node concept="37vLTw" id="1vsv9tPoiUD" role="2Oq$k0">
<ref role="3cqZAo" node="1vsv9tPogH7" resolve="ruleTemplate" />
</node>
<node concept="3TrcHB" id="5BtuWK5zpNk" role="2OqNvi">
<node concept="3TrcHB" id="1vsv9tPoj8w" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
<node concept="37vLTw" id="5BtuWK5zmdG" role="37vLTJ">
<ref role="3cqZAo" node="5BtuWK5z21$" resolve="ruleName" />
<node concept="37vLTw" id="1vsv9tPoiuU" role="37vLTJ">
<ref role="3cqZAo" node="1vsv9tPoidV" resolve="ruleName" />
</node>
</node>
</node>
</node>
<node concept="2OqwBi" id="5BtuWK5zcen" role="3clFbw">
<node concept="1mIQ4w" id="5BtuWK5zcmq" role="2OqNvi">
<node concept="chp4Y" id="5BtuWK5zcqN" role="cj9EA">
<ref role="cht4Q" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
</node>
</node>
<node concept="37vLTw" id="5BtuWK5zdUB" role="2Oq$k0">
<ref role="3cqZAo" node="5BtuWK5zd8b" resolve="root" />
</node>
</node>
<node concept="3eNFk2" id="5BtuWK5zd1N" role="3eNLev">
<node concept="2OqwBi" id="5BtuWK5zfBN" role="3eO9$A">
<node concept="37vLTw" id="5BtuWK5zf_8" role="2Oq$k0">
<ref role="3cqZAo" node="5BtuWK5zd8b" resolve="root" />
</node>
<node concept="1mIQ4w" id="5BtuWK5zfPN" role="2OqNvi">
<node concept="chp4Y" id="5BtuWK5zgsa" role="cj9EA">
<ref role="cht4Q" to="wq2x:5EDW3XE0OAL" resolve="QueryTable" />
</node>
</node>
</node>
<node concept="3clFbS" id="5BtuWK5zd1P" role="3eOfB_">
<node concept="3clFbF" id="7L9cSENFUit" role="3cqZAp">
<node concept="37vLTI" id="7L9cSENFUiu" role="3clFbG">
<node concept="37vLTw" id="7L9cSENFUiv" role="37vLTJ">
<ref role="3cqZAo" node="6xVZN2upvmU" resolve="rulesTemplate" />
</node>
<node concept="2OqwBi" id="7L9cSENFUiw" role="37vLTx">
<node concept="13iPFW" id="7L9cSENFUix" role="2Oq$k0" />
<node concept="2Xjw5R" id="7L9cSENFUiy" role="2OqNvi">
<node concept="1xMEDy" id="7L9cSENFUiz" role="1xVPHs">
<node concept="chp4Y" id="7L9cSENFU$c" role="ri$Ld">
<ref role="cht4Q" to="wq2x:7P_FdVQ_S6B" resolve="QueryTemplate" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="5BtuWK5zpUC" role="3cqZAp">
<node concept="37vLTI" id="5BtuWK5zqtg" role="3clFbG">
<node concept="3cpWs3" id="5BtuWK5zuJu" role="37vLTx">
<node concept="Xl_RD" id="5BtuWK5zuOT" role="3uHU7B">
<property role="Xl_RC" value="query." />
</node>
<node concept="2OqwBi" id="5BtuWK5zs$V" role="3uHU7w">
<node concept="37vLTw" id="7L9cSENFUIG" role="2Oq$k0">
<ref role="3cqZAo" node="6xVZN2upvmU" resolve="rulesTemplate" />
</node>
<node concept="3TrcHB" id="5kd4gAC11El" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
</node>
<node concept="37vLTw" id="5BtuWK5zpUB" role="37vLTJ">
<ref role="3cqZAo" node="5BtuWK5z21$" resolve="ruleName" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="7L9cSENFW$5" role="3cqZAp" />
<node concept="3clFbJ" id="7L9cSENFWKp" role="3cqZAp">
<node concept="3clFbS" id="7L9cSENFWKr" role="3clFbx">
<node concept="3clFbH" id="1vsv9tPok2D" role="3cqZAp" />
<node concept="3cpWs8" id="6xVZN2upvXl" role="3cqZAp">
<node concept="3cpWsn" id="6xVZN2upvXo" role="3cpWs9">
<property role="TrG5h" value="rtRules" />
<node concept="2OqwBi" id="6VRLMeOrQCR" role="33vP2m">
<node concept="2OqwBi" id="6xVZN2upvn2" role="2Oq$k0">
<node concept="37vLTw" id="7L9cSENFVJu" role="2Oq$k0">
<ref role="3cqZAo" node="6xVZN2upvmU" resolve="rulesTemplate" />
<node concept="37vLTw" id="1vsv9tPohJR" role="2Oq$k0">
<ref role="3cqZAo" node="1vsv9tPogH7" resolve="ruleTemplate" />
</node>
<node concept="2Rf3mk" id="6xVZN2upvn4" role="2OqNvi">
<node concept="1xMEDy" id="6xVZN2upvn5" role="1xVPHs">
@ -1003,40 +957,113 @@
</node>
</node>
</node>
<node concept="37vLTw" id="5BtuWK5zAPp" role="37vLTJ">
<ref role="3cqZAo" node="5BtuWK5z21$" resolve="ruleName" />
<node concept="37vLTw" id="1vsv9tPojm$" role="37vLTJ">
<ref role="3cqZAo" node="1vsv9tPoidV" resolve="ruleName" />
</node>
</node>
</node>
</node>
<node concept="3eOSWO" id="5BtuWK5zAEy" role="3clFbw">
<node concept="3cmrfG" id="5BtuWK5zAEA" role="3uHU7w">
<property role="3cmrfH" value="0" />
</node>
<node concept="2OqwBi" id="6VRLMeOrTdN" role="3uHU7B">
<node concept="37vLTw" id="6VRLMeOrSOP" role="2Oq$k0">
<node concept="37vLTw" id="1vsv9tPohNi" role="2Oq$k0">
<ref role="3cqZAo" node="6xVZN2upvXo" resolve="rtRules" />
</node>
<node concept="34oBXx" id="6VRLMeOrTlE" role="2OqNvi" />
</node>
<node concept="3cmrfG" id="1vsv9tPok46" role="3uHU7w">
<property role="3cmrfH" value="1" />
</node>
</node>
</node>
</node>
<node concept="3y3z36" id="7L9cSENFWYr" role="3clFbw">
<node concept="10Nm6u" id="7L9cSENFX3R" role="3uHU7w" />
<node concept="37vLTw" id="7L9cSENFWPx" role="3uHU7B">
<ref role="3cqZAo" node="6xVZN2upvmU" resolve="rulesTemplate" />
<node concept="37vLTw" id="1vsv9tPogTu" role="3uHU7B">
<ref role="3cqZAo" node="1vsv9tPogH7" resolve="ruleTemplate" />
</node>
</node>
</node>
<node concept="3clFbH" id="6xVZN2uq2cq" role="3cqZAp" />
<node concept="3cpWs6" id="5BtuWK5zEEV" role="3cqZAp">
<node concept="37vLTw" id="5BtuWK5zF06" role="3cqZAk">
<ref role="3cqZAo" node="5BtuWK5z21$" resolve="ruleName" />
<node concept="3cpWs6" id="1vsv9tPohXt" role="3cqZAp">
<node concept="37vLTw" id="1vsv9tPojAi" role="3cqZAk">
<ref role="3cqZAo" node="1vsv9tPoidV" resolve="ruleName" />
</node>
</node>
</node>
</node>
<node concept="13i0hz" id="1vsv9tPo6DN" role="13h7CS">
<property role="TrG5h" value="ruleTemplate" />
<node concept="3Tm6S6" id="1vsv9tPo7B8" role="1B3o_S" />
<node concept="3Tqbb2" id="1vsv9tPo7Bj" role="3clF45">
<ref role="ehGHo" to="tpck:h0TrEE$" resolve="INamedConcept" />
</node>
<node concept="3clFbS" id="1vsv9tPo6DQ" role="3clF47">
<node concept="3cpWs8" id="5BtuWK5zd88" role="3cqZAp">
<node concept="3cpWsn" id="5BtuWK5zd8b" role="3cpWs9">
<property role="TrG5h" value="root" />
<node concept="3Tqbb2" id="5BtuWK5zd86" role="1tU5fm" />
<node concept="2OqwBi" id="5BtuWK5zbqC" role="33vP2m">
<node concept="2Rxl7S" id="5BtuWK5zbzb" role="2OqNvi" />
<node concept="13iPFW" id="5BtuWK5zK$V" role="2Oq$k0" />
</node>
</node>
</node>
<node concept="3clFbJ" id="5BtuWK5zaCW" role="3cqZAp">
<node concept="3clFbS" id="5BtuWK5zaCY" role="3clFbx">
<node concept="3cpWs6" id="1vsv9tPodne" role="3cqZAp">
<node concept="2OqwBi" id="6xVZN2upvmW" role="3cqZAk">
<node concept="13iPFW" id="5BtuWK5zKGu" role="2Oq$k0" />
<node concept="2Xjw5R" id="6xVZN2upvmY" role="2OqNvi">
<node concept="1xMEDy" id="6xVZN2upvmZ" role="1xVPHs">
<node concept="chp4Y" id="6xVZN2upvn0" role="ri$Ld">
<ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2OqwBi" id="5BtuWK5zcen" role="3clFbw">
<node concept="1mIQ4w" id="5BtuWK5zcmq" role="2OqNvi">
<node concept="chp4Y" id="5BtuWK5zcqN" role="cj9EA">
<ref role="cht4Q" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
</node>
</node>
<node concept="37vLTw" id="5BtuWK5zdUB" role="2Oq$k0">
<ref role="3cqZAo" node="5BtuWK5zd8b" resolve="root" />
</node>
</node>
<node concept="3eNFk2" id="5BtuWK5zd1N" role="3eNLev">
<node concept="2OqwBi" id="5BtuWK5zfBN" role="3eO9$A">
<node concept="37vLTw" id="5BtuWK5zf_8" role="2Oq$k0">
<ref role="3cqZAo" node="5BtuWK5zd8b" resolve="root" />
</node>
<node concept="1mIQ4w" id="5BtuWK5zfPN" role="2OqNvi">
<node concept="chp4Y" id="5BtuWK5zgsa" role="cj9EA">
<ref role="cht4Q" to="wq2x:5EDW3XE0OAL" resolve="QueryTable" />
</node>
</node>
</node>
<node concept="3clFbS" id="5BtuWK5zd1P" role="3eOfB_">
<node concept="3cpWs6" id="1vsv9tPoeaC" role="3cqZAp">
<node concept="2OqwBi" id="7L9cSENFUiw" role="3cqZAk">
<node concept="13iPFW" id="7L9cSENFUix" role="2Oq$k0" />
<node concept="2Xjw5R" id="7L9cSENFUiy" role="2OqNvi">
<node concept="1xMEDy" id="7L9cSENFUiz" role="1xVPHs">
<node concept="chp4Y" id="7L9cSENFU$c" role="ri$Ld">
<ref role="cht4Q" to="wq2x:7P_FdVQ_S6B" resolve="QueryTemplate" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWs6" id="1vsv9tPoffL" role="3cqZAp">
<node concept="10Nm6u" id="1vsv9tPofA9" role="3cqZAk" />
</node>
</node>
</node>
</node>
<node concept="13h7C7" id="34$A1Mf3_W$">
<property role="3GE5qa" value="rule" />

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

@ -788,36 +788,24 @@
</node>
</node>
<node concept="3clFbS" id="1H_6AUT3qxi" role="3clF47">
<node concept="3cpWs6" id="1H_6AUT3qxl" role="3cqZAp">
<node concept="1Wc70l" id="cmlg9O7Wff" role="3cqZAk">
<node concept="2ZW3vV" id="cmlg9O7WR1" role="3uHU7B">
<node concept="3uibUv" id="cmlg9O7X$p" role="2ZW6by">
<ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
</node>
<node concept="37vLTw" id="cmlg9O7Ww$" role="2ZW6bz">
<ref role="3cqZAo" node="1H_6AUT3qxg" resolve="rule" />
</node>
<node concept="3cpWs6" id="e$ws1zVcL2" role="3cqZAp">
<node concept="2OqwBi" id="e$ws1zVcL3" role="3cqZAk">
<node concept="37vLTw" id="e$ws1zVcL4" role="2Oq$k0">
<ref role="3cqZAo" node="1H_6AUT3r3E" resolve="principalRules" />
</node>
<node concept="2OqwBi" id="1H_6AUT3xhF" role="3uHU7w">
<node concept="37vLTw" id="1H_6AUT3wwu" role="2Oq$k0">
<ref role="3cqZAo" node="1H_6AUT3r3E" resolve="principalRules" />
</node>
<node concept="3JPx81" id="1H_6AUT3yjD" role="2OqNvi">
<node concept="2OqwBi" id="1H_6AUT3yEU" role="25WWJ7">
<node concept="1eOMI4" id="cmlg9O7XGo" role="2Oq$k0">
<node concept="10QFUN" id="cmlg9O7XGn" role="1eOMHV">
<node concept="37vLTw" id="cmlg9O7XGm" role="10QFUP">
<ref role="3cqZAo" node="1H_6AUT3qxg" resolve="rule" />
</node>
<node concept="3uibUv" id="cmlg9O7XV2" role="10QFUM">
<ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
</node>
</node>
<node concept="3JPx81" id="e$ws1zVcL5" role="2OqNvi">
<node concept="2OqwBi" id="e$ws1zVcL6" role="25WWJ7">
<node concept="2OqwBi" id="e$ws1zVcL7" role="2Oq$k0">
<node concept="37vLTw" id="e$ws1zVcL8" role="2Oq$k0">
<ref role="3cqZAo" node="1H_6AUT3qxg" resolve="rule" />
</node>
<node concept="liA8E" id="6xVZN2uLgGx" role="2OqNvi">
<ref role="37wK5l" to="i348:~Rule.basetag()" resolve="basetag" />
<node concept="liA8E" id="e$ws1zVcL9" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
</node>
</node>
<node concept="liA8E" id="e$ws1zVcLa" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Rule$Tag.groupName()" resolve="groupName" />
</node>
</node>
</node>
</node>

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

@ -51,6 +51,10 @@
</concept>
</language>
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
<concept id="1224071154655" name="jetbrains.mps.baseLanguage.structure.AsExpression" flags="nn" index="0kSF2">
<child id="1224071154657" name="classifierType" index="0kSFW" />
<child id="1224071154656" name="expression" index="0kSFX" />
</concept>
<concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
<concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
<child id="1082485599096" name="statements" index="9aQI4" />
@ -1256,15 +1260,6 @@
<node concept="2tJIrI" id="4J__M64qqM" role="jymVt" />
<node concept="3clFb_" id="7DvO2M9UagU" role="jymVt">
<property role="TrG5h" value="buildPlan" />
<node concept="37vLTG" id="1XKnVPtnWG" role="3clF46">
<property role="TrG5h" value="plan" />
<node concept="3uibUv" id="1XKnVPtuDF" role="1tU5fm">
<ref role="3uigEE" node="1XKnVPsWNc" resolve="RulesPlan" />
</node>
</node>
<node concept="3uibUv" id="1XKnVPvPdt" role="3clF45">
<ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
</node>
<node concept="3Tm1VV" id="7DvO2M9UagX" role="1B3o_S" />
<node concept="3clFbS" id="7DvO2M9UagY" role="3clF47">
<node concept="3cpWs8" id="1XKnVPw3ai" role="3cqZAp">
@ -1498,6 +1493,15 @@
</node>
</node>
</node>
<node concept="3uibUv" id="1XKnVPvPdt" role="3clF45">
<ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
</node>
<node concept="37vLTG" id="1XKnVPtnWG" role="3clF46">
<property role="TrG5h" value="plan" />
<node concept="3uibUv" id="1XKnVPtuDF" role="1tU5fm">
<ref role="3uigEE" node="1XKnVPsWNc" resolve="RulesPlan" />
</node>
</node>
</node>
<node concept="2tJIrI" id="2hQbw6HT6Vp" role="jymVt" />
<node concept="3clFb_" id="2hQbw6HTiY$" role="jymVt">
@ -1523,16 +1527,6 @@
<ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
</node>
</node>
<node concept="37vLTG" id="1XKnVP6hBI" role="3clF46">
<property role="TrG5h" value="ruleBuilders" />
<node concept="3vKaQO" id="47oVduOM7$h" role="1tU5fm">
<node concept="3uibUv" id="47oVduOM7$j" role="3O5elw">
<ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
</node>
</node>
</node>
<node concept="3cqZAl" id="1XKnVPl3dw" role="3clF45" />
<node concept="3Tm1VV" id="1XKnVP5jlU" role="1B3o_S" />
<node concept="3clFbS" id="7DvO2M9Uahu" role="3clF47">
<node concept="3cpWs8" id="7DvO2M9Uahv" role="3cqZAp">
<node concept="3cpWsn" id="7DvO2M9Uahw" role="3cpWs9">
@ -1639,6 +1633,16 @@
</node>
</node>
</node>
<node concept="3Tm1VV" id="1XKnVP5jlU" role="1B3o_S" />
<node concept="37vLTG" id="1XKnVP6hBI" role="3clF46">
<property role="TrG5h" value="ruleBuilders" />
<node concept="3vKaQO" id="47oVduOM7$h" role="1tU5fm">
<node concept="3uibUv" id="47oVduOM7$j" role="3O5elw">
<ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
</node>
</node>
</node>
<node concept="3cqZAl" id="1XKnVPl3dw" role="3clF45" />
<node concept="3uibUv" id="1XKnVPle_6" role="Sfmx6">
<ref role="3uigEE" to="av0y:~InvalidRuleException" resolve="InvalidRuleException" />
</node>
@ -2602,7 +2606,6 @@
<node concept="2tJIrI" id="4MqhgXUMb3v" role="jymVt" />
<node concept="3clFbW" id="4MqhgXUMb4h" role="jymVt">
<node concept="3cqZAl" id="4MqhgXUMb4j" role="3clF45" />
<node concept="3Tm6S6" id="1XKnVPk6O8" role="1B3o_S" />
<node concept="3clFbS" id="4MqhgXUMb4l" role="3clF47">
<node concept="1DcWWT" id="4MqhgXUMhDW" role="3cqZAp">
<node concept="3clFbS" id="4MqhgXUMhDZ" role="2LFqv$">
@ -2654,14 +2657,6 @@
</node>
<node concept="3clFbF" id="4MqhgXUMi_d" role="3cqZAp">
<node concept="37vLTI" id="4MqhgXUMjxs" role="3clFbG">
<node concept="3EllGN" id="4MqhgXUMiU9" role="37vLTJ">
<node concept="37vLTw" id="4MqhgXUMiYy" role="3ElVtu">
<ref role="3cqZAo" node="4MqhgXUMhE0" resolve="loc" />
</node>
<node concept="37vLTw" id="4MqhgXUMi_c" role="3ElQJh">
<ref role="3cqZAo" node="4MqhgXUMgHN" resolve="templateLoc2rules" />
</node>
</node>
<node concept="2ShNRf" id="4MqhgXUMjCn" role="37vLTx">
<node concept="1pGfFk" id="4baZKvaEa8L" role="2ShVmc">
<ref role="37wK5l" to="33ny:~TreeMap.&lt;init&gt;(java.util.Comparator)" resolve="TreeMap" />
@ -2678,6 +2673,14 @@
</node>
</node>
</node>
<node concept="3EllGN" id="4MqhgXUMiU9" role="37vLTJ">
<node concept="37vLTw" id="4MqhgXUMiYy" role="3ElVtu">
<ref role="3cqZAo" node="4MqhgXUMhE0" resolve="loc" />
</node>
<node concept="37vLTw" id="4MqhgXUMi_c" role="3ElQJh">
<ref role="3cqZAo" node="4MqhgXUMgHN" resolve="templateLoc2rules" />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="47oVduOIX27" role="3cqZAp">
@ -2724,6 +2727,7 @@
</node>
</node>
</node>
<node concept="3Tm6S6" id="1XKnVPk6O8" role="1B3o_S" />
</node>
<node concept="2tJIrI" id="4MqhgXUMLGb" role="jymVt" />
<node concept="3clFb_" id="4MqhgXUMbtk" role="jymVt">
@ -2734,16 +2738,7 @@
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
</node>
<node concept="37vLTG" id="5NUR$PxJcs" role="3clF46">
<property role="TrG5h" value="ruleBuilders" />
<node concept="A3Dl8" id="5NUR$PxJct" role="1tU5fm">
<node concept="3uibUv" id="5NUR$PxJcu" role="A3Ik2">
<ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
</node>
</node>
</node>
<node concept="3cqZAl" id="4MqhgXUMbtm" role="3clF45" />
<node concept="3Tm6S6" id="1XKnVPk7Im" role="1B3o_S" />
<node concept="3clFbS" id="4MqhgXUMbto" role="3clF47">
<node concept="3cpWs8" id="4baZKvaXzR9" role="3cqZAp">
<node concept="3cpWsn" id="4baZKvaXzRa" role="3cpWs9">
@ -3151,12 +3146,17 @@
<node concept="1bVj0M" id="4baZKvb8dxH" role="23t8la">
<node concept="3clFbS" id="4baZKvb8dxI" role="1bW5cS">
<node concept="3clFbF" id="4baZKvb8dxJ" role="3cqZAp">
<node concept="2OqwBi" id="4baZKvb8dxK" role="3clFbG">
<node concept="37vLTw" id="4baZKvb8dxL" role="2Oq$k0">
<ref role="3cqZAo" node="4baZKvb8dxN" resolve="it" />
<node concept="0kSF2" id="6KCGZaSwXHq" role="3clFbG">
<node concept="3uibUv" id="6KCGZaSwXIl" role="0kSFW">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
<node concept="liA8E" id="4baZKvb8dxM" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
<node concept="2OqwBi" id="4baZKvb8dxK" role="0kSFX">
<node concept="37vLTw" id="4baZKvb8dxL" role="2Oq$k0">
<ref role="3cqZAo" node="4baZKvb8dxN" resolve="it" />
</node>
<node concept="liA8E" id="4baZKvb8dxM" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
</node>
</node>
</node>
</node>
@ -3209,6 +3209,15 @@
</node>
</node>
</node>
<node concept="3Tm6S6" id="1XKnVPk7Im" role="1B3o_S" />
<node concept="37vLTG" id="5NUR$PxJcs" role="3clF46">
<property role="TrG5h" value="ruleBuilders" />
<node concept="A3Dl8" id="5NUR$PxJct" role="1tU5fm">
<node concept="3uibUv" id="5NUR$PxJcu" role="A3Ik2">
<ref role="3uigEE" to="i348:7eGEHDlc$ap" resolve="RuleBuilder" />
</node>
</node>
</node>
<node concept="3uibUv" id="5NUR$Py04a" role="Sfmx6">
<ref role="3uigEE" to="av0y:~InvalidRuleException" resolve="InvalidRuleException" />
</node>
@ -3379,12 +3388,17 @@
<node concept="1bVj0M" id="4baZKvb6gnH" role="23t8la">
<node concept="3clFbS" id="4baZKvb6gnI" role="1bW5cS">
<node concept="3clFbF" id="4baZKvb6gnJ" role="3cqZAp">
<node concept="2OqwBi" id="4baZKvb6gnK" role="3clFbG">
<node concept="37vLTw" id="4baZKvb6gnL" role="2Oq$k0">
<ref role="3cqZAo" node="4baZKvb6gnN" resolve="it" />
<node concept="0kSF2" id="6KCGZaSy04t" role="3clFbG">
<node concept="3uibUv" id="6KCGZaSy8Kx" role="0kSFW">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
<node concept="liA8E" id="4baZKvb6gnM" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
<node concept="2OqwBi" id="4baZKvb6gnK" role="0kSFX">
<node concept="37vLTw" id="4baZKvb6gnL" role="2Oq$k0">
<ref role="3cqZAo" node="4baZKvb6gnN" resolve="it" />
</node>
<node concept="liA8E" id="4baZKvb6gnM" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
</node>
</node>
</node>
</node>
@ -3705,12 +3719,17 @@
<node concept="1bVj0M" id="4baZKvb26th" role="23t8la">
<node concept="3clFbS" id="4baZKvb26ti" role="1bW5cS">
<node concept="3clFbF" id="4baZKvb26tj" role="3cqZAp">
<node concept="2OqwBi" id="4baZKvb26tk" role="3clFbG">
<node concept="37vLTw" id="4baZKvb26tl" role="2Oq$k0">
<ref role="3cqZAo" node="4baZKvb26tn" resolve="it" />
<node concept="0kSF2" id="6KCGZaSygz_" role="3clFbG">
<node concept="3uibUv" id="6KCGZaSyhlC" role="0kSFW">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
<node concept="liA8E" id="4baZKvb26tm" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
<node concept="2OqwBi" id="4baZKvb26tk" role="0kSFX">
<node concept="37vLTw" id="4baZKvb26tl" role="2Oq$k0">
<ref role="3cqZAo" node="4baZKvb26tn" resolve="it" />
</node>
<node concept="liA8E" id="4baZKvb26tm" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
</node>
</node>
</node>
</node>
@ -3876,12 +3895,17 @@
<property role="Xl_RC" value="' (" />
</node>
</node>
<node concept="2OqwBi" id="3OUB6BCcAbv" role="3uHU7w">
<node concept="37vLTw" id="3OUB6BCcAbY" role="2Oq$k0">
<ref role="3cqZAo" node="3OUB6BCcAbW" resolve="rule" />
<node concept="2OqwBi" id="7ElRE1BM$IN" role="3uHU7w">
<node concept="2OqwBi" id="3OUB6BCcAbv" role="2Oq$k0">
<node concept="37vLTw" id="3OUB6BCcAbY" role="2Oq$k0">
<ref role="3cqZAo" node="3OUB6BCcAbW" resolve="rule" />
</node>
<node concept="liA8E" id="7ElRE1BM$tJ" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
</node>
</node>
<node concept="liA8E" id="3OUB6BCcAbx" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Rule.tag()" resolve="tag" />
<node concept="liA8E" id="7ElRE1BM_4g" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Rule$Tag.name()" resolve="name" />
</node>
</node>
</node>
@ -3889,22 +3913,27 @@
<property role="Xl_RC" value=" and " />
</node>
</node>
<node concept="2OqwBi" id="3OUB6BCcAbz" role="3uHU7w">
<node concept="3EllGN" id="3OUB6BCcAb$" role="2Oq$k0">
<node concept="2OqwBi" id="3OUB6BCcAb_" role="3ElVtu">
<node concept="37vLTw" id="3OUB6BCcAc1" role="2Oq$k0">
<ref role="3cqZAo" node="3OUB6BCcAbW" resolve="rule" />
<node concept="2OqwBi" id="7ElRE1BM_s0" role="3uHU7w">
<node concept="2OqwBi" id="3OUB6BCcAbz" role="2Oq$k0">
<node concept="3EllGN" id="3OUB6BCcAb$" role="2Oq$k0">
<node concept="2OqwBi" id="3OUB6BCcAb_" role="3ElVtu">
<node concept="37vLTw" id="3OUB6BCcAc1" role="2Oq$k0">
<ref role="3cqZAo" node="3OUB6BCcAbW" resolve="rule" />
</node>
<node concept="liA8E" id="3OUB6BCcAbB" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
</node>
</node>
<node concept="liA8E" id="3OUB6BCcAbB" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
<node concept="37vLTw" id="3OUB6BCcAbC" role="3ElQJh">
<ref role="3cqZAo" node="1N8$BG_2NH_" resolve="tag2rule" />
</node>
</node>
<node concept="37vLTw" id="3OUB6BCcAbC" role="3ElQJh">
<ref role="3cqZAo" node="1N8$BG_2NH_" resolve="tag2rule" />
<node concept="liA8E" id="7ElRE1BM_9K" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
</node>
</node>
<node concept="liA8E" id="3OUB6BCcAbD" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Rule.tag()" resolve="tag" />
<node concept="liA8E" id="7ElRE1BM_PU" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Rule$Tag.name()" resolve="name" />
</node>
</node>
</node>
@ -4028,12 +4057,17 @@
<node concept="1bVj0M" id="6tXRJZa$Adm" role="23t8la">
<node concept="3clFbS" id="6tXRJZa$Adn" role="1bW5cS">
<node concept="3clFbF" id="6tXRJZa$Ado" role="3cqZAp">
<node concept="2OqwBi" id="6tXRJZa$Adp" role="3clFbG">
<node concept="37vLTw" id="6tXRJZa$Adq" role="2Oq$k0">
<ref role="3cqZAo" node="6tXRJZa$Ads" resolve="it" />
<node concept="0kSF2" id="6KCGZaSyiRH" role="3clFbG">
<node concept="3uibUv" id="6KCGZaSyjgR" role="0kSFW">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
<node concept="liA8E" id="6tXRJZa$Adr" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
<node concept="2OqwBi" id="6tXRJZa$Adp" role="0kSFX">
<node concept="37vLTw" id="6tXRJZa$Adq" role="2Oq$k0">
<ref role="3cqZAo" node="6tXRJZa$Ads" resolve="it" />
</node>
<node concept="liA8E" id="6tXRJZa$Adr" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
</node>
</node>
</node>
</node>
@ -4167,10 +4201,6 @@
<node concept="2tJIrI" id="4MqhgXUNBTW" role="jymVt" />
<node concept="3clFb_" id="4MqhgXUNDLG" role="jymVt">
<property role="TrG5h" value="buildPlan" />
<node concept="3uibUv" id="1XKnVPvVj6" role="3clF45">
<ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
</node>
<node concept="3Tm6S6" id="1XKnVPgiq6" role="1B3o_S" />
<node concept="3clFbS" id="4MqhgXUNDLK" role="3clF47">
<node concept="3cpWs8" id="1XKnVPw9A4" role="3cqZAp">
<node concept="3cpWsn" id="1XKnVPw9A5" role="3cpWs9">
@ -4668,6 +4698,10 @@
</node>
</node>
</node>
<node concept="3Tm6S6" id="1XKnVPgiq6" role="1B3o_S" />
<node concept="3uibUv" id="1XKnVPvVj6" role="3clF45">
<ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
</node>
<node concept="37vLTG" id="1XKnVPt8iN" role="3clF46">
<property role="TrG5h" value="plan" />
<node concept="3uibUv" id="1XKnVPt8iM" role="1tU5fm">
@ -4882,21 +4916,21 @@
<property role="TrG5h" value="rulePlanBuilders" />
<node concept="3Tm6S6" id="7DvO2M9Uaih" role="1B3o_S" />
<node concept="3rvAFt" id="7DvO2M9Uaii" role="1tU5fm">
<node concept="3uibUv" id="1XKnVP758O" role="3rvQeY">
<ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RuleTable" />
</node>
<node concept="3uibUv" id="7DvO2M9Uaik" role="3rvSg0">
<ref role="3uigEE" node="4MqhgXUMauK" resolve="RulesPlanHandler.PlanBuilder" />
</node>
<node concept="3uibUv" id="1XKnVP758O" role="3rvQeY">
<ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RuleTable" />
</node>
</node>
<node concept="2ShNRf" id="7DvO2M9Uail" role="33vP2m">
<node concept="3rGOSV" id="7DvO2M9Uaim" role="2ShVmc">
<node concept="3uibUv" id="1XKnVP7f3U" role="3rHrn6">
<ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RuleTable" />
</node>
<node concept="3uibUv" id="7DvO2M9Uaio" role="3rHtpV">
<ref role="3uigEE" node="4MqhgXUMauK" resolve="RulesPlanHandler.PlanBuilder" />
</node>
<node concept="3uibUv" id="1XKnVP7f3U" role="3rHrn6">
<ref role="3uigEE" to="i348:4MqhgXU9fm3" resolve="RuleTable" />
</node>
</node>
</node>
</node>
@ -4904,21 +4938,21 @@
<property role="TrG5h" value="queryPlanBuilders" />
<node concept="3Tm6S6" id="6OXbTDy15hc" role="1B3o_S" />
<node concept="3rvAFt" id="6OXbTDy15UP" role="1tU5fm">
<node concept="3uibUv" id="1XKnVP5yWX" role="3rvQeY">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
<node concept="3uibUv" id="6OXbTDzvogx" role="3rvSg0">
<ref role="3uigEE" node="4MqhgXUMauK" resolve="RulesPlanHandler.PlanBuilder" />
</node>
<node concept="3uibUv" id="1XKnVP5yWX" role="3rvQeY">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
</node>
<node concept="2ShNRf" id="6OXbTDy164P" role="33vP2m">
<node concept="3rGOSV" id="6OXbTDy163E" role="2ShVmc">
<node concept="3uibUv" id="1XKnVP5ABa" role="3rHrn6">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
<node concept="3uibUv" id="6OXbTDzvor7" role="3rHtpV">
<ref role="3uigEE" node="4MqhgXUMauK" resolve="RulesPlanHandler.PlanBuilder" />
</node>
<node concept="3uibUv" id="1XKnVP5ABa" role="3rHrn6">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
</node>
</node>
</node>
@ -7633,10 +7667,10 @@
</node>
</node>
<node concept="2OqwBi" id="tIwzd1MM1F" role="2$JKZa">
<node concept="3GX2aA" id="tIwzd1MM1H" role="2OqNvi" />
<node concept="37vLTw" id="5NUR$OpFNq" role="2Oq$k0">
<ref role="3cqZAo" node="5NUR$OpuiG" resolve="allRequired" />
</node>
<node concept="3GX2aA" id="tIwzd1MM1H" role="2OqNvi" />
</node>
</node>
<node concept="3clFbH" id="6i42QSstmT1" role="3cqZAp" />
@ -13168,7 +13202,7 @@
<node concept="3clFbF" id="7ItWvj6Y$KL" role="3cqZAp">
<node concept="2OqwBi" id="7ItWvj6YAxH" role="3clFbG">
<node concept="37vLTw" id="7ItWvj6Y$KJ" role="2Oq$k0">
<ref role="3cqZAo" node="6nFpYlu7tZj" resolve="changeSetClosure" />
<ref role="3cqZAo" node="6nFpYlu7tZj" resolve="closure" />
</node>
<node concept="3dhRuq" id="7ItWvj6YB2M" role="2OqNvi">
<node concept="10Nm6u" id="7ItWvj6YC40" role="25WWJ7" />
@ -15446,25 +15480,17 @@
</node>
</node>
<node concept="3cpWs6" id="7L9cSENHDNY" role="3cqZAp">
<node concept="2OqwBi" id="7L9cSENI27_" role="3cqZAk">
<node concept="2OqwBi" id="7ElRE1BMpq9" role="3cqZAk">
<node concept="2OqwBi" id="7L9cSENHVsE" role="2Oq$k0">
<node concept="37vLTw" id="7L9cSENHTYK" role="2Oq$k0">
<ref role="3cqZAo" node="7L9cSENH$qV" resolve="rex" />
</node>
<node concept="liA8E" id="7L9cSENI74N" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Rule.tag()" resolve="tag" />
<node concept="liA8E" id="7ElRE1BMggV" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
</node>
</node>
<node concept="liA8E" id="7L9cSENI35Q" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
<node concept="2OqwBi" id="7L9cSENI9EP" role="37wK5m">
<node concept="37vLTw" id="7L9cSENI92n" role="2Oq$k0">
<ref role="3cqZAo" node="7L9cSENH$qV" resolve="rex" />
</node>
<node concept="liA8E" id="7L9cSENIa6k" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
</node>
</node>
<node concept="liA8E" id="e$ws1zVXy2" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Rule$Tag.stable()" resolve="stable" />
</node>
</node>
</node>

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

@ -655,10 +655,6 @@
<property role="TrG5h" value="demoModel" />
<node concept="H_c77" id="WJTIIoU30U" role="1tU5fm" />
</node>
<node concept="37vLTG" id="1XKnVQd8KO" role="3clF46">
<property role="TrG5h" value="unit" />
<node concept="3Tqbb2" id="1XKnVQd9WY" role="1tU5fm" />
</node>
<node concept="3cqZAl" id="WJTIIoU0Dn" role="3clF45" />
<node concept="3Tm1VV" id="WJTIIoU0Do" role="1B3o_S" />
<node concept="3clFbS" id="WJTIIoU0Dp" role="3clF47">
@ -722,6 +718,10 @@
</node>
</node>
</node>
<node concept="37vLTG" id="1XKnVQd8KO" role="3clF46">
<property role="TrG5h" value="unit" />
<node concept="3Tqbb2" id="1XKnVQd9WY" role="1tU5fm" />
</node>
</node>
<node concept="2tJIrI" id="tyIfzC0ZQK" role="jymVt" />
<node concept="3clFbW" id="tyIfzC0ZVq" role="jymVt">
@ -1738,12 +1738,12 @@
<ref role="3cqZAo" node="WJTIIoYvBn" resolve="invalidNodes" />
</node>
<node concept="2OqwBi" id="WJTIIoYxSj" role="37wK5m">
<node concept="37vLTw" id="4J__M6YPmD" role="2Oq$k0">
<ref role="3cqZAo" node="4J__M6YPm_" resolve="evaluationResult" />
</node>
<node concept="liA8E" id="WJTIIoYyhH" role="2OqNvi">
<ref role="37wK5l" to="w7la:~EvaluationResult.invalidFeedbackKeys()" resolve="invalidFeedbackKeys" />
</node>
<node concept="37vLTw" id="4J__M6YPmD" role="2Oq$k0">
<ref role="3cqZAo" node="4J__M6YPm_" resolve="evaluationResult" />
</node>
</node>
</node>
</node>
@ -4336,12 +4336,17 @@
<node concept="2ShNRf" id="MSv3owe_Uk" role="33vP2m">
<node concept="1pGfFk" id="MSv3oweBtW" role="2ShVmc">
<ref role="37wK5l" to="wyt6:~StringBuilder.&lt;init&gt;(java.lang.String)" resolve="StringBuilder" />
<node concept="2OqwBi" id="MSv3oweIvg" role="37wK5m">
<node concept="37vLTw" id="MSv3oweIpf" role="2Oq$k0">
<ref role="3cqZAo" node="MSv3owey_W" resolve="rule" />
<node concept="2OqwBi" id="7ElRE1BMcrv" role="37wK5m">
<node concept="2OqwBi" id="MSv3oweIvg" role="2Oq$k0">
<node concept="37vLTw" id="MSv3oweIpf" role="2Oq$k0">
<ref role="3cqZAo" node="MSv3owey_W" resolve="rule" />
</node>
<node concept="liA8E" id="7ElRE1BMagR" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
</node>
</node>
<node concept="liA8E" id="MSv3oweIBF" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Rule.tag()" resolve="tag" />
<node concept="liA8E" id="7ElRE1BMesf" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Rule$Tag.name()" resolve="name" />
</node>
</node>
</node>
@ -8110,7 +8115,7 @@
</node>
</node>
<node concept="liA8E" id="6jc_YgcSa4m" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
<ref role="37wK5l" to="av0y:~Rule$Tag.toString()" resolve="toString" />
</node>
</node>
<node concept="liA8E" id="6jc_YgcSdOi" role="2OqNvi">
@ -8256,7 +8261,7 @@
</node>
</node>
<node concept="liA8E" id="6jc_YgcT5hq" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
<ref role="37wK5l" to="av0y:~Rule$Tag.toString()" resolve="toString" />
</node>
</node>
<node concept="liA8E" id="6jc_YgcT5hr" role="2OqNvi">
@ -8488,9 +8493,6 @@
<node concept="3cpWs8" id="6jc_YgcOWox" role="3cqZAp">
<node concept="3cpWsn" id="6jc_YgcOWoy" role="3cpWs9">
<property role="TrG5h" value="prog" />
<node concept="3uibUv" id="4J__M6NhC7" role="1tU5fm">
<ref role="3uigEE" to="av0y:~Program" resolve="Program" />
</node>
<node concept="2OqwBi" id="6jc_YgcOX11" role="33vP2m">
<node concept="37vLTw" id="6jc_YgcOZO3" role="2Oq$k0">
<ref role="3cqZAo" node="6jc_YgcOZ2n" resolve="launcher" />
@ -8499,6 +8501,9 @@
<ref role="37wK5l" node="55idZnEz6lV" resolve="getProgram" />
</node>
</node>
<node concept="3uibUv" id="4J__M6NhC7" role="1tU5fm">
<ref role="3uigEE" to="av0y:~Program" resolve="Program" />
</node>
</node>
</node>
<node concept="3cpWs8" id="6jc_YgcPlbF" role="3cqZAp">

976
coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
View File

File diff suppressed because it is too large Load Diff

40
samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps
View File

@ -897,19 +897,17 @@
<node concept="1bVj0M" id="3FGJ5nvn1Qa" role="23t8la">
<node concept="3clFbS" id="3FGJ5nvn1Qb" role="1bW5cS">
<node concept="3clFbF" id="3FGJ5nvn1Yt" role="3cqZAp">
<node concept="2OqwBi" id="3FGJ5nvn28m" role="3clFbG">
<node concept="1eOMI4" id="cmlg9O801y" role="2Oq$k0">
<node concept="10QFUN" id="cmlg9O801x" role="1eOMHV">
<node concept="37vLTw" id="cmlg9O801w" role="10QFUP">
<ref role="3cqZAo" node="3FGJ5nvn1Qc" resolve="it" />
</node>
<node concept="3uibUv" id="cmlg9O80bD" role="10QFUM">
<ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
</node>
<node concept="2OqwBi" id="e$ws1zVjl2" role="3clFbG">
<node concept="2OqwBi" id="e$ws1zVi1A" role="2Oq$k0">
<node concept="37vLTw" id="e$ws1zVhHi" role="2Oq$k0">
<ref role="3cqZAo" node="3FGJ5nvn1Qc" resolve="it" />
</node>
<node concept="liA8E" id="e$ws1zVj2t" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
</node>
</node>
<node concept="liA8E" id="3FGJ5nvn2k_" role="2OqNvi">
<ref role="37wK5l" to="i348:~Rule.basetag()" resolve="basetag" />
<node concept="liA8E" id="e$ws1zVjBS" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Rule$Tag.groupName()" resolve="groupName" />
</node>
</node>
</node>
@ -1007,19 +1005,17 @@
<ref role="3cqZAo" node="3FGJ5nvmSHN" resolve="addedRulesTags" />
</node>
<node concept="TSZUe" id="3FGJ5nvmVEe" role="2OqNvi">
<node concept="2OqwBi" id="3FGJ5nvmW12" role="25WWJ7">
<node concept="1eOMI4" id="cmlg9O7ZEh" role="2Oq$k0">
<node concept="10QFUN" id="cmlg9O7ZEg" role="1eOMHV">
<node concept="37vLTw" id="cmlg9O7ZEf" role="10QFUP">
<ref role="3cqZAo" node="3FGJ5nvmTOj" resolve="rule" />
</node>
<node concept="3uibUv" id="cmlg9O7ZH8" role="10QFUM">
<ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
</node>
<node concept="2OqwBi" id="e$ws1zVkf2" role="25WWJ7">
<node concept="2OqwBi" id="e$ws1zVkf3" role="2Oq$k0">
<node concept="liA8E" id="e$ws1zVkf5" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Rule.uniqueTag()" resolve="uniqueTag" />
</node>
<node concept="37vLTw" id="e$ws1zVkL2" role="2Oq$k0">
<ref role="3cqZAo" node="3FGJ5nvmTOj" resolve="rule" />
</node>
</node>
<node concept="liA8E" id="3FGJ5nvmWo2" role="2OqNvi">
<ref role="37wK5l" to="i348:~Rule.basetag()" resolve="basetag" />
<node concept="liA8E" id="e$ws1zVkf6" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Rule$Tag.groupName()" resolve="groupName" />
</node>
</node>
</node>