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

Refactor: drop meaningless DataForm.asRoot (used symbolPath which is deprecated)

This commit is contained in:
Grigorii Kirgizov 2020-03-05 19:57:25 +03:00
parent f5f1fe3916
commit 92f95674b3
4 changed files with 43 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps
View File

@ -592,27 +592,6 @@
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="104EUzFORp5" role="jymVt" />
<node concept="3clFb_" id="2QE4RCGngWG" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="2aFKle" value="false" />
<property role="TrG5h" value="asRoot" />
<node concept="3Tm1VV" id="2QE4RCGngWI" role="1B3o_S" />
<node concept="3uibUv" id="2QE4RCGngWJ" role="3clF45">
<ref role="3uigEE" node="2xQ7eRAD2dj" resolve="Value" />
<node concept="16syzq" id="2QE4RCGniN8" role="11_B2D">
<ref role="16sUi3" node="1msb0mq99pI" resolve="V" />
</node>
</node>
<node concept="3clFbS" id="2QE4RCGngWM" role="3clF47">
<node concept="3clFbF" id="2QE4RCGnh_H" role="3cqZAp">
<node concept="Xjq3P" id="2QE4RCGnh_E" role="3clFbG" />
</node>
</node>
<node concept="2AHcQZ" id="2QE4RCGnsGc" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="dfChU1lUXr" role="jymVt" />
<node concept="3clFb_" id="dfChU1lVFI" role="jymVt">
<property role="1EzhhJ" value="false" />
@ -1787,41 +1766,6 @@
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="3OPtF02Txyh" role="jymVt" />
<node concept="3clFb_" id="2QE4RCGnBX_" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="2aFKle" value="false" />
<property role="TrG5h" value="asRoot" />
<node concept="3Tm1VV" id="2QE4RCGnBXB" role="1B3o_S" />
<node concept="3clFbS" id="2QE4RCGnBXH" role="3clF47">
<node concept="3clFbJ" id="2QE4RCGoefy" role="3cqZAp">
<node concept="3clFbS" id="2QE4RCGoefz" role="3clFbx">
<node concept="3cpWs6" id="2QE4RCGof2r" role="3cqZAp">
<node concept="Xjq3P" id="2QE4RCGofnH" role="3cqZAk" />
</node>
</node>
<node concept="2OqwBi" id="2QE4RCGoezs" role="3clFbw">
<node concept="liA8E" id="2QE4RCGoeKd" role="2OqNvi">
<ref role="37wK5l" node="2QE4RCGoaTQ" resolve="isRoot" />
</node>
<node concept="37vLTw" id="1OShD0HBYdl" role="2Oq$k0">
<ref role="3cqZAo" node="1R$Cm9qGTDj" resolve="symbolPath" />
</node>
</node>
</node>
<node concept="3clFbF" id="2QE4RCGogGp" role="3cqZAp">
<node concept="1rXfSq" id="2QE4RCGogGn" role="3clFbG">
<ref role="37wK5l" node="1bm7a6EYD0x" resolve="copyRecursively" />
</node>
</node>
</node>
<node concept="3uibUv" id="2QE4RCGnD6S" role="3clF45">
<ref role="3uigEE" node="1msb0mq9ID4" resolve="DataNode" />
</node>
<node concept="2AHcQZ" id="2QE4RCGnDKs" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="2QE4RCGnBiQ" role="jymVt" />
<node concept="3clFb_" id="dfChU1lNtX" role="jymVt">
<property role="1EzhhJ" value="false" />
@ -3592,24 +3536,6 @@
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="104EUzFOY5M" role="jymVt" />
<node concept="3clFb_" id="2QE4RCGnoHX" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="2aFKle" value="false" />
<property role="TrG5h" value="asRoot" />
<node concept="3Tm1VV" id="2QE4RCGnoHZ" role="1B3o_S" />
<node concept="3uibUv" id="2QE4RCGnuWO" role="3clF45">
<ref role="3uigEE" node="uNmovXiEd4" resolve="Variable" />
</node>
<node concept="3clFbS" id="2QE4RCGnoI6" role="3clF47">
<node concept="3clFbF" id="2QE4RCGnwae" role="3cqZAp">
<node concept="Xjq3P" id="2QE4RCGnwad" role="3clFbG" />
</node>
</node>
<node concept="2AHcQZ" id="2QE4RCGnr7N" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="dfChU1lZe6" role="jymVt" />
<node concept="3clFb_" id="dfChU1m0qM" role="jymVt">
<property role="1EzhhJ" value="false" />
@ -4192,16 +4118,6 @@
<node concept="3Tm1VV" id="3OPtF02Tjpu" role="1B3o_S" />
<node concept="3clFbS" id="3OPtF02Tjpv" role="3clF47" />
</node>
<node concept="2tJIrI" id="2QE4RCGnc53" role="jymVt" />
<node concept="3clFb_" id="2QE4RCGndD7" role="jymVt">
<property role="2aFKle" value="false" />
<property role="TrG5h" value="asRoot" />
<node concept="3clFbS" id="2QE4RCGndDa" role="3clF47" />
<node concept="3Tm1VV" id="2QE4RCGndDb" role="1B3o_S" />
<node concept="3uibUv" id="2QE4RCGndw1" role="3clF45">
<ref role="3uigEE" node="1bm7a6EXvsP" resolve="DataForm" />
</node>
</node>
<node concept="2tJIrI" id="dfChU1lDK8" role="jymVt" />
<node concept="3clFb_" id="dfChU1lFHl" role="jymVt">
<property role="TrG5h" value="attached" />

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

