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

Restore origin ref in RuleEx interface, fix terminology in templates API. 

To avoid confusion, a rule defines "target ref", which is supposed
to indicate the source code location for possible errors.
The origin node is to be referred as "origin" as before.
Temporarily rename OriginSpec's alias to "target" to reflect change
in semantics.
This commit is contained in:
Fedor Isakov 2020-02-17 11:53:04 +01:00
parent a8f3ed8d9a
commit 417fc45933
7 changed files with 256 additions and 252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -274,6 +274,9 @@
<child id="1163670677455" name="expression" index="3Kbmr1" />
<child id="1163670683720" name="body" index="3Kbo56" />
</concept>
<concept id="1206629501431" name="jetbrains.mps.baseLanguage.structure.InstanceInitializer" flags="lg" index="3KIgzJ">
<child id="1206629521979" name="statementList" index="3KIlGz" />
</concept>
<concept id="1208890769693" name="jetbrains.mps.baseLanguage.structure.ArrayLengthOperation" flags="nn" index="1Rwk04" />
<concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
<child id="1350122676458893092" name="text" index="3ndbpf" />
@ -830,7 +833,7 @@
<ref role="2rZz_L" to="tpee:fzclF84" resolve="ConstructorDeclaration" />
</node>
<node concept="2rT7sh" id="1laj_RSs33U" role="2rTMjI">
<property role="TrG5h" value="origin_variable" />
<property role="TrG5h" value="target_variable" />
<ref role="2rTdP9" to="wq2x:1laj_RSpLVV" resolve="OriginSpec" />
<ref role="2rZz_L" to="tpee:fzcpWvJ" resolve="LocalVariableDeclaration" />
</node>
@ -1456,7 +1459,7 @@
<node concept="3clFbS" id="1laj_RSrYWh" role="9aQI4">
<node concept="3cpWs8" id="1laj_RSrYWv" role="3cqZAp">
<node concept="3cpWsn" id="1laj_RSrYWy" role="3cpWs9">
<property role="TrG5h" value="origin" />
<property role="TrG5h" value="target" />
<node concept="3Tqbb2" id="1laj_RSrYWt" role="1tU5fm" />
<node concept="10Nm6u" id="1laj_RSs2Yd" role="33vP2m">
<node concept="1W57fq" id="3mytCjYVkdb" role="lGtFl">
@ -1495,7 +1498,7 @@
</node>
</node>
<node concept="2ZBi8u" id="1laj_RSs4oS" role="lGtFl">
<ref role="2rW$FS" node="1laj_RSs33U" resolve="origin_variable" />
<ref role="2rW$FS" node="1laj_RSs33U" resolve="target_variable" />
</node>
<node concept="17Uvod" id="1laj_RStXsv" role="lGtFl">
<property role="2qtEX9" value="name" />
@ -14236,7 +14239,7 @@
<ref role="1Pybhc" to="i8bi:5IkW5anFcyt" resolve="SNodeOperations" />
<node concept="10Nm6u" id="aZPZmIaAoE" role="37wK5m">
<node concept="1sPUBX" id="aZPZmIaAAV" role="lGtFl">
<ref role="v9R2y" node="1laj_RSpsVh" resolve="reportOrigin_node" />
<ref role="v9R2y" node="1laj_RSpsVh" resolve="reportTarget_node" />
</node>
</node>
</node>
@ -16124,7 +16127,7 @@
</node>
<node concept="jVnub" id="1laj_RSpsVh">
<property role="3GE5qa" value="rule" />
<property role="TrG5h" value="reportOrigin_node" />
<property role="TrG5h" value="reportTarget_node" />
<node concept="3aamgX" id="1laj_RStZlp" role="3aUrZf">
<property role="36QftV" value="true" />
<ref role="30HIoZ" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
@ -16133,13 +16136,13 @@
<node concept="3clFbS" id="1laj_RSu10f" role="9aQI4">
<node concept="3cpWs8" id="1laj_RSu10y" role="3cqZAp">
<node concept="3cpWsn" id="1laj_RSu10_" role="3cpWs9">
<property role="TrG5h" value="origin" />
<property role="TrG5h" value="target" />
<node concept="3Tqbb2" id="1laj_RSu10w" role="1tU5fm" />
</node>
</node>
<node concept="3cpWs6" id="2o8vGoPOQL6" role="3cqZAp">
<node concept="37vLTw" id="2o8vGoPOQOi" role="3cqZAk">
<ref role="3cqZAo" node="1laj_RSu10_" resolve="origin" />
<ref role="3cqZAo" node="1laj_RSu10_" resolve="target" />
<node concept="1ZhdrF" id="2o8vGoPOQOj" role="lGtFl">
<property role="2qtEX8" value="variableDeclaration" />
<property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
@ -16149,7 +16152,7 @@
<node concept="2OqwBi" id="2o8vGoPOQOn" role="3clFbG">
<node concept="1iwH7S" id="2o8vGoPOQOo" role="2Oq$k0" />
<node concept="1iwH70" id="2o8vGoPOQOp" role="2OqNvi">
<ref role="1iwH77" node="1laj_RSs33U" resolve="origin_variable" />
<ref role="1iwH77" node="1laj_RSs33U" resolve="target_variable" />
<node concept="2OqwBi" id="2o8vGoPOQOq" role="1iwH7V">
<node concept="30H73N" id="2o8vGoPOQOr" role="2Oq$k0" />
<node concept="2Xjw5R" id="2o8vGoPOQOs" role="2OqNvi">
@ -16192,110 +16195,12 @@
</node>
</node>
</node>
<node concept="3aamgX" id="1laj_RSpsXX" role="3aUrZf">
<property role="36QftV" value="true" />
<ref role="30HIoZ" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
<node concept="1Koe21" id="1laj_RSptA4" role="1lVwrX">
<node concept="9aQIb" id="3mytCjYVi71" role="1Koe22">
<node concept="3clFbS" id="3mytCjYVi72" role="9aQI4">
<node concept="3cpWs6" id="2o8vGoPORah" role="3cqZAp">
<node concept="2OqwBi" id="2o8vGoPORhe" role="3cqZAk">
<node concept="1rXfSq" id="2o8vGoPORhf" role="2Oq$k0">
<ref role="37wK5l" node="36tQV5AvM3Y" resolve="token" />
<node concept="1ZhdrF" id="2o8vGoPORhg" role="lGtFl">
<property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
<property role="2qtEX8" value="baseMethodDeclaration" />
<node concept="3$xsQk" id="2o8vGoPORhh" role="3$ytzL">
<node concept="3clFbS" id="2o8vGoPORhi" role="2VODD2">
<node concept="3clFbF" id="2o8vGoPORhj" role="3cqZAp">
<node concept="2OqwBi" id="2o8vGoPORhk" role="3clFbG">
<node concept="1iwH7S" id="2o8vGoPORhl" role="2Oq$k0" />
<node concept="1iwH70" id="2o8vGoPORhm" role="2OqNvi">
<ref role="1iwH77" node="36tQV5AugIl" resolve="template_token_this" />
<node concept="2OqwBi" id="2o8vGoPORhn" role="1iwH7V">
<node concept="30H73N" id="2o8vGoPORho" role="2Oq$k0" />
<node concept="2Xjw5R" id="2o8vGoPORhp" role="2OqNvi">
<node concept="1xMEDy" id="2o8vGoPORhq" role="1xVPHs">
<node concept="chp4Y" id="2o8vGoPORhr" role="ri$Ld">
<ref role="cht4Q" to="wq2x:6OXbTDyHcuD" resolve="Template" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2OwXpG" id="2o8vGoPORhs" role="2OqNvi">
<ref role="2Oxat5" node="36tQV5AoEVr" resolve="input" />
<node concept="1ZhdrF" id="2o8vGoPORht" role="lGtFl">
<property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1197029447546/1197029500499" />
<property role="2qtEX8" value="fieldDeclaration" />
<node concept="3$xsQk" id="2o8vGoPORhu" role="3$ytzL">
<node concept="3clFbS" id="2o8vGoPORhv" role="2VODD2">
<node concept="3clFbF" id="2o8vGoPORhw" role="3cqZAp">
<node concept="2OqwBi" id="2o8vGoPORhx" role="3clFbG">
<node concept="1iwH7S" id="2o8vGoPORhy" role="2Oq$k0" />
<node concept="1iwH70" id="2o8vGoPORhz" role="2OqNvi">
<ref role="1iwH77" node="36tQV5Au3A_" resolve="ruletemplate_token_input" />
<node concept="2OqwBi" id="2o8vGoPORh$" role="1iwH7V">
<node concept="30H73N" id="2o8vGoPORh_" role="2Oq$k0" />
<node concept="2Xjw5R" id="2o8vGoPORhA" role="2OqNvi">
<node concept="1xMEDy" id="2o8vGoPORhB" role="1xVPHs">
<node concept="chp4Y" id="2o8vGoPORhC" role="ri$Ld">
<ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="raruj" id="2o8vGoPORoG" role="lGtFl" />
</node>
</node>
</node>
</node>
</node>
<node concept="30G5F_" id="1laj_RSpt9e" role="30HLyM">
<node concept="3clFbS" id="1laj_RSpt9f" role="2VODD2">
<node concept="3clFbF" id="1laj_RSptgN" role="3cqZAp">
<node concept="2OqwBi" id="1laj_RSptgO" role="3clFbG">
<node concept="2OqwBi" id="1laj_RSptgP" role="2Oq$k0">
<node concept="2OqwBi" id="1laj_RSptgQ" role="2Oq$k0">
<node concept="2OqwBi" id="1laj_RSptgR" role="2Oq$k0">
<node concept="30H73N" id="1laj_RSptgS" role="2Oq$k0" />
<node concept="2Xjw5R" id="1laj_RSptgT" role="2OqNvi">
<node concept="1xMEDy" id="1laj_RSptgU" role="1xVPHs">
<node concept="chp4Y" id="1laj_RSptgV" role="ri$Ld">
<ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
</node>
</node>
</node>
</node>
<node concept="3TrEf2" id="1laj_RSptgW" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:36tQV5AmIsx" resolve="input" />
</node>
</node>
<node concept="3TrEf2" id="1laj_RSptgX" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:5NuEpF1ihrB" resolve="input" />
</node>
</node>
<node concept="3x8VRR" id="1laj_RSptgY" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
<node concept="gft3U" id="1laj_RSpt95" role="jxRDz">
<node concept="10Nm6u" id="1laj_RSpt99" role="gfFT$" />
<node concept="10Nm6u" id="1laj_RSpt99" role="gfFT$">
<node concept="1sPUBX" id="6tnA467FItU" role="lGtFl">
<ref role="v9R2y" node="aZPZmI9WFp" resolve="origin_node" />
</node>
</node>
</node>
</node>
<node concept="13MO4I" id="2J$kxDHVnXC">
@ -16476,103 +16381,126 @@
<node concept="jVnub" id="aZPZmI9WFp">
<property role="3GE5qa" value="rule" />
<property role="TrG5h" value="origin_node" />
<node concept="3aamgX" id="aZPZmI9WFU" role="3aUrZf">
<node concept="3aamgX" id="6tnA467FHPL" role="3aUrZf">
<property role="36QftV" value="true" />
<ref role="30HIoZ" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
<node concept="1Koe21" id="aZPZmI9WFV" role="1lVwrX">
<node concept="9aQIb" id="aZPZmI9WFW" role="1Koe22">
<node concept="3clFbS" id="aZPZmI9WFX" role="9aQI4">
<node concept="3cpWs6" id="aZPZmI9WFY" role="3cqZAp">
<node concept="2OqwBi" id="aZPZmI9WFZ" role="3cqZAk">
<node concept="1rXfSq" id="aZPZmI9WG0" role="2Oq$k0">
<ref role="37wK5l" node="36tQV5AvM3Y" resolve="token" />
<node concept="1ZhdrF" id="aZPZmI9WG1" role="lGtFl">
<property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
<property role="2qtEX8" value="baseMethodDeclaration" />
<node concept="3$xsQk" id="aZPZmI9WG2" role="3$ytzL">
<node concept="3clFbS" id="aZPZmI9WG3" role="2VODD2">
<node concept="3clFbF" id="aZPZmI9WG4" role="3cqZAp">
<node concept="2OqwBi" id="aZPZmI9WG5" role="3clFbG">
<node concept="1iwH7S" id="aZPZmI9WG6" role="2Oq$k0" />
<node concept="1iwH70" id="aZPZmI9WG7" role="2OqNvi">
<ref role="1iwH77" node="36tQV5AugIl" resolve="template_token_this" />
<node concept="2OqwBi" id="aZPZmI9WG8" role="1iwH7V">
<node concept="30H73N" id="aZPZmI9WG9" role="2Oq$k0" />
<node concept="2Xjw5R" id="aZPZmI9WGa" role="2OqNvi">
<node concept="1xMEDy" id="aZPZmI9WGb" role="1xVPHs">
<node concept="chp4Y" id="aZPZmI9WGc" role="ri$Ld">
<ref role="cht4Q" to="wq2x:6OXbTDyHcuD" resolve="Template" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2OwXpG" id="aZPZmI9WGd" role="2OqNvi">
<ref role="2Oxat5" node="36tQV5AoEVr" resolve="input" />
<node concept="1ZhdrF" id="aZPZmI9WGe" role="lGtFl">
<property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1197029447546/1197029500499" />
<property role="2qtEX8" value="fieldDeclaration" />
<node concept="3$xsQk" id="aZPZmI9WGf" role="3$ytzL">
<node concept="3clFbS" id="aZPZmI9WGg" role="2VODD2">
<node concept="3clFbF" id="aZPZmI9WGh" role="3cqZAp">
<node concept="2OqwBi" id="aZPZmI9WGi" role="3clFbG">
<node concept="1iwH7S" id="aZPZmI9WGj" role="2Oq$k0" />
<node concept="1iwH70" id="aZPZmI9WGk" role="2OqNvi">
<ref role="1iwH77" node="36tQV5Au3A_" resolve="ruletemplate_token_input" />
<node concept="2OqwBi" id="aZPZmI9WGl" role="1iwH7V">
<node concept="30H73N" id="aZPZmI9WGm" role="2Oq$k0" />
<node concept="2Xjw5R" id="aZPZmI9WGn" role="2OqNvi">
<node concept="1xMEDy" id="aZPZmI9WGo" role="1xVPHs">
<node concept="chp4Y" id="aZPZmI9WGp" role="ri$Ld">
<ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="raruj" id="aZPZmI9WGq" role="lGtFl" />
<node concept="1Koe21" id="6tnA467FHPM" role="1lVwrX">
<node concept="312cEu" id="6tnA467FI0n" role="1Koe22">
<property role="TrG5h" value="Context" />
<node concept="312cEg" id="6tnA467FI0o" role="jymVt">
<property role="TrG5h" value="input" />
<node concept="3Tm6S6" id="6tnA467FI0p" role="1B3o_S" />
<node concept="3uibUv" id="6tnA467FI0q" role="1tU5fm">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
</node>
<node concept="3clFb_" id="6tnA467FI0r" role="jymVt">
<property role="TrG5h" value="token" />
<node concept="3uibUv" id="6tnA467FI0s" role="3clF45">
<ref role="3uigEE" node="6tnA467FI0n" resolve="Context" />
</node>
<node concept="3Tm6S6" id="6tnA467FI0t" role="1B3o_S" />
<node concept="3clFbS" id="6tnA467FI0u" role="3clF47">
<node concept="3clFbF" id="6tnA467FI0v" role="3cqZAp">
<node concept="10Nm6u" id="6tnA467FI0w" role="3clFbG" />
</node>
</node>
</node>
<node concept="3KIgzJ" id="6tnA467FI0x" role="jymVt">
<node concept="3clFbS" id="6tnA467FI0y" role="3KIlGz">
<node concept="3cpWs6" id="6tnA467FI0z" role="3cqZAp">
<node concept="2OqwBi" id="6tnA467FI0$" role="3cqZAk">
<node concept="1rXfSq" id="6tnA467FI0_" role="2Oq$k0">
<ref role="37wK5l" node="6tnA467FI0r" resolve="token" />
<node concept="1ZhdrF" id="6tnA467FI0A" role="lGtFl">
<property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
<property role="2qtEX8" value="baseMethodDeclaration" />
<node concept="3$xsQk" id="6tnA467FI0B" role="3$ytzL">
<node concept="3clFbS" id="6tnA467FI0C" role="2VODD2">
<node concept="3clFbF" id="6tnA467FI0D" role="3cqZAp">
<node concept="2OqwBi" id="6tnA467FI0E" role="3clFbG">
<node concept="1iwH7S" id="6tnA467FI0F" role="2Oq$k0" />
<node concept="1iwH70" id="6tnA467FI0G" role="2OqNvi">
<ref role="1iwH77" node="36tQV5AugIl" resolve="template_token_this" />
<node concept="2OqwBi" id="6tnA467FI0H" role="1iwH7V">
<node concept="30H73N" id="6tnA467FI0I" role="2Oq$k0" />
<node concept="2Xjw5R" id="6tnA467FI0J" role="2OqNvi">
<node concept="1xMEDy" id="6tnA467FI0K" role="1xVPHs">
<node concept="chp4Y" id="6tnA467FI0L" role="ri$Ld">
<ref role="cht4Q" to="wq2x:6OXbTDyHcuD" resolve="Template" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2OwXpG" id="6tnA467FI0M" role="2OqNvi">
<ref role="2Oxat5" node="6tnA467FI0o" resolve="input" />
<node concept="1ZhdrF" id="6tnA467FI0N" role="lGtFl">
<property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1197029447546/1197029500499" />
<property role="2qtEX8" value="fieldDeclaration" />
<node concept="3$xsQk" id="6tnA467FI0O" role="3$ytzL">
<node concept="3clFbS" id="6tnA467FI0P" role="2VODD2">
<node concept="3clFbF" id="6tnA467FI0Q" role="3cqZAp">
<node concept="2OqwBi" id="6tnA467FI0R" role="3clFbG">
<node concept="1iwH7S" id="6tnA467FI0S" role="2Oq$k0" />
<node concept="1iwH70" id="6tnA467FI0T" role="2OqNvi">
<ref role="1iwH77" node="36tQV5Au3A_" resolve="ruletemplate_token_input" />
<node concept="2OqwBi" id="6tnA467FI0U" role="1iwH7V">
<node concept="30H73N" id="6tnA467FI0V" role="2Oq$k0" />
<node concept="2Xjw5R" id="6tnA467FI0W" role="2OqNvi">
<node concept="1xMEDy" id="6tnA467FI0X" role="1xVPHs">
<node concept="chp4Y" id="6tnA467FI0Y" role="ri$Ld">
<ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="raruj" id="6tnA467FI0Z" role="lGtFl" />
</node>
</node>
</node>
</node>
<node concept="3Tm6S6" id="6tnA467FI10" role="1B3o_S" />
</node>
</node>
<node concept="30G5F_" id="aZPZmI9WGr" role="30HLyM">
<node concept="3clFbS" id="aZPZmI9WGs" role="2VODD2">
<node concept="3clFbF" id="aZPZmI9WGt" role="3cqZAp">
<node concept="2OqwBi" id="aZPZmI9WGu" role="3clFbG">
<node concept="2OqwBi" id="aZPZmI9WGv" role="2Oq$k0">
<node concept="2OqwBi" id="aZPZmI9WGw" role="2Oq$k0">
<node concept="2OqwBi" id="aZPZmI9WGx" role="2Oq$k0">
<node concept="30H73N" id="aZPZmI9WGy" role="2Oq$k0" />
<node concept="2Xjw5R" id="aZPZmI9WGz" role="2OqNvi">
<node concept="1xMEDy" id="aZPZmI9WG$" role="1xVPHs">
<node concept="chp4Y" id="aZPZmI9WG_" role="ri$Ld">
<node concept="30G5F_" id="6tnA467FHQi" role="30HLyM">
<node concept="3clFbS" id="6tnA467FHQj" role="2VODD2">
<node concept="3clFbF" id="6tnA467FHQk" role="3cqZAp">
<node concept="2OqwBi" id="6tnA467FHQl" role="3clFbG">
<node concept="2OqwBi" id="6tnA467FHQm" role="2Oq$k0">
<node concept="2OqwBi" id="6tnA467FHQn" role="2Oq$k0">
<node concept="2OqwBi" id="6tnA467FHQo" role="2Oq$k0">
<node concept="30H73N" id="6tnA467FHQp" role="2Oq$k0" />
<node concept="2Xjw5R" id="6tnA467FHQq" role="2OqNvi">
<node concept="1xMEDy" id="6tnA467FHQr" role="1xVPHs">
<node concept="chp4Y" id="6tnA467FHQs" role="ri$Ld">
<ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
</node>
</node>
</node>
</node>
<node concept="3TrEf2" id="aZPZmI9WGA" role="2OqNvi">
<node concept="3TrEf2" id="6tnA467FHQt" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:36tQV5AmIsx" resolve="input" />
</node>
</node>
<node concept="3TrEf2" id="aZPZmI9WGB" role="2OqNvi">
<node concept="3TrEf2" id="6tnA467FHQu" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:5NuEpF1ihrB" resolve="input" />
</node>
</node>
<node concept="3x8VRR" id="aZPZmI9WGC" role="2OqNvi" />
<node concept="3x8VRR" id="6tnA467FHQv" role="2OqNvi" />
</node>
</node>
</node>

