Skip to content

Commit 80a4909

Browse files
author
Nils Weidmann
committed
Replace colon casts by as casts in the type system
1 parent d4f02bf commit 80a4909

File tree

34 files changed

+454
-23
lines changed

34 files changed

+454
-23
lines changed

‎code/languages/org.iets3.opensource/languages/org.iets3.analysis.logic.operator/models/org.iets3.analysis.logic.operator.typesystem.mps‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,9 @@
156156
<concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
157157
<child id="1207343664468" name="conceptArgument" index="ri$Ld" />
158158
</concept>
159-
<concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
159+
<concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
160+
<property id="1238684351431" name="asCast" index="1BlNFB" />
161+
</concept>
160162
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
161163
<reference id="1138405853777" name="concept" index="ehGHo" />
162164
</concept>
@@ -249,6 +251,7 @@
249251
<node concept="1Z2H0r" id="kLIXBTxiJg" role="mwGJk">
250252
<node concept="2OqwBi" id="kLIXBTxiZd" role="1Z2MuG">
251253
<node concept="1PxgMI" id="kLIXBTxiLy" role="2Oq$k0">
254+
<property role="1BlNFB" value="true" />
252255
<node concept="chp4Y" id="kLIXBTxiMa" role="3oSUPX">
253256
<ref role="cht4Q" to="hm2y:2rOWEwsEjcg" resolve="OptionType" />
254257
</node>

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,9 @@
262262
<child id="1207343664468" name="conceptArgument" index="ri$Ld" />
263263
</concept>
264264
<concept id="1144146199828" name="jetbrains.mps.lang.smodel.structure.Node_CopyOperation" flags="nn" index="1$rogu" />
265-
<concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
265+
<concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
266+
<property id="1238684351431" name="asCast" index="1BlNFB" />
267+
</concept>
266268
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
267269
<reference id="1138405853777" name="concept" index="ehGHo" />
268270
</concept>
@@ -2429,6 +2431,7 @@
24292431
<node concept="2OqwBi" id="4VHfdEqe9kt" role="3clFbG">
24302432
<node concept="2OqwBi" id="4VHfdEqe8tY" role="2Oq$k0">
24312433
<node concept="1PxgMI" id="4VHfdEqe8hw" role="2Oq$k0">
2434+
<property role="1BlNFB" value="true" />
24322435
<node concept="chp4Y" id="4VHfdEqe8if" role="3oSUPX">
24332436
<ref role="cht4Q" to="w9y2:cJpacq6wur" resolve="Parameter" />
24342437
</node>
@@ -2591,6 +2594,7 @@
25912594
</node>
25922595
<node concept="2OqwBi" id="3mxHOBiEoJD" role="33vP2m">
25932596
<node concept="1PxgMI" id="3mxHOBiEoJE" role="2Oq$k0">
2597+
<property role="1BlNFB" value="true" />
25942598
<node concept="chp4Y" id="3mxHOBiEoJF" role="3oSUPX">
25952599
<ref role="cht4Q" to="w9y2:6P1C6lFyRUR" resolve="ConfiguredPortType" />
25962600
</node>
@@ -2612,6 +2616,7 @@
26122616
</node>
26132617
<node concept="2OqwBi" id="3mxHOBiEp8N" role="33vP2m">
26142618
<node concept="1PxgMI" id="3mxHOBiEp8O" role="2Oq$k0">
2619+
<property role="1BlNFB" value="true" />
26152620
<node concept="chp4Y" id="3mxHOBiEp8P" role="3oSUPX">
26162621
<ref role="cht4Q" to="w9y2:6P1C6lFyRUR" resolve="ConfiguredPortType" />
26172622
</node>
@@ -2656,6 +2661,7 @@
26562661
<node concept="2OqwBi" id="3mxHOBiE$fW" role="3uHU7w">
26572662
<node concept="2OqwBi" id="3mxHOBiEyXj" role="2Oq$k0">
26582663
<node concept="1PxgMI" id="3mxHOBiEy6e" role="2Oq$k0">
2664+
<property role="1BlNFB" value="true" />
26592665
<node concept="chp4Y" id="3mxHOBiEyiy" role="3oSUPX">
26602666
<ref role="cht4Q" to="yv47:7D7uZV2dYz2" resolve="RecordType" />
26612667
</node>
@@ -2679,6 +2685,7 @@
26792685
<node concept="2OqwBi" id="3mxHOBiEtJe" role="3uHU7w">
26802686
<node concept="2OqwBi" id="3mxHOBiEsXd" role="2Oq$k0">
26812687
<node concept="1PxgMI" id="3mxHOBiEsG2" role="2Oq$k0">
2688+
<property role="1BlNFB" value="true" />
26822689
<node concept="chp4Y" id="3mxHOBiEsH3" role="3oSUPX">
26832690
<ref role="cht4Q" to="yv47:7D7uZV2dYz2" resolve="RecordType" />
26842691
</node>
@@ -2814,6 +2821,7 @@
28142821
<ref role="2pIpSl" to="w9y2:6P1C6lFyRUU" resolve="configurationType" />
28152822
<node concept="36biLy" id="6P1C6lFyScE" role="28nt2d">
28162823
<node concept="1PxgMI" id="6P1C6lFyTFZ" role="36biLW">
2824+
<property role="1BlNFB" value="true" />
28172825
<node concept="chp4Y" id="6P1C6lFyTKQ" role="3oSUPX">
28182826
<ref role="cht4Q" to="hm2y:6sdnDbSlaok" resolve="Type" />
28192827
</node>
@@ -2827,6 +2835,7 @@
28272835
<ref role="2pIpSl" to="w9y2:6P1C6lFyRUS" resolve="portType" />
28282836
<node concept="36biLy" id="6P1C6lFySEy" role="28nt2d">
28292837
<node concept="1PxgMI" id="6P1C6lFyTdT" role="36biLW">
2838+
<property role="1BlNFB" value="true" />
28302839
<node concept="chp4Y" id="6P1C6lFyTjz" role="3oSUPX">
28312840
<ref role="cht4Q" to="hm2y:6sdnDbSlaok" resolve="Type" />
28322841
</node>

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -975,6 +975,7 @@
975975
</node>
976976
<node concept="2OqwBi" id="2Q7cX_iyfcn" role="33vP2m">
977977
<node concept="1PxgMI" id="2Q7cX_iyfco" role="2Oq$k0">
978+
<property role="1BlNFB" value="true" />
978979
<node concept="chp4Y" id="1Ap9E00Aqaq" role="3oSUPX">
979980
<ref role="cht4Q" to="874t:7$oB3aVs63" resolve="EnumRefType" />
980981
</node>
@@ -994,6 +995,7 @@
994995
</node>
995996
<node concept="2OqwBi" id="2Q7cX_iyfll" role="33vP2m">
996997
<node concept="1PxgMI" id="2Q7cX_iyflm" role="2Oq$k0">
998+
<property role="1BlNFB" value="true" />
997999
<node concept="chp4Y" id="1Ap9E00Aqat" role="3oSUPX">
9981000
<ref role="cht4Q" to="874t:7$oB3aVs63" resolve="EnumRefType" />
9991001
</node>
@@ -1028,6 +1030,7 @@
10281030
<node concept="1Z2H0r" id="426GYJ1B4zo" role="mwGJk">
10291031
<node concept="2OqwBi" id="426GYJ1B5oq" role="1Z2MuG">
10301032
<node concept="1PxgMI" id="426GYJ1B5f5" role="2Oq$k0">
1033+
<property role="1BlNFB" value="true" />
10311034
<node concept="chp4Y" id="1Ap9E00AqaO" role="3oSUPX">
10321035
<ref role="cht4Q" to="874t:6LfBX8YiZFy" resolve="DataItemPortType" />
10331036
</node>
@@ -1109,6 +1112,7 @@
11091112
<node concept="1Z2H0r" id="426GYJ1B8fF" role="mwGJk">
11101113
<node concept="2OqwBi" id="426GYJ1B8fG" role="1Z2MuG">
11111114
<node concept="1PxgMI" id="426GYJ1B8fH" role="2Oq$k0">
1115+
<property role="1BlNFB" value="true" />
11121116
<node concept="chp4Y" id="1Ap9E00Aqay" role="3oSUPX">
11131117
<ref role="cht4Q" to="874t:6LfBX8YiZFy" resolve="DataItemPortType" />
11141118
</node>
@@ -1732,6 +1736,7 @@
17321736
<node concept="10Nm6u" id="S$tO8nOg7P" role="3uHU7w" />
17331737
<node concept="2OqwBi" id="S$tO8nOfEl" role="3uHU7B">
17341738
<node concept="1PxgMI" id="S$tO8nOfpL" role="2Oq$k0">
1739+
<property role="1BlNFB" value="true" />
17351740
<node concept="chp4Y" id="1Ap9E00Aqap" role="3oSUPX">
17361741
<ref role="cht4Q" to="874t:5mAeI2onPox" resolve="ProtocolSpec" />
17371742
</node>
@@ -2319,6 +2324,7 @@
23192324
<node concept="2OqwBi" id="4G$IdycgnAh" role="3uHU7w">
23202325
<node concept="2OqwBi" id="4G$IdycgnAi" role="2Oq$k0">
23212326
<node concept="1PxgMI" id="4G$IdycgnAj" role="2Oq$k0">
2327+
<property role="1BlNFB" value="true" />
23222328
<node concept="chp4Y" id="1Ap9E00Aqb1" role="3oSUPX">
23232329
<ref role="cht4Q" to="hm2y:7NJy08a3O99" resolve="DotExpression" />
23242330
</node>
@@ -2468,6 +2474,7 @@
24682474
<node concept="3fqX7Q" id="261aCy3ss_I" role="3uHU7w">
24692475
<node concept="2OqwBi" id="261aCy3ss_K" role="3fr31v">
24702476
<node concept="1PxgMI" id="261aCy3ss_L" role="2Oq$k0">
2477+
<property role="1BlNFB" value="true" />
24712478
<node concept="chp4Y" id="261aCy3ss_M" role="3oSUPX">
24722479
<ref role="cht4Q" to="hm2y:aPhVmWYjmk" resolve="ICanBeLValue" />
24732480
</node>
@@ -2659,6 +2666,7 @@
26592666
<node concept="2OqwBi" id="6yXR8poHDIL" role="1Z2MuG">
26602667
<node concept="2OqwBi" id="6yXR8poHDA0" role="2Oq$k0">
26612668
<node concept="1PxgMI" id="6yXR8poHDyx" role="2Oq$k0">
2669+
<property role="1BlNFB" value="true" />
26622670
<node concept="chp4Y" id="1Ap9E00Aqao" role="3oSUPX">
26632671
<ref role="cht4Q" to="874t:6j5Z0nqgXsP" resolve="CallOpAction" />
26642672
</node>
@@ -2940,6 +2948,7 @@
29402948
<node concept="2OqwBi" id="6Vu7aRGxLiC" role="3uHU7w">
29412949
<node concept="2OqwBi" id="6Vu7aRGxL1l" role="2Oq$k0">
29422950
<node concept="1PxgMI" id="6Vu7aRGxKTX" role="2Oq$k0">
2951+
<property role="1BlNFB" value="true" />
29432952
<node concept="chp4Y" id="1Ap9E00Aqbg" role="3oSUPX">
29442953
<ref role="cht4Q" to="874t:2Q7cX_iyKIH" resolve="ConditionalDataTrigger" />
29452954
</node>
@@ -3149,6 +3158,7 @@
31493158
<ref role="2pIpSl" to="874t:7$oB3aVt7J" resolve="enum" />
31503159
<node concept="36biLy" id="7$oB3aVttp" role="28nt2d">
31513160
<node concept="1PxgMI" id="7$oB3aWQ6P" role="36biLW">
3161+
<property role="1BlNFB" value="true" />
31523162
<node concept="chp4Y" id="1Ap9E00Aqbf" role="3oSUPX">
31533163
<ref role="cht4Q" to="874t:7$oB3aTXcI" resolve="EnumType" />
31543164
</node>
@@ -3333,6 +3343,7 @@
33333343
<node concept="2OqwBi" id="5_IWTcLPgNQ" role="2Oq$k0">
33343344
<node concept="2OqwBi" id="5_IWTcLPeVX" role="2Oq$k0">
33353345
<node concept="1PxgMI" id="5_IWTcLPeJB" role="2Oq$k0">
3346+
<property role="1BlNFB" value="true" />
33363347
<node concept="2OqwBi" id="5_IWTcLPecQ" role="1m5AlR">
33373348
<node concept="1YBJjd" id="5_IWTcLPe2G" role="2Oq$k0">
33383349
<ref role="1YBMHb" node="5_IWTcLPe2g" resolve="target" />

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,9 @@
245245
<child id="1207343664468" name="conceptArgument" index="ri$Ld" />
246246
</concept>
247247
<concept id="1144146199828" name="jetbrains.mps.lang.smodel.structure.Node_CopyOperation" flags="nn" index="1$rogu" />
248-
<concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
248+
<concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
249+
<property id="1238684351431" name="asCast" index="1BlNFB" />
250+
</concept>
249251
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
250252
<reference id="1138405853777" name="concept" index="ehGHo" />
251253
</concept>
@@ -467,6 +469,7 @@
467469
<node concept="2OqwBi" id="4lFnCmbFdn$" role="3uHU7B">
468470
<node concept="2OqwBi" id="2ZikKrmO6u2" role="2Oq$k0">
469471
<node concept="1PxgMI" id="2ZikKrmO6dc" role="2Oq$k0">
472+
<property role="1BlNFB" value="true" />
470473
<node concept="chp4Y" id="1Ap9E00AqNl" role="3oSUPX">
471474
<ref role="cht4Q" to="49km:tc31IFYOCq" resolve="BusPortType" />
472475
</node>