@ -252,7 +252,6 @@
<concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
<child id="8465538089690331502" name="body" index="TZ5H$" />
</concept>
<concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
<concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
<child id="8970989240999019149" name="part" index="1dT_Ay" />
</concept>
@ -1542,18 +1541,12 @@
<node concept="37vLTw" id="46l0wJhwl3q" role="37wK5m">
<ref role="3cqZAo" node="6MYr6JwRS$H" resolve="bvarLogical" />
</node>
<node concept="2OqwBi" id="6MYr6JwS1$k" role="37wK5m">
<node concept="Xjq3P" id="3gNap3frV2F" role="2Oq$k0" />
<node concept="liA8E" id="6MYr6JwS1$m" role="2OqNvi">
<ref role="37wK5l" node="3FIATxbQg$x" resolve="asRoot" />
<node concept="2OqwBi" id="6MYr6JwS1$n" role="37wK5m">
<node concept="37vLTw" id="6MYr6JwS1$o" role="2Oq$k0">
<ref role="3cqZAo" node="6SkxsMzDp28" resolve="bnd" />
</node>
<node concept="liA8E" id="6MYr6JwS1$p" role="2OqNvi">
<ref role="37wK5l" to="yt73:~Substitution$Binding.term()" resolve="term" />
</node>
</node>
<node concept="2OqwBi" id="6MYr6JwS1$n" role="37wK5m">
<node concept="37vLTw" id="6MYr6JwS1$o" role="2Oq$k0">
<ref role="3cqZAo" node="6SkxsMzDp28" resolve="bnd" />
</node>
<node concept="liA8E" id="6MYr6JwS1$p" role="2OqNvi">
<ref role="37wK5l" to="yt73:~Substitution$Binding.term()" resolve="term" />
</node>
</node>
</node>
@ -3957,14 +3950,8 @@
<ref role="3cqZAo" node="6xYPVrp_1P$" resolve="logical" />
</node>
</node>
<node concept="2OqwBi" id="2T1p0CFz6av" role="37wK5m">
<node concept="Xjq3P" id="3gNap3frV6S" role="2Oq$k0" />
<node concept="liA8E" id="2T1p0CFz6ax" role="2OqNvi">
<ref role="37wK5l" node="3FIATxbQg$x" resolve="asRoot" />
<node concept="37vLTw" id="2T1p0CFz6ay" role="37wK5m">
<ref role="3cqZAo" node="6xYPVrp_37O" resolve="bound" />
</node>
</node>
<node concept="37vLTw" id="4p5Sefk9MPc" role="37wK5m">
<ref role="3cqZAo" node="6xYPVrp_37O" resolve="bound" />
</node>
</node>
</node>
@ -4149,79 +4136,6 @@
</node>
</node>
</node>
<node concept="2tJIrI" id="1bm7a6EU93j" role="jymVt" />
<node concept="3clFb_" id="3FIATxbQg$x" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="TrG5h" value="asRoot" />
<node concept="37vLTG" id="3FIATxbQg$y" role="3clF46">
<property role="TrG5h" value="term" />
<node concept="16syzq" id="3FIATxbQg$z" role="1tU5fm">
<ref role="16sUi3" node="3FIATxbQg$A" resolve="TERM" />
</node>
</node>
<node concept="16syzq" id="3FIATxbQg$$" role="3clF45">
<ref role="16sUi3" node="3FIATxbQg$A" resolve="TERM" />
</node>
<node concept="3Tm6S6" id="3gNap3frRyq" role="1B3o_S" />
<node concept="16euLQ" id="3FIATxbQg$A" role="16eVyc">
<property role="TrG5h" value="TERM" />
<node concept="3uibUv" id="3FIATxbQg$B" role="3ztrMU">
<ref role="3uigEE" to="yt73:~Term" resolve="Term" />
</node>
</node>
<node concept="3clFbS" id="3FIATxbQg$C" role="3clF47">
<node concept="3clFbJ" id="3gNap3frQsX" role="3cqZAp">
<node concept="3clFbS" id="3gNap3frQsZ" role="3clFbx">
<node concept="3cpWs6" id="3gNap3frReU" role="3cqZAp">
<node concept="10QFUN" id="3gNap3frRf2" role="3cqZAk">
<node concept="2OqwBi" id="3gNap3frRf3" role="10QFUP">
<node concept="1eOMI4" id="3gNap3frRf4" role="2Oq$k0">
<node concept="10QFUN" id="3gNap3frRf5" role="1eOMHV">
<node concept="37vLTw" id="3gNap3frRf6" role="10QFUP">
<ref role="3cqZAo" node="3FIATxbQg$y" resolve="term" />
</node>
<node concept="3uibUv" id="3gNap3frRf7" role="10QFUM">
<ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
</node>
</node>
</node>
<node concept="liA8E" id="3gNap3frRf8" role="2OqNvi">
<ref role="37wK5l" to="6exd:2QE4RCGndD7" resolve="asRoot" />
</node>
</node>
<node concept="16syzq" id="3gNap3frRf9" role="10QFUM">
<ref role="16sUi3" node="3FIATxbQg$A" resolve="TERM" />
</node>
</node>
</node>
</node>
<node concept="2ZW3vV" id="3gNap3frRey" role="3clFbw">
<node concept="3uibUv" id="3gNap3frReD" role="2ZW6by">
<ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
</node>
<node concept="37vLTw" id="3gNap3frQtt" role="2ZW6bz">
<ref role="3cqZAo" node="3FIATxbQg$y" resolve="term" />
</node>
</node>
<node concept="9aQIb" id="3gNap3frRfF" role="9aQIa">
<node concept="3clFbS" id="3gNap3frRfG" role="9aQI4">
<node concept="3cpWs6" id="3gNap3frRfX" role="3cqZAp">
<node concept="37vLTw" id="3gNap3frRgg" role="3cqZAk">
<ref role="3cqZAo" node="3FIATxbQg$y" resolve="term" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="P$JXv" id="3gNap3frRgA" role="lGtFl">
<node concept="TZ5HA" id="3gNap3frRgB" role="TZ5H$">
<node concept="1dT_AC" id="3gNap3frRgC" role="1dT_Ay">
<property role="1dT_AB" value="Type-safe asRoot operation. Copies a data form, otherwise returns the passed parameter." />
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="3gNap3frX0L" role="jymVt" />
<node concept="3clFb_" id="3FIATxbQg$N" role="jymVt">
<property role="1EzhhJ" value="false" />

