Skip to content

Commit 5a5bf6d

Browse files
wsafonovwsafonov
committed
replaced node usages in string concatenations
* since MPS 2020.2 toString() for nodes doesn't call BaseConcept.getPresentation() internally, hence we need to do it manually (although for named nodes corresponding name is returned, we call getPresentation() in all cases for consistency)
1 parent cddc938 commit 5a5bf6d

File tree

25 files changed

+650
-257
lines changed

25 files changed

+650
-257
lines changed

‎code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/typesystem.mps‎

Lines changed: 83 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<import index="3eba" ref="r:be0c7a50-96d7-41ce-8522-0a6d4431fcc5(org.iets3.components.core.behavior)" />
1111
<import index="700h" ref="r:61b1de80-490d-4fee-8e95-b956503290e9(org.iets3.core.expr.collections.structure)" />
1212
<import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" />
13+
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
1314
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
1415
<import index="pbu6" ref="r:83e946de-2a7f-4a4c-b3c9-4f671aa7f2db(org.iets3.core.expr.base.behavior)" implicit="true" />
1516
<import index="yv47" ref="r:da65683e-ff6f-430d-ab68-32a77df72c93(org.iets3.core.expr.toplevel.structure)" implicit="true" />
@@ -374,16 +375,26 @@
374375
</node>
375376
<node concept="2Mj0R9" id="6LfBX8Yll1h" role="3cqZAp">
376377
<node concept="3cpWs3" id="6LfBX8YlmDF" role="2MkJ7o">
377-
<node concept="37vLTw" id="6LfBX8YlmFR" role="3uHU7w">
378-
<ref role="3cqZAo" node="6LfBX8Ylmgj" resolve="contextKind" />
378+
<node concept="2OqwBi" id="1br4Vy9oha" role="3uHU7w">
379+
<node concept="37vLTw" id="1br4Vy9ohb" role="2Oq$k0">
380+
<ref role="3cqZAo" node="6LfBX8Ylmgj" resolve="contextKind" />
381+
</node>
382+
<node concept="2qgKlT" id="1br4Vy9ohc" role="2OqNvi">
383+
<ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
384+
</node>
379385
</node>
380386
<node concept="3cpWs3" id="6LfBX8YlmrL" role="3uHU7B">
381387
<node concept="3cpWs3" id="6LfBX8YlmmD" role="3uHU7B">
382388
<node concept="Xl_RD" id="6LfBX8Ylm6p" role="3uHU7B">
383389
<property role="Xl_RC" value="kind " />
384390
</node>
385-
<node concept="37vLTw" id="6LfBX8YlmpQ" role="3uHU7w">
386-
<ref role="3cqZAo" node="6LfBX8Ylm9w" resolve="actualKind" />
391+
<node concept="2OqwBi" id="1br4Vy9ohH" role="3uHU7w">
392+
<node concept="37vLTw" id="1br4Vy9ohI" role="2Oq$k0">
393+
<ref role="3cqZAo" node="6LfBX8Ylm9w" resolve="actualKind" />
394+
</node>
395+
<node concept="2qgKlT" id="1br4Vy9ohJ" role="2OqNvi">
396+
<ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
397+
</node>
387398
</node>
388399
</node>
389400
<node concept="Xl_RD" id="6LfBX8YlmrO" role="3uHU7w">
@@ -1109,25 +1120,35 @@
11091120
<node concept="3clFbS" id="cJpacq1X9i" role="3clFbx">
11101121
<node concept="2MkqsV" id="cJpacq1X9j" role="3cqZAp">
11111122
<node concept="3cpWs3" id="7nsgDAXDIgc" role="2MkJ7o">
1112-
<node concept="2OqwBi" id="7nsgDAXDImI" role="3uHU7w">
1113-
<node concept="37vLTw" id="7nsgDAXDIgf" role="2Oq$k0">
1114-
<ref role="3cqZAo" node="7nsgDAXAPpv" resolve="g" />
1123+
<node concept="2OqwBi" id="1br4Vy9oge" role="3uHU7w">
1124+
<node concept="2OqwBi" id="1br4Vy9ogf" role="2Oq$k0">
1125+
<node concept="37vLTw" id="1br4Vy9ogg" role="2Oq$k0">
1126+
<ref role="3cqZAo" node="7nsgDAXAPpv" resolve="g" />
1127+
</node>
1128+
<node concept="3TrEf2" id="1br4Vy9ogh" role="2OqNvi">
1129+
<ref role="3Tt5mk" to="w9y2:6LfBX8YlAdM" resolve="type" />
1130+
</node>
11151131
</node>
1116-
<node concept="3TrEf2" id="7nsgDAXDI_j" role="2OqNvi">
1117-
<ref role="3Tt5mk" to="w9y2:6LfBX8YlAdM" resolve="type" />
1132+
<node concept="2qgKlT" id="1br4Vy9ogi" role="2OqNvi">
1133+
<ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
11181134
</node>
11191135
</node>
11201136
<node concept="3cpWs3" id="7nsgDAXDHYj" role="3uHU7B">
11211137
<node concept="3cpWs3" id="7nsgDAXDHtM" role="3uHU7B">
11221138
<node concept="Xl_RD" id="cJpacq1X9l" role="3uHU7B">
11231139
<property role="Xl_RC" value="port " />
11241140
</node>
1125-
<node concept="2OqwBi" id="7nsgDAXDHB5" role="3uHU7w">
1126-
<node concept="37vLTw" id="7nsgDAXDHyc" role="2Oq$k0">
1127-
<ref role="3cqZAo" node="7nsgDAXAPzA" resolve="o" />
1141+
<node concept="2OqwBi" id="1br4Vy9ogP" role="3uHU7w">
1142+
<node concept="2OqwBi" id="1br4Vy9ogQ" role="2Oq$k0">
1143+
<node concept="37vLTw" id="1br4Vy9ogR" role="2Oq$k0">
1144+
<ref role="3cqZAo" node="7nsgDAXAPzA" resolve="o" />
1145+
</node>
1146+
<node concept="3TrEf2" id="1br4Vy9ogS" role="2OqNvi">
1147+
<ref role="3Tt5mk" to="w9y2:6LfBX8YlAdM" resolve="type" />
1148+
</node>
11281149
</node>
1129-
<node concept="3TrEf2" id="7nsgDAXDHLL" role="2OqNvi">
1130-
<ref role="3Tt5mk" to="w9y2:6LfBX8YlAdM" resolve="type" />
1150+
<node concept="2qgKlT" id="1br4Vy9ogT" role="2OqNvi">
1151+
<ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
11311152
</node>
11321153
</node>
11331154
</node>
@@ -2119,12 +2140,17 @@
21192140
<node concept="3clFbS" id="6$fTUGAIeoU" role="3clFbx">
21202141
<node concept="2MkqsV" id="6$fTUGAImGI" role="3cqZAp">
21212142
<node concept="3cpWs3" id="6$fTUGAIDsX" role="2MkJ7o">
2122-
<node concept="2OqwBi" id="6$fTUGAIE6P" role="3uHU7w">
2123-
<node concept="1YBJjd" id="6$fTUGAIDKq" role="2Oq$k0">
2124-
<ref role="1YBMHb" node="6$fTUGAI82f" resolve="component" />
2143+
<node concept="2OqwBi" id="1br4Vy9oaN" role="3uHU7w">
2144+
<node concept="2OqwBi" id="1br4Vy9oaO" role="2Oq$k0">
2145+
<node concept="1YBJjd" id="1br4Vy9oaP" role="2Oq$k0">
2146+
<ref role="1YBMHb" node="6$fTUGAI82f" resolve="component" />
2147+
</node>
2148+
<node concept="3TrEf2" id="1br4Vy9oaQ" role="2OqNvi">
2149+
<ref role="3Tt5mk" to="w9y2:6LfBX8Yj9rR" resolve="kind" />
2150+
</node>
21252151
</node>
2126-
<node concept="3TrEf2" id="6$fTUGAIEHM" role="2OqNvi">
2127-
<ref role="3Tt5mk" to="w9y2:6LfBX8Yj9rR" resolve="kind" />
2152+
<node concept="2qgKlT" id="1br4Vy9oaR" role="2OqNvi">
2153+
<ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
21282154
</node>
21292155
</node>
21302156
<node concept="3cpWs3" id="6$fTUGAIC0m" role="3uHU7B">
@@ -2134,12 +2160,17 @@
21342160
<node concept="Xl_RD" id="6$fTUGAImT2" role="3uHU7B">
21352161
<property role="Xl_RC" value="Component of kind " />
21362162
</node>
2137-
<node concept="2OqwBi" id="6$fTUGAIxhR" role="3uHU7w">
2138-
<node concept="37vLTw" id="6$fTUGAIwLs" role="2Oq$k0">
2139-
<ref role="3cqZAo" node="6$fTUGAIu$2" resolve="enrichingComponent" />
2163+
<node concept="2OqwBi" id="1br4Vy9ofS" role="3uHU7w">
2164+
<node concept="2OqwBi" id="1br4Vy9ofT" role="2Oq$k0">
2165+
<node concept="37vLTw" id="1br4Vy9ofU" role="2Oq$k0">
2166+
<ref role="3cqZAo" node="6$fTUGAIu$2" resolve="enrichingComponent" />
2167+
</node>
2168+
<node concept="3TrEf2" id="1br4Vy9ofV" role="2OqNvi">
2169+
<ref role="3Tt5mk" to="w9y2:6LfBX8Yj9rR" resolve="kind" />
2170+
</node>
21402171
</node>
2141-
<node concept="3TrEf2" id="6$fTUGAIxDp" role="2OqNvi">
2142-
<ref role="3Tt5mk" to="w9y2:6LfBX8Yj9rR" resolve="kind" />
2172+
<node concept="2qgKlT" id="1br4Vy9ofW" role="2OqNvi">
2173+
<ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
21432174
</node>
21442175
</node>
21452176
</node>
@@ -2764,12 +2795,22 @@
27642795
</node>
27652796
<node concept="3cpWs6" id="3mxHOBiE_fx" role="3cqZAp">
27662797
<node concept="3cpWs3" id="3mxHOBiEHgi" role="3cqZAk">
2767-
<node concept="37vLTw" id="3mxHOBiEHSt" role="3uHU7w">
2768-
<ref role="3cqZAo" node="3mxHOBiEp8M" resolve="rightConfigType" />
2798+
<node concept="2OqwBi" id="1br4Vy9o22" role="3uHU7w">
2799+
<node concept="37vLTw" id="1br4Vy9o23" role="2Oq$k0">
2800+
<ref role="3cqZAo" node="3mxHOBiEp8M" resolve="rightConfigType" />
2801+
</node>
2802+
<node concept="2qgKlT" id="1br4Vy9o24" role="2OqNvi">
2803+
<ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
2804+
</node>
27692805
</node>
27702806
<node concept="3cpWs3" id="3mxHOBiEE7W" role="3uHU7B">
2771-
<node concept="37vLTw" id="3mxHOBiEDrc" role="3uHU7B">
2772-
<ref role="3cqZAo" node="3mxHOBiEoJC" resolve="leftConfigType" />
2807+
<node concept="2OqwBi" id="1br4Vy9o6H" role="3uHU7B">
2808+
<node concept="37vLTw" id="1br4Vy9o6I" role="2Oq$k0">
2809+
<ref role="3cqZAo" node="3mxHOBiEoJC" resolve="leftConfigType" />
2810+
</node>
2811+
<node concept="2qgKlT" id="1br4Vy9o6J" role="2OqNvi">
2812+
<ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
2813+
</node>
27732814
</node>
27742815
<node concept="Xl_RD" id="3mxHOBiEED1" role="3uHU7w">
27752816
<property role="Xl_RC" value=" is incompatible with " />
@@ -2781,12 +2822,22 @@
27812822
</node>
27822823
<node concept="3cpWs6" id="3mxHOBiEIr5" role="3cqZAp">
27832824
<node concept="3cpWs3" id="3mxHOBiEPBK" role="3cqZAk">
2784-
<node concept="37vLTw" id="3mxHOBiEPVZ" role="3uHU7w">
2785-
<ref role="3cqZAo" node="3mxHOBiEhqq" resolve="right" />
2825+
<node concept="2OqwBi" id="1br4Vy9o6S" role="3uHU7w">
2826+
<node concept="37vLTw" id="1br4Vy9o6T" role="2Oq$k0">
2827+
<ref role="3cqZAo" node="3mxHOBiEhqq" resolve="right" />
2828+
</node>
2829+
<node concept="2qgKlT" id="1br4Vy9o6U" role="2OqNvi">
2830+
<ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
2831+
</node>
27862832
</node>
27872833
<node concept="3cpWs3" id="3mxHOBiELN9" role="3uHU7B">
2788-
<node concept="37vLTw" id="3mxHOBiELkr" role="3uHU7B">
2789-
<ref role="3cqZAo" node="3mxHOBiEhpW" resolve="left" />
2834+
<node concept="2OqwBi" id="1br4Vy9oaB" role="3uHU7B">
2835+
<node concept="37vLTw" id="1br4Vy9oaC" role="2Oq$k0">
2836+
<ref role="3cqZAo" node="3mxHOBiEhpW" resolve="left" />
2837+
</node>
2838+
<node concept="2qgKlT" id="1br4Vy9oaD" role="2OqNvi">
2839+
<ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
2840+
</node>
27902841
</node>
27912842
<node concept="Xl_RD" id="3mxHOBiEM4d" role="3uHU7w">
27922843
<property role="Xl_RC" value=" is incompatible with " />