2
coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
View File

@ -1382,7 +1382,7 @@
<property role="EcuMT" value="1534124788579507963" />
<property role="3GE5qa" value="rule" />
<property role="TrG5h" value="OriginSpec" />
<property role="34LRSv" value="origin" />
<property role="34LRSv" value="target" />
<ref role="1TJDcQ" to="tpee:fK9aQHR" resolve="BlockStatement" />
<node concept="1TJgyj" id="1laj_RSpMKx" role="1TKVEi">
<property role="IQ2ns" value="1534124788579511329" />

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

@ -8676,17 +8676,17 @@
<node concept="3clFbS" id="4ekZiHdPVxb" role="3clFbx">
<node concept="3clFbF" id="1laj_RTMJzh" role="3cqZAp">
<node concept="37vLTI" id="1laj_RTMJ$u" role="3clFbG">
<node concept="37vLTw" id="1laj_RTMJzf" role="37vLTJ">
<ref role="3cqZAo" node="1laj_RTMHGN" resolve="targetRef" />
</node>
<node concept="2OqwBi" id="1laj_RTMJJg" role="37vLTx">
<node concept="37vLTw" id="1laj_RTMJ__" role="2Oq$k0">
<ref role="3cqZAo" node="1laj_RSiJwS" resolve="rule" />
</node>
<node concept="liA8E" id="1laj_RTMJXt" role="2OqNvi">
<ref role="37wK5l" to="i348:7nPD14Ob4em" resolve="originRef" />
<ref role="37wK5l" to="i348:7nPD14Ob4em" resolve="targetRef" />
</node>
</node>
<node concept="37vLTw" id="1laj_RTMJzf" role="37vLTJ">
<ref role="3cqZAo" node="1laj_RTMHGN" resolve="targetRef" />
</node>
</node>
</node>
<node concept="3clFbF" id="4ekZiHdRx4A" role="3cqZAp">

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