‎code/languages/org.iets3.opensource/languages/org.iets3.components.toplevel.adapter/models/behavior.mps‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,9 @@
8989
<concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
9090
<child id="1177027386292" name="conceptArgument" index="cj9EA" />
9191
</concept>
92-
<concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
92+
<concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
93+
<property id="1238684351431" name="asCast" index="1BlNFB" />
94+
</concept>
9395
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
9496
<reference id="1138405853777" name="concept" index="ehGHo" />
9597
</concept>
@@ -173,6 +175,7 @@
173175
<node concept="3cpWs6" id="6f7f4BmjNPs" role="3cqZAp">
174176
<node concept="2OqwBi" id="6f7f4BmjNPu" role="3cqZAk">
175177
<node concept="1PxgMI" id="6f7f4BmjNPv" role="2Oq$k0">
178+
<property role="1BlNFB" value="true" />
176179
<node concept="chp4Y" id="6f7f4BmjNPw" role="3oSUPX">
177180
<ref role="cht4Q" to="hm2y:5ElkanPUl6g" resolve="IDocumentableWordProvider" />
178181
</node>

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,9 @@
222222
<child id="1180636770616" name="createdType" index="3zrR0E" />
223223
</concept>
224224
<concept id="1144146199828" name="jetbrains.mps.lang.smodel.structure.Node_CopyOperation" flags="nn" index="1$rogu" />
225-
<concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
225+
<concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
226+
<property id="1238684351431" name="asCast" index="1BlNFB" />
227+
</concept>
226228
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
227229
<reference id="1138405853777" name="concept" index="ehGHo" />
228230
</concept>
@@ -611,6 +613,7 @@
611613
<node concept="2OqwBi" id="5a_u3OyR$Vt" role="33vP2m">
612614
<node concept="2OqwBi" id="5a_u3OyR$Vu" role="2Oq$k0">
613615
<node concept="1PxgMI" id="5a_u3OyR$Vv" role="2Oq$k0">
616+
<property role="1BlNFB" value="true" />
614617
<node concept="chp4Y" id="5a_u3OyR$Vw" role="3oSUPX">
615618
<ref role="cht4Q" to="v0r8:5a_u3OyM_sl" resolve="AlgebraicConstructorType" />
616619
</node>
@@ -1418,6 +1421,7 @@
14181421
<ref role="ehGHo" to="v0r8:5a_u3OyMSN$" resolve="AlgebraicTerm" />
14191422
</node>
14201423
<node concept="1PxgMI" id="5a_u3OzZfTS" role="33vP2m">
1424+
<property role="1BlNFB" value="true" />
14211425
<node concept="chp4Y" id="5a_u3OzZfTT" role="3oSUPX">
14221426
<ref role="cht4Q" to="v0r8:5a_u3OyMSN$" resolve="AlgebraicTerm" />
14231427
</node>
@@ -1544,6 +1548,7 @@
15441548
<node concept="2OqwBi" id="5a_u3O$05dN" role="2Oq$k0">
15451549
<node concept="2OqwBi" id="5a_u3O$05dO" role="2Oq$k0">
15461550
<node concept="1PxgMI" id="5a_u3O$05dP" role="2Oq$k0">
1551+
<property role="1BlNFB" value="true" />
15471552
<node concept="chp4Y" id="5a_u3O$05dQ" role="3oSUPX">
15481553
<ref role="cht4Q" to="v0r8:5a_u3OyMSN$" resolve="AlgebraicTerm" />
15491554
</node>
@@ -1824,11 +1829,13 @@
18241829
<node concept="mw_s8" id="28$LOSAgp2O" role="1ZfhKB">
18251830
<node concept="2OqwBi" id="28$LOSAgqwe" role="mwGJk">
18261831
<node concept="1PxgMI" id="28$LOSAgqeh" role="2Oq$k0">
1832+
<property role="1BlNFB" value="true" />
18271833
<node concept="chp4Y" id="28$LOSAgqjB" role="3oSUPX">
18281834
<ref role="cht4Q" to="v0r8:5a_u3OyM_sl" resolve="AlgebraicConstructorType" />
18291835
</node>
18301836
<node concept="2OqwBi" id="28$LOSAgpl7" role="1m5AlR">
18311837
<node concept="1PxgMI" id="28$LOSAgp9e" role="2Oq$k0">
1838+
<property role="1BlNFB" value="true" />
18321839
<node concept="chp4Y" id="28$LOSAgp9K" role="3oSUPX">
18331840
<ref role="cht4Q" to="v0r8:28$LOSAcnob" resolve="QuotedTermType" />
18341841
</node>

0 commit comments

Comments
 (0)