Skip to content

#688 Avoid colon casts in type system #1550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arimer merged 5 commits into from
Dec 10, 2025
Merged

#688 Avoid colon casts in type system #1550

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
80a4909
Replace colon casts by as casts in the type system
Dec 5, 2025
9196901
Merge branch 'maintenance/mps20241' of https://github.com/IETS3/iets3…
Dec 5, 2025
d0d2dce
Merge branch 'maintenance/mps20241' of https://github.com/IETS3/iets3…
Dec 5, 2025
de3eb19
Merge remote-tracking branch 'origin/bugfix/colon-cast' into bugfix/c…
nkoester Dec 10, 2025
b3c1621
Merge branch 'maintenance/mps20241' into bugfix/colon-cast
arimer Dec 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...org.iets3.analysis.logic.operator/models/org.iets3.analysis.logic.operator.typesystem.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,9 @@
<concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
<child id="1207343664468" name="conceptArgument" index="ri$Ld" />
</concept>
<concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
<concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
<property id="1238684351431" name="asCast" index="1BlNFB" />
</concept>
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
<reference id="1138405853777" name="concept" index="ehGHo" />
</concept>
Expand Down Expand Up @@ -249,6 +251,7 @@
<node concept="1Z2H0r" id="kLIXBTxiJg" role="mwGJk">
<node concept="2OqwBi" id="kLIXBTxiZd" role="1Z2MuG">
<node concept="1PxgMI" id="kLIXBTxiLy" role="2Oq$k0">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="kLIXBTxiMa" role="3oSUPX">
<ref role="cht4Q" to="hm2y:2rOWEwsEjcg" resolve="OptionType" />
</node>
Expand Down
11 changes: 10 additions & 1 deletion .../languages/org.iets3.opensource/languages/org.iets3.components.core/models/typesystem.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,9 @@
<child id="1207343664468" name="conceptArgument" index="ri$Ld" />
</concept>
<concept id="1144146199828" name="jetbrains.mps.lang.smodel.structure.Node_CopyOperation" flags="nn" index="1$rogu" />
<concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
<concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
<property id="1238684351431" name="asCast" index="1BlNFB" />
</concept>
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
<reference id="1138405853777" name="concept" index="ehGHo" />
</concept>
Expand Down Expand Up @@ -2429,6 +2431,7 @@
<node concept="2OqwBi" id="4VHfdEqe9kt" role="3clFbG">
<node concept="2OqwBi" id="4VHfdEqe8tY" role="2Oq$k0">
<node concept="1PxgMI" id="4VHfdEqe8hw" role="2Oq$k0">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="4VHfdEqe8if" role="3oSUPX">
<ref role="cht4Q" to="w9y2:cJpacq6wur" resolve="Parameter" />
</node>
Expand Down Expand Up @@ -2591,6 +2594,7 @@
</node>
<node concept="2OqwBi" id="3mxHOBiEoJD" role="33vP2m">
<node concept="1PxgMI" id="3mxHOBiEoJE" role="2Oq$k0">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="3mxHOBiEoJF" role="3oSUPX">
<ref role="cht4Q" to="w9y2:6P1C6lFyRUR" resolve="ConfiguredPortType" />
</node>
Expand All @@ -2612,6 +2616,7 @@
</node>
<node concept="2OqwBi" id="3mxHOBiEp8N" role="33vP2m">
<node concept="1PxgMI" id="3mxHOBiEp8O" role="2Oq$k0">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="3mxHOBiEp8P" role="3oSUPX">
<ref role="cht4Q" to="w9y2:6P1C6lFyRUR" resolve="ConfiguredPortType" />
</node>
Expand Down Expand Up @@ -2656,6 +2661,7 @@
<node concept="2OqwBi" id="3mxHOBiE$fW" role="3uHU7w">
<node concept="2OqwBi" id="3mxHOBiEyXj" role="2Oq$k0">
<node concept="1PxgMI" id="3mxHOBiEy6e" role="2Oq$k0">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="3mxHOBiEyiy" role="3oSUPX">
<ref role="cht4Q" to="yv47:7D7uZV2dYz2" resolve="RecordType" />
</node>
Expand All @@ -2679,6 +2685,7 @@
<node concept="2OqwBi" id="3mxHOBiEtJe" role="3uHU7w">
<node concept="2OqwBi" id="3mxHOBiEsXd" role="2Oq$k0">
<node concept="1PxgMI" id="3mxHOBiEsG2" role="2Oq$k0">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="3mxHOBiEsH3" role="3oSUPX">
<ref role="cht4Q" to="yv47:7D7uZV2dYz2" resolve="RecordType" />
</node>
Expand Down Expand Up @@ -2814,6 +2821,7 @@
<ref role="2pIpSl" to="w9y2:6P1C6lFyRUU" resolve="configurationType" />
<node concept="36biLy" id="6P1C6lFyScE" role="28nt2d">
<node concept="1PxgMI" id="6P1C6lFyTFZ" role="36biLW">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="6P1C6lFyTKQ" role="3oSUPX">
<ref role="cht4Q" to="hm2y:6sdnDbSlaok" resolve="Type" />
</node>
Expand All @@ -2827,6 +2835,7 @@
<ref role="2pIpSl" to="w9y2:6P1C6lFyRUS" resolve="portType" />
<node concept="36biLy" id="6P1C6lFySEy" role="28nt2d">
<node concept="1PxgMI" id="6P1C6lFyTdT" role="36biLW">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="6P1C6lFyTjz" role="3oSUPX">
<ref role="cht4Q" to="hm2y:6sdnDbSlaok" resolve="Type" />
</node>
Expand Down
11 changes: 11 additions & 0 deletions ...ages/org.iets3.opensource/languages/org.iets3.components.functional/models/typesystem.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -975,6 +975,7 @@
</node>
<node concept="2OqwBi" id="2Q7cX_iyfcn" role="33vP2m">
<node concept="1PxgMI" id="2Q7cX_iyfco" role="2Oq$k0">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="1Ap9E00Aqaq" role="3oSUPX">
<ref role="cht4Q" to="874t:7$oB3aVs63" resolve="EnumRefType" />
</node>
Expand All @@ -994,6 +995,7 @@
</node>
<node concept="2OqwBi" id="2Q7cX_iyfll" role="33vP2m">
<node concept="1PxgMI" id="2Q7cX_iyflm" role="2Oq$k0">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="1Ap9E00Aqat" role="3oSUPX">
<ref role="cht4Q" to="874t:7$oB3aVs63" resolve="EnumRefType" />
</node>
Expand Down Expand Up @@ -1028,6 +1030,7 @@
<node concept="1Z2H0r" id="426GYJ1B4zo" role="mwGJk">
<node concept="2OqwBi" id="426GYJ1B5oq" role="1Z2MuG">
<node concept="1PxgMI" id="426GYJ1B5f5" role="2Oq$k0">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="1Ap9E00AqaO" role="3oSUPX">
<ref role="cht4Q" to="874t:6LfBX8YiZFy" resolve="DataItemPortType" />
</node>
Expand Down Expand Up @@ -1109,6 +1112,7 @@
<node concept="1Z2H0r" id="426GYJ1B8fF" role="mwGJk">
<node concept="2OqwBi" id="426GYJ1B8fG" role="1Z2MuG">
<node concept="1PxgMI" id="426GYJ1B8fH" role="2Oq$k0">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="1Ap9E00Aqay" role="3oSUPX">
<ref role="cht4Q" to="874t:6LfBX8YiZFy" resolve="DataItemPortType" />
</node>
Expand Down Expand Up @@ -1732,6 +1736,7 @@
<node concept="10Nm6u" id="S$tO8nOg7P" role="3uHU7w" />
<node concept="2OqwBi" id="S$tO8nOfEl" role="3uHU7B">
<node concept="1PxgMI" id="S$tO8nOfpL" role="2Oq$k0">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="1Ap9E00Aqap" role="3oSUPX">
<ref role="cht4Q" to="874t:5mAeI2onPox" resolve="ProtocolSpec" />
</node>
Expand Down Expand Up @@ -2319,6 +2324,7 @@
<node concept="2OqwBi" id="4G$IdycgnAh" role="3uHU7w">
<node concept="2OqwBi" id="4G$IdycgnAi" role="2Oq$k0">
<node concept="1PxgMI" id="4G$IdycgnAj" role="2Oq$k0">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="1Ap9E00Aqb1" role="3oSUPX">
<ref role="cht4Q" to="hm2y:7NJy08a3O99" resolve="DotExpression" />
</node>
Expand Down Expand Up @@ -2468,6 +2474,7 @@
<node concept="3fqX7Q" id="261aCy3ss_I" role="3uHU7w">
<node concept="2OqwBi" id="261aCy3ss_K" role="3fr31v">
<node concept="1PxgMI" id="261aCy3ss_L" role="2Oq$k0">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="261aCy3ss_M" role="3oSUPX">
<ref role="cht4Q" to="hm2y:aPhVmWYjmk" resolve="ICanBeLValue" />
</node>
Expand Down Expand Up @@ -2659,6 +2666,7 @@
<node concept="2OqwBi" id="6yXR8poHDIL" role="1Z2MuG">
<node concept="2OqwBi" id="6yXR8poHDA0" role="2Oq$k0">
<node concept="1PxgMI" id="6yXR8poHDyx" role="2Oq$k0">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="1Ap9E00Aqao" role="3oSUPX">
<ref role="cht4Q" to="874t:6j5Z0nqgXsP" resolve="CallOpAction" />
</node>
Expand Down Expand Up @@ -2940,6 +2948,7 @@
<node concept="2OqwBi" id="6Vu7aRGxLiC" role="3uHU7w">
<node concept="2OqwBi" id="6Vu7aRGxL1l" role="2Oq$k0">
<node concept="1PxgMI" id="6Vu7aRGxKTX" role="2Oq$k0">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="1Ap9E00Aqbg" role="3oSUPX">
<ref role="cht4Q" to="874t:2Q7cX_iyKIH" resolve="ConditionalDataTrigger" />
</node>
Expand Down Expand Up @@ -3149,6 +3158,7 @@
<ref role="2pIpSl" to="874t:7$oB3aVt7J" resolve="enum" />
<node concept="36biLy" id="7$oB3aVttp" role="28nt2d">
<node concept="1PxgMI" id="7$oB3aWQ6P" role="36biLW">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="1Ap9E00Aqbf" role="3oSUPX">
<ref role="cht4Q" to="874t:7$oB3aTXcI" resolve="EnumType" />
</node>
Expand Down Expand Up @@ -3333,6 +3343,7 @@
<node concept="2OqwBi" id="5_IWTcLPgNQ" role="2Oq$k0">
<node concept="2OqwBi" id="5_IWTcLPeVX" role="2Oq$k0">
<node concept="1PxgMI" id="5_IWTcLPeJB" role="2Oq$k0">
<property role="1BlNFB" value="true" />
<node concept="2OqwBi" id="5_IWTcLPecQ" role="1m5AlR">
<node concept="1YBJjd" id="5_IWTcLPe2G" role="2Oq$k0">
<ref role="1YBMHb" node="5_IWTcLPe2g" resolve="target" />
Expand Down
5 changes: 4 additions & 1 deletion ...guages/org.iets3.opensource/languages/org.iets3.components.hardware/models/typesystem.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,9 @@
<child id="1207343664468" name="conceptArgument" index="ri$Ld" />
</concept>
<concept id="1144146199828" name="jetbrains.mps.lang.smodel.structure.Node_CopyOperation" flags="nn" index="1$rogu" />
<concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
<concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
<property id="1238684351431" name="asCast" index="1BlNFB" />
</concept>
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
<reference id="1138405853777" name="concept" index="ehGHo" />
</concept>
Expand Down Expand Up @@ -467,6 +469,7 @@
<node concept="2OqwBi" id="4lFnCmbFdn$" role="3uHU7B">
<node concept="2OqwBi" id="2ZikKrmO6u2" role="2Oq$k0">
<node concept="1PxgMI" id="2ZikKrmO6dc" role="2Oq$k0">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="1Ap9E00AqNl" role="3oSUPX">
<ref role="cht4Q" to="49km:tc31IFYOCq" resolve="BusPortType" />
</node>
Expand Down
5 changes: 4 additions & 1 deletion .../org.iets3.opensource/languages/org.iets3.components.toplevel.adapter/models/behavior.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@
<concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
<child id="1177027386292" name="conceptArgument" index="cj9EA" />
</concept>
<concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
<concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
<property id="1238684351431" name="asCast" index="1BlNFB" />
</concept>
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
<reference id="1138405853777" name="concept" index="ehGHo" />
</concept>
Expand Down Expand Up @@ -173,6 +175,7 @@
<node concept="3cpWs6" id="6f7f4BmjNPs" role="3cqZAp">
<node concept="2OqwBi" id="6f7f4BmjNPu" role="3cqZAk">
<node concept="1PxgMI" id="6f7f4BmjNPv" role="2Oq$k0">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="6f7f4BmjNPw" role="3oSUPX">
<ref role="cht4Q" to="hm2y:5ElkanPUl6g" resolve="IDocumentableWordProvider" />
</node>
Expand Down
9 changes: 8 additions & 1 deletion code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/typesystem.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,9 @@
<child id="1180636770616" name="createdType" index="3zrR0E" />
</concept>
<concept id="1144146199828" name="jetbrains.mps.lang.smodel.structure.Node_CopyOperation" flags="nn" index="1$rogu" />
<concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
<concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
<property id="1238684351431" name="asCast" index="1BlNFB" />
</concept>
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
<reference id="1138405853777" name="concept" index="ehGHo" />
</concept>
Expand Down Expand Up @@ -611,6 +613,7 @@
<node concept="2OqwBi" id="5a_u3OyR$Vt" role="33vP2m">
<node concept="2OqwBi" id="5a_u3OyR$Vu" role="2Oq$k0">
<node concept="1PxgMI" id="5a_u3OyR$Vv" role="2Oq$k0">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="5a_u3OyR$Vw" role="3oSUPX">
<ref role="cht4Q" to="v0r8:5a_u3OyM_sl" resolve="AlgebraicConstructorType" />
</node>
Expand Down Expand Up @@ -1418,6 +1421,7 @@
<ref role="ehGHo" to="v0r8:5a_u3OyMSN$" resolve="AlgebraicTerm" />
</node>
<node concept="1PxgMI" id="5a_u3OzZfTS" role="33vP2m">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="5a_u3OzZfTT" role="3oSUPX">
<ref role="cht4Q" to="v0r8:5a_u3OyMSN$" resolve="AlgebraicTerm" />
</node>
Expand Down Expand Up @@ -1544,6 +1548,7 @@
<node concept="2OqwBi" id="5a_u3O$05dN" role="2Oq$k0">
<node concept="2OqwBi" id="5a_u3O$05dO" role="2Oq$k0">
<node concept="1PxgMI" id="5a_u3O$05dP" role="2Oq$k0">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="5a_u3O$05dQ" role="3oSUPX">
<ref role="cht4Q" to="v0r8:5a_u3OyMSN$" resolve="AlgebraicTerm" />
</node>
Expand Down Expand Up @@ -1824,11 +1829,13 @@
<node concept="mw_s8" id="28$LOSAgp2O" role="1ZfhKB">
<node concept="2OqwBi" id="28$LOSAgqwe" role="mwGJk">
<node concept="1PxgMI" id="28$LOSAgqeh" role="2Oq$k0">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="28$LOSAgqjB" role="3oSUPX">
<ref role="cht4Q" to="v0r8:5a_u3OyM_sl" resolve="AlgebraicConstructorType" />
</node>
<node concept="2OqwBi" id="28$LOSAgpl7" role="1m5AlR">
<node concept="1PxgMI" id="28$LOSAgp9e" role="2Oq$k0">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="28$LOSAgp9K" role="3oSUPX">
<ref role="cht4Q" to="v0r8:28$LOSAcnob" resolve="QuotedTermType" />
</node>
Expand Down
Loading