@ -3036,15 +3036,20 @@
<node concept="3cpWs8" id="3o9wrC3VMgs" role="3cqZAp">
<node concept="3cpWsn" id="3o9wrC3VMgt" role="3cpWs9">
<property role="TrG5h" value="rule" />
<node concept="3uibUv" id="3o9wrC3VMgu" role="1tU5fm">
<ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
<node concept="3uibUv" id="6tnA467920x" role="1tU5fm">
<ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
</node>
<node concept="2OqwBi" id="3o9wrC3VMgv" role="33vP2m">
<node concept="37vLTw" id="3o9wrC3VMgw" role="2Oq$k0">
<ref role="3cqZAo" node="3o9wrC3VMgm" resolve="ruleMatch" />
<node concept="10QFUN" id="6tnA46791Of" role="33vP2m">
<node concept="2OqwBi" id="6tnA46791Oc" role="10QFUP">
<node concept="37vLTw" id="6tnA46791Od" role="2Oq$k0">
<ref role="3cqZAo" node="3o9wrC3VMgm" resolve="ruleMatch" />
</node>
<node concept="liA8E" id="6tnA46791Oe" role="2OqNvi">
<ref role="37wK5l" to="w7la:~RuleMatch.rule()" resolve="rule" />
</node>
</node>
<node concept="liA8E" id="3o9wrC3VMgx" role="2OqNvi">
<ref role="37wK5l" to="w7la:~RuleMatch.rule()" resolve="rule" />
<node concept="3uibUv" id="6tnA46791Wb" role="10QFUM">
<ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
</node>
</node>
</node>
@ -3143,24 +3148,17 @@
<node concept="3clFbS" id="4ekZiHdQ8r2" role="3clFbx">
<node concept="3clFbF" id="1laj_RTZcXG" role="3cqZAp">
<node concept="37vLTI" id="1laj_RTZcXI" role="3clFbG">
<node concept="2OqwBi" id="3o9wrC3VMid" role="37vLTx">
<node concept="1eOMI4" id="3o9wrC3VMie" role="2Oq$k0">
<node concept="10QFUN" id="3o9wrC3VMif" role="1eOMHV">
<node concept="3uibUv" id="3o9wrC3VMig" role="10QFUM">
<ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
</node>
<node concept="37vLTw" id="3o9wrC3VMih" role="10QFUP">
<ref role="3cqZAo" node="3o9wrC3VMgt" resolve="rule" />
</node>
</node>
</node>
<node concept="liA8E" id="3o9wrC3VMii" role="2OqNvi">
<ref role="37wK5l" to="i348:7nPD14Ob4em" resolve="originRef" />
</node>
</node>
<node concept="37vLTw" id="1laj_RTZcXM" role="37vLTJ">
<ref role="3cqZAo" node="3o9wrC3WcLt" resolve="targetRef" />
</node>
<node concept="2OqwBi" id="3o9wrC3VMid" role="37vLTx">
<node concept="37vLTw" id="6tnA467925_" role="2Oq$k0">
<ref role="3cqZAo" node="3o9wrC3VMgt" resolve="rule" />
</node>
<node concept="liA8E" id="3o9wrC3VMii" role="2OqNvi">
<ref role="37wK5l" to="i348:7nPD14Ob4em" resolve="targetRef" />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="4ekZiHdRyEu" role="3cqZAp">
@ -3169,15 +3167,8 @@
<ref role="3cqZAo" node="4ekZiHde8bF" resolve="templateRef" />
</node>
<node concept="2OqwBi" id="4ekZiHdRyZv" role="37vLTx">
<node concept="1eOMI4" id="4ekZiHdRyOa" role="2Oq$k0">
<node concept="10QFUN" id="4ekZiHdRyOb" role="1eOMHV">
<node concept="3uibUv" id="4ekZiHdRyOc" role="10QFUM">
<ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
</node>
<node concept="37vLTw" id="4ekZiHdRyOd" role="10QFUP">
<ref role="3cqZAo" node="3o9wrC3VMgt" resolve="rule" />
</node>
</node>
<node concept="37vLTw" id="6tnA46792CY" role="2Oq$k0">
<ref role="3cqZAo" node="3o9wrC3VMgt" resolve="rule" />
</node>
<node concept="liA8E" id="4ekZiHdRz8V" role="2OqNvi">
<ref role="37wK5l" to="i348:7nPD14Ob4lt" resolve="templateRef" />

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