16
coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
View File

@ -2264,8 +2264,8 @@
<node concept="37vLTw" id="5_6ImQYY0r2" role="2Oq$k0">
<ref role="3cqZAo" node="5_6ImQYXLKw" resolve="bar" />
</node>
<node concept="liA8E" id="5_6ImQYY0r3" role="2OqNvi">
<ref role="37wK5l" to="6exd:2QE4RCGndD7" resolve="asRoot" />
<node concept="liA8E" id="4p5Sefk5CPN" role="2OqNvi">
<ref role="37wK5l" to="6exd:1bm7a6EXvNI" resolve="copyRecursively" />
</node>
</node>
</node>
@ -2276,8 +2276,8 @@
<node concept="37vLTw" id="5_6ImQYY0r7" role="2Oq$k0">
<ref role="3cqZAo" node="5_6ImQYXLLI" resolve="bazz" />
</node>
<node concept="liA8E" id="5_6ImQYY0r8" role="2OqNvi">
<ref role="37wK5l" to="6exd:2QE4RCGndD7" resolve="asRoot" />
<node concept="liA8E" id="4p5Sefk5DsU" role="2OqNvi">
<ref role="37wK5l" to="6exd:1bm7a6EXvNI" resolve="copyRecursively" />
</node>
</node>
</node>
@ -6844,8 +6844,8 @@
</node>
<node concept="3vlDli" id="3t7_2FgLjnc" role="3cqZAp">
<node concept="2OqwBi" id="3t7_2FgLjnd" role="3tpDZB">
<node concept="liA8E" id="3t7_2FgLjne" role="2OqNvi">
<ref role="37wK5l" to="6exd:2QE4RCGndD7" resolve="asRoot" />
<node concept="liA8E" id="4p5Sefk5Fku" role="2OqNvi">
<ref role="37wK5l" to="6exd:1bm7a6EXvNI" resolve="copyRecursively" />
</node>
<node concept="2OqwBi" id="3t7_2FgLjnf" role="2Oq$k0">
<node concept="2OqwBi" id="3t7_2FgLjng" role="2Oq$k0">
@ -7200,8 +7200,8 @@
</node>
<node concept="3vlDli" id="3t7_2FgLav2" role="3cqZAp">
<node concept="2OqwBi" id="3t7_2FgLav3" role="3tpDZB">
<node concept="liA8E" id="3t7_2FgLav4" role="2OqNvi">
<ref role="37wK5l" to="6exd:2QE4RCGndD7" resolve="asRoot" />
<node concept="liA8E" id="4p5Sefk5FxR" role="2OqNvi">
<ref role="37wK5l" to="6exd:1bm7a6EXvNI" resolve="copyRecursively" />
</node>
<node concept="2OqwBi" id="3t7_2FgLgpZ" role="2Oq$k0">
<node concept="2OqwBi" id="3t7_2FgLgiw" role="2Oq$k0">