‎code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/typesystem.mps‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<import index="juu2" ref="r:197c9a7f-bef3-4d38-a48a-51524151fecf(org.iets3.core.base.plugin)" />
1212
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
1313
<import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" implicit="true" />
14+
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
1415
</imports>
1516
<registry>
1617
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -224,8 +225,13 @@
224225
<node concept="Xl_RD" id="3q2wVepy$J3" role="3uHU7B">
225226
<property role="Xl_RC" value="CHECKING RULE check_ICanRunCheckManually begin " />
226227
</node>
227-
<node concept="1YBJjd" id="3q2wVepyTr6" role="3uHU7w">
228-
<ref role="1YBMHb" node="2BX$1355fco" resolve="icrm" />
228+
<node concept="2OqwBi" id="1br4Vy9oi1" role="3uHU7w">
229+
<node concept="1YBJjd" id="1br4Vy9oi2" role="2Oq$k0">
230+
<ref role="1YBMHb" node="2BX$1355fco" resolve="icrm" />
231+
</node>
232+
<node concept="2qgKlT" id="1br4Vy9oi3" role="2OqNvi">
233+
<ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
234+
</node>
229235
</node>
230236
</node>
231237
<node concept="Xl_RD" id="2NazPIlIyoG" role="3uHU7w">

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7107,10 +7107,15 @@
71077107
<property role="Xl_RC" value="try " />
71087108
</node>
71097109
</node>
7110-
<node concept="2OqwBi" id="HywGhj856_" role="3uHU7w">
7111-
<node concept="13iPFW" id="HywGhj856A" role="2Oq$k0" />
7112-
<node concept="3TrEf2" id="HywGhj856B" role="2OqNvi">
7113-
<ref role="3Tt5mk" to="hm2y:5BNZGjBvVh4" resolve="expr" />
7110+
<node concept="2OqwBi" id="1br4Vy9oiF" role="3uHU7w">
7111+
<node concept="2OqwBi" id="1br4Vy9oiG" role="2Oq$k0">
7112+
<node concept="13iPFW" id="1br4Vy9oiH" role="2Oq$k0" />
7113+
<node concept="3TrEf2" id="1br4Vy9oiI" role="2OqNvi">
7114+
<ref role="3Tt5mk" to="hm2y:5BNZGjBvVh4" resolve="expr" />
7115+
</node>
7116+
</node>
7117+
<node concept="2qgKlT" id="1br4Vy9oiJ" role="2OqNvi">
7118+
<ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
71147119
</node>
71157120
</node>
71167121
</node>
@@ -24286,10 +24291,15 @@
2428624291
<node concept="Xl_RD" id="mQGcCvPvsx" role="3uHU7B">
2428724292
<property role="Xl_RC" value="fail(" />
2428824293
</node>
24289-
<node concept="2OqwBi" id="mQGcCvPvV2" role="3uHU7w">
24290-
<node concept="13iPFW" id="mQGcCvPvHV" role="2Oq$k0" />
24291-
<node concept="3TrEf2" id="mQGcCvPw5i" role="2OqNvi">
24292-
<ref role="3Tt5mk" to="hm2y:mQGcCvPueY" resolve="message" />
24294+
<node concept="2OqwBi" id="1br4Vy9oil" role="3uHU7w">
24295+
<node concept="2OqwBi" id="1br4Vy9oim" role="2Oq$k0">
24296+
<node concept="13iPFW" id="1br4Vy9oin" role="2Oq$k0" />
24297+
<node concept="3TrEf2" id="1br4Vy9oio" role="2OqNvi">
24298+
<ref role="3Tt5mk" to="hm2y:mQGcCvPueY" resolve="message" />
24299+
</node>
24300+
</node>
24301+
<node concept="2qgKlT" id="1br4Vy9oip" role="2OqNvi">
24302+
<ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
2429324303
</node>
2429424304
</node>
2429524305
</node>

0 commit comments

Comments
 (0)