@ -18490,8 +18490,8 @@
<node concept="37vLTw" id="6QkkSolKH$6" role="2Oq$k0">
<ref role="3cqZAo" node="6QkkSolKGTF" resolve="ruleEx" />
</node>
<node concept="liA8E" id="6QkkSolKH$7" role="2OqNvi">
<ref role="37wK5l" to="i348:7nPD14Ob4em" resolve="originRef" />
<node concept="liA8E" id="6tnA4678ZwI" role="2OqNvi">
<ref role="37wK5l" to="i348:6tnA4677QqC" resolve="originRef" />
</node>
</node>
</node>
@ -21392,8 +21392,8 @@
<node concept="37vLTw" id="6bBjpI8anRH" role="2Oq$k0">
<ref role="3cqZAo" node="6RFuZEC715N" resolve="ruleEx" />
</node>
<node concept="liA8E" id="6bBjpI8anRI" role="2OqNvi">
<ref role="37wK5l" to="i348:7nPD14Ob4em" resolve="originRef" />
<node concept="liA8E" id="6tnA4678XaQ" role="2OqNvi">
<ref role="37wK5l" to="i348:6tnA4677QqC" resolve="originRef" />
</node>
</node>
</node>

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

@ -2692,14 +2692,48 @@
<property role="TrG5h" value="RuleEx" />
<property role="1sVAO0" value="true" />
<node concept="2tJIrI" id="7nPD14OaO2C" role="jymVt" />
<node concept="3clFb_" id="7nPD14Ob4em" role="jymVt">
<node concept="3clFb_" id="6tnA4677QqC" role="jymVt">
<property role="1EzhhJ" value="true" />
<property role="TrG5h" value="originRef" />
<node concept="3uibUv" id="6tnA4677Qtx" role="3clF45">
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
</node>
<node concept="3Tm1VV" id="6tnA4677QqF" role="1B3o_S" />
<node concept="3clFbS" id="6tnA4677QqG" role="3clF47" />
<node concept="P$JXv" id="6tnA4677Qt4" role="lGtFl">
<node concept="TZ5HA" id="6tnA4677Qt5" role="TZ5H$">
<node concept="1dT_AC" id="6tnA4677Qt6" role="1dT_Ay">
<property role="1dT_AB" value="A reference to the node that was used as the origin to generate this rule. " />
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="6tnA4677Qqb" role="jymVt" />
<node concept="3clFb_" id="7nPD14Ob4em" role="jymVt">
<property role="TrG5h" value="targetRef" />
<property role="1EzhhJ" value="true" />
<node concept="3uibUv" id="6i42QSs9msQ" role="3clF45">
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
</node>
<node concept="3Tm1VV" id="7nPD14Ob4ep" role="1B3o_S" />
<node concept="3clFbS" id="7nPD14Ob4eq" role="3clF47" />
<node concept="P$JXv" id="6tnA466TYOV" role="lGtFl">
<node concept="TZ5HA" id="6tnA466TYOW" role="TZ5H$">
<node concept="1dT_AC" id="6tnA466TYOX" role="1dT_Ay">
<property role="1dT_AB" value="A reference to the target node for possible errors to be reported. " />
</node>
</node>
<node concept="TZ5HA" id="6tnA467FJQk" role="TZ5H$">
<node concept="1dT_AC" id="6tnA467FJQl" role="1dT_Ay">
<property role="1dT_AB" value="If not specified explicitly by the rule template, the origin node is assumed to be the target. " />
</node>
</node>
<node concept="TZ5HA" id="6tnA467FJQy" role="TZ5H$">
<node concept="1dT_AC" id="6tnA467FJQz" role="1dT_Ay">
<property role="1dT_AB" value="If specified to be null, the target is looked up from the evaluation context. " />
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="7nPD14Ob4kL" role="jymVt" />
<node concept="3clFb_" id="7nPD14Ob4lt" role="jymVt">
@ -2710,6 +2744,13 @@
</node>
<node concept="3Tm1VV" id="7nPD14Ob4lw" role="1B3o_S" />
<node concept="3clFbS" id="7nPD14Ob4lx" role="3clF47" />
<node concept="P$JXv" id="6tnA466TYPo" role="lGtFl">
<node concept="TZ5HA" id="6tnA466TYPp" role="TZ5H$">
<node concept="1dT_AC" id="6tnA466TYPq" role="1dT_Ay">
<property role="1dT_AB" value="A reference to the rule template. " />
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="cmlg9O80l2" role="jymVt" />
<node concept="3clFb_" id="~Rule.basetag()" role="jymVt">
@ -2835,7 +2876,7 @@
</node>
</node>
<node concept="37vLTG" id="aZPZmI9LKh" role="3clF46">
<property role="TrG5h" value="reportOriginRef" />
<property role="TrG5h" value="targetRef" />
<node concept="3uibUv" id="aZPZmIaCkS" role="1tU5fm">
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
</node>
@ -2911,12 +2952,12 @@
<node concept="3clFbF" id="aZPZmI9MtB" role="3cqZAp">
<node concept="37vLTI" id="aZPZmI9MZy" role="3clFbG">
<node concept="37vLTw" id="aZPZmI9N6b" role="37vLTx">
<ref role="3cqZAo" node="aZPZmI9LKh" resolve="reportOriginRef" />
<ref role="3cqZAo" node="aZPZmI9LKh" resolve="targetRef" />
</node>
<node concept="2OqwBi" id="aZPZmI9MAn" role="37vLTJ">
<node concept="Xjq3P" id="aZPZmI9Mt_" role="2Oq$k0" />
<node concept="2OwXpG" id="aZPZmI9MIs" role="2OqNvi">
<ref role="2Oxat5" node="aZPZmI9FOv" resolve="reportOriginRef" />
<ref role="2Oxat5" node="aZPZmI9FOv" resolve="targetRef" />
</node>
</node>
</node>
@ -4749,8 +4790,15 @@
<node concept="37vLTw" id="cmlg9NUDfU" role="37wK5m">
<ref role="3cqZAo" node="7nPD14Ob4vA" resolve="templateRef" />
</node>
<node concept="2YIFZM" id="6tnA4678cYq" role="37wK5m">
<ref role="37wK5l" to="i8bi:4o40NPkYQhu" resolve="getPointer" />
<ref role="1Pybhc" to="i8bi:5IkW5anFcyt" resolve="SNodeOperations" />
<node concept="37vLTw" id="6tnA4678d3H" role="37wK5m">
<ref role="3cqZAo" node="7nPD14Ob4B1" resolve="origin" />
</node>
</node>
<node concept="37vLTw" id="aZPZmIbQSG" role="37wK5m">
<ref role="3cqZAo" node="aZPZmI9FOv" resolve="reportOriginRef" />
<ref role="3cqZAo" node="aZPZmI9FOv" resolve="targetRef" />
</node>
<node concept="37vLTw" id="cmlg9NSlDE" role="37wK5m">
<ref role="3cqZAo" node="7eGEHDlc$e_" resolve="headKept" />
@ -5165,7 +5213,7 @@
</node>
</node>
<node concept="312cEg" id="aZPZmI9FOv" role="jymVt">
<property role="TrG5h" value="reportOriginRef" />
<property role="TrG5h" value="targetRef" />
<node concept="3Tm6S6" id="aZPZmI9AAC" role="1B3o_S" />
<node concept="3uibUv" id="aZPZmI9FHF" role="1tU5fm">
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
@ -5752,15 +5800,28 @@
</node>
</node>
</node>
<node concept="3clFbF" id="6tnA46781Cl" role="3cqZAp">
<node concept="37vLTI" id="6tnA46781Cn" role="3clFbG">
<node concept="2OqwBi" id="6tnA46784tw" role="37vLTJ">
<node concept="Xjq3P" id="6tnA46784K2" role="2Oq$k0" />
<node concept="2OwXpG" id="6tnA46784tz" role="2OqNvi">
<ref role="2Oxat5" node="6tnA46781Ch" resolve="originRef" />
</node>
</node>
<node concept="37vLTw" id="6tnA46781Cr" role="37vLTx">
<ref role="3cqZAo" node="6tnA4677Yt1" resolve="originRef" />
</node>
</node>
</node>
<node concept="3clFbF" id="cmlg9NUx15" role="3cqZAp">
<node concept="37vLTI" id="cmlg9NUx16" role="3clFbG">
<node concept="37vLTw" id="cmlg9NUx17" role="37vLTx">
<ref role="3cqZAo" node="cmlg9NUuZW" resolve="originRef" />
<ref role="3cqZAo" node="cmlg9NUuZW" resolve="targetRef" />
</node>
<node concept="2OqwBi" id="cmlg9NUx18" role="37vLTJ">
<node concept="Xjq3P" id="cmlg9NUx19" role="2Oq$k0" />
<node concept="2OwXpG" id="cmlg9NUx1a" role="2OqNvi">
<ref role="2Oxat5" node="cmlg9NR7Hz" resolve="originRef" />
<ref role="2Oxat5" node="cmlg9NR7Hz" resolve="targetRef" />
</node>
</node>
</node>
@ -5877,8 +5938,14 @@
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
</node>
</node>
<node concept="37vLTG" id="cmlg9NUuZW" role="3clF46">
<node concept="37vLTG" id="6tnA4677Yt1" role="3clF46">
<property role="TrG5h" value="originRef" />
<node concept="3uibUv" id="6tnA4677YY9" role="1tU5fm">
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
</node>
</node>
<node concept="37vLTG" id="cmlg9NUuZW" role="3clF46">
<property role="TrG5h" value="targetRef" />
<node concept="3uibUv" id="cmlg9NUuZX" role="1tU5fm">
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
</node>
@ -5950,8 +6017,26 @@
</node>
</node>
<node concept="2tJIrI" id="51V709l4dps" role="jymVt" />
<node concept="3clFb_" id="7nPD14Ob6b5" role="jymVt">
<node concept="3clFb_" id="6tnA4677TsO" role="jymVt">
<property role="TrG5h" value="originRef" />
<node concept="3uibUv" id="6tnA4677TsP" role="3clF45">
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
</node>
<node concept="3Tm1VV" id="6tnA4677TsQ" role="1B3o_S" />
<node concept="3clFbS" id="6tnA4677TsV" role="3clF47">
<node concept="3clFbF" id="6tnA46788y5" role="3cqZAp">
<node concept="37vLTw" id="6tnA46788y4" role="3clFbG">
<ref role="3cqZAo" node="6tnA46781Ch" resolve="originRef" />
</node>
</node>
</node>
<node concept="2AHcQZ" id="6tnA4677TsW" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="6tnA4677Wgw" role="jymVt" />
<node concept="3clFb_" id="7nPD14Ob6b5" role="jymVt">
<property role="TrG5h" value="targetRef" />
<property role="1EzhhJ" value="false" />
<node concept="3uibUv" id="6i42QSs9phk" role="3clF45">
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
@ -5960,7 +6045,7 @@
<node concept="3clFbS" id="7nPD14Ob6b9" role="3clF47">
<node concept="3clFbF" id="7nPD14Ob6E1" role="3cqZAp">
<node concept="37vLTw" id="cmlg9NRqmQ" role="3clFbG">
<ref role="3cqZAo" node="cmlg9NR7Hz" resolve="originRef" />
<ref role="3cqZAo" node="cmlg9NR7Hz" resolve="targetRef" />
</node>
</node>
</node>
@ -6299,17 +6384,17 @@
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
</node>
</node>
<node concept="312cEg" id="cmlg9NR7Hz" role="jymVt">
<node concept="312cEg" id="6tnA46781Ch" role="jymVt">
<property role="TrG5h" value="originRef" />
<node concept="3Tm6S6" id="cmlg9NR7H$" role="1B3o_S" />
<node concept="3uibUv" id="cmlg9NR7H_" role="1tU5fm">
<node concept="3Tm6S6" id="6tnA46781Ci" role="1B3o_S" />
<node concept="3uibUv" id="6tnA46781Ck" role="1tU5fm">
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
</node>
</node>
<node concept="312cEg" id="aZPZmIbBVY" role="jymVt">
<property role="TrG5h" value="reportRef" />
<node concept="3Tm6S6" id="aZPZmIb_tM" role="1B3o_S" />
<node concept="3uibUv" id="aZPZmIbBDV" role="1tU5fm">
<node concept="312cEg" id="cmlg9NR7Hz" role="jymVt">
<property role="TrG5h" value="targetRef" />
<node concept="3Tm6S6" id="cmlg9NR7H$" role="1B3o_S" />
<node concept="3uibUv" id="cmlg9NR7H_" role="1tU5fm">
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
</node>
</node>

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

@ -778,8 +778,8 @@
<ref role="3cqZAo" node="3FGJ5nvn8o2" resolve="it" />
</node>
</node>
<node concept="liA8E" id="3FGJ5nvnLBe" role="2OqNvi">
<ref role="37wK5l" to="i348:7nPD14Ob4em" resolve="originRef" />
<node concept="liA8E" id="6tnA46794bu" role="2OqNvi">
<ref role="37wK5l" to="i348:6tnA4677QqC" resolve="originRef" />
</node>
</node>
</node>
@ -794,8 +794,8 @@
<ref role="3cqZAo" node="3FGJ5nvn8o2" resolve="it" />
</node>
</node>
<node concept="liA8E" id="3FGJ5nvnBBk" role="2OqNvi">
<ref role="37wK5l" to="i348:7nPD14Ob4em" resolve="originRef" />
<node concept="liA8E" id="6tnA46794Iy" role="2OqNvi">
<ref role="37wK5l" to="i348:6tnA4677QqC" resolve="originRef" />
</node>
</node>
<node concept="liA8E" id="3FGJ5nvn8o0" role="2OqNvi">