79
samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
View File

@ -28348,20 +28348,15 @@
<node concept="3clFbS" id="5H6hZahszJl" role="2LFqv$">
<node concept="3clFbF" id="5H6hZahszJm" role="3cqZAp">
<node concept="37vLTI" id="5H6hZahszJn" role="3clFbG">
<node concept="2OqwBi" id="5H6hZahszJo" role="37vLTx">
<node concept="2OqwBi" id="5H6hZahszJp" role="2Oq$k0">
<node concept="37vLTw" id="5H6hZahszJq" role="2Oq$k0">
<ref role="3cqZAo" node="5H6hZahoMRV" resolve="components" />
</node>
<node concept="liA8E" id="5H6hZahszJr" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
<node concept="37vLTw" id="5H6hZahszJs" role="37wK5m">
<ref role="3cqZAo" node="5H6hZahszJx" resolve="i" />
</node>
</node>
<node concept="2OqwBi" id="5H6hZahszJp" role="37vLTx">
<node concept="37vLTw" id="5H6hZahszJq" role="2Oq$k0">
<ref role="3cqZAo" node="5H6hZahoMRV" resolve="components" />
</node>
<node concept="liA8E" id="5H6hZahszJt" role="2OqNvi">
<ref role="37wK5l" to="6exd:2QE4RCGndD7" resolve="asRoot" />
<node concept="liA8E" id="5H6hZahszJr" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
<node concept="37vLTw" id="5H6hZahszJs" role="37wK5m">
<ref role="3cqZAo" node="5H6hZahszJx" resolve="i" />
</node>
</node>
</node>
<node concept="AH0OO" id="5H6hZahszJu" role="37vLTJ">
@ -29642,13 +29637,8 @@
</node>
<node concept="3clFbF" id="290YF3OMFMJ" role="3cqZAp">
<node concept="37vLTI" id="290YF3OMFMK" role="3clFbG">
<node concept="2OqwBi" id="290YF3OMFML" role="37vLTx">
<node concept="37vLTw" id="290YF3OMFMM" role="2Oq$k0">
<ref role="3cqZAo" node="3KV3FXjZDHt" resolve="nextLeft" />
</node>
<node concept="liA8E" id="290YF3OMFMN" role="2OqNvi">
<ref role="37wK5l" to="6exd:2QE4RCGndD7" resolve="asRoot" />
</node>
<node concept="37vLTw" id="290YF3OMFMM" role="37vLTx">
<ref role="3cqZAo" node="3KV3FXjZDHt" resolve="nextLeft" />
</node>
<node concept="37vLTw" id="290YF3OMFMO" role="37vLTJ">
<ref role="3cqZAo" node="3KV3FXjZDHn" resolve="lastLeftMatch" />
@ -29657,13 +29647,8 @@
</node>
<node concept="3clFbF" id="29MBl1AcxL2" role="3cqZAp">
<node concept="37vLTI" id="29MBl1Acyep" role="3clFbG">
<node concept="2OqwBi" id="29MBl1Acyyy" role="37vLTx">
<node concept="37vLTw" id="29MBl1Acyj9" role="2Oq$k0">
<ref role="3cqZAo" node="3KV3FXjZDHz" resolve="nextRight" />
</node>
<node concept="liA8E" id="29MBl1AcyL_" role="2OqNvi">
<ref role="37wK5l" to="6exd:2QE4RCGndD7" resolve="asRoot" />
</node>
<node concept="37vLTw" id="29MBl1Acyj9" role="37vLTx">
<ref role="3cqZAo" node="3KV3FXjZDHz" resolve="nextRight" />
</node>
<node concept="37vLTw" id="29MBl1AcxL0" role="37vLTJ">
<ref role="3cqZAo" node="29MBl1AcwA0" resolve="lastRightMatch" />
@ -40530,20 +40515,15 @@
<node concept="3clFbS" id="1qY0I4bBJej" role="2LFqv$">
<node concept="3clFbF" id="1qY0I4bBJek" role="3cqZAp">
<node concept="37vLTI" id="1qY0I4bBJel" role="3clFbG">
<node concept="2OqwBi" id="1qY0I4bBJem" role="37vLTx">
<node concept="2OqwBi" id="1qY0I4bBJen" role="2Oq$k0">
<node concept="37vLTw" id="1qY0I4bBPwZ" role="2Oq$k0">
<ref role="3cqZAo" node="1qY0I4b_qSe" resolve="as" />
</node>
<node concept="liA8E" id="1qY0I4bBJep" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
<node concept="37vLTw" id="1qY0I4bBJeq" role="37wK5m">
<ref role="3cqZAo" node="1qY0I4bBJev" resolve="i" />
</node>
</node>
<node concept="2OqwBi" id="1qY0I4bBJen" role="37vLTx">
<node concept="37vLTw" id="1qY0I4bBPwZ" role="2Oq$k0">
<ref role="3cqZAo" node="1qY0I4b_qSe" resolve="as" />
</node>
<node concept="liA8E" id="1qY0I4bBJer" role="2OqNvi">
<ref role="37wK5l" to="6exd:2QE4RCGndD7" resolve="asRoot" />
<node concept="liA8E" id="1qY0I4bBJep" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
<node concept="37vLTw" id="1qY0I4bBJeq" role="37wK5m">
<ref role="3cqZAo" node="1qY0I4bBJev" resolve="i" />
</node>
</node>
</node>
<node concept="AH0OO" id="1qY0I4bBJes" role="37vLTJ">
@ -40587,20 +40567,15 @@
<node concept="3clFbS" id="1qY0I4bBK4_" role="2LFqv$">
<node concept="3clFbF" id="1qY0I4bBK4A" role="3cqZAp">
<node concept="37vLTI" id="1qY0I4bBK4B" role="3clFbG">
<node concept="2OqwBi" id="1qY0I4bBK4C" role="37vLTx">
<node concept="2OqwBi" id="1qY0I4bBK4D" role="2Oq$k0">
<node concept="liA8E" id="1qY0I4bBK4F" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
<node concept="37vLTw" id="1qY0I4bBK4G" role="37wK5m">
<ref role="3cqZAo" node="1qY0I4bBK4L" resolve="i" />
</node>
</node>
<node concept="37vLTw" id="1qY0I4bBQnx" role="2Oq$k0">
<ref role="3cqZAo" node="1qY0I4b_qSl" resolve="bs" />
<node concept="2OqwBi" id="1qY0I4bBK4D" role="37vLTx">
<node concept="liA8E" id="1qY0I4bBK4F" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
<node concept="37vLTw" id="1qY0I4bBK4G" role="37wK5m">
<ref role="3cqZAo" node="1qY0I4bBK4L" resolve="i" />
</node>
</node>
<node concept="liA8E" id="1qY0I4bBK4H" role="2OqNvi">
<ref role="37wK5l" to="6exd:2QE4RCGndD7" resolve="asRoot" />
<node concept="37vLTw" id="1qY0I4bBQnx" role="2Oq$k0">
<ref role="3cqZAo" node="1qY0I4b_qSl" resolve="bs" />
</node>
</node>
<node concept="AH0OO" id="1qY0I4bBK4I" role="37vLTJ">