Skip to content

Commit 69c2b8c

Browse files
mgronovermgronover
authored
505 type system improvement (#678)
* Apply changes from 505-the-type-inference-underlying-the-alt-expressions-doesnt-work-correctly on top of maintenance/mps20211
1 parent e13ddb3 commit 69c2b8c

File tree

12 files changed

+6305
-450
lines changed

12 files changed

+6305
-450
lines changed

‎CHANGELOG.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,16 @@ All notable changes to this project are documented in this file.
44

55
Format of the log is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66
The project does _not_ follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.
7+
8+
9+
10+
## July 2023
11+
12+
### Fixed
13+
14+
- Computation of the least-common-supertype for expressions with different return types has been fixed. The typesystem now correctly infers a join type (c.f. [original issue](https://github.com/IETS3/iets3.opensource/issues/505))
15+
16+
### Added
17+
18+
- Tuples are now handled within the typesystem.
19+
Instead of allowing JoinTypes within tuples we merge different tuple types by JoinTypes.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1035,7 +1035,7 @@
10351035
</node>
10361036
</node>
10371037
<node concept="3clFb_" id="2NHHcg2KrmD" role="jymVt">
1038-
<property role="TrG5h" value="computerSupertype" />
1038+
<property role="TrG5h" value="computeSupertype" />
10391039
<property role="1EzhhJ" value="true" />
10401040
<node concept="37vLTG" id="2NHHcg2Gd2N" role="3clF46">
10411041
<property role="TrG5h" value="types" />

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

Lines changed: 287 additions & 26 deletions
Large diffs are not rendered by default.

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/plugin.mps‎

Lines changed: 1712 additions & 411 deletions
Large diffs are not rendered by default.

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/org.iets3.core.expr.typetags.units.plugin.mps‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@
297297
</node>
298298
<node concept="2tJIrI" id="2rzAw9UV1UU" role="jymVt" />
299299
<node concept="3clFb_" id="2rzAw9UV188" role="jymVt">
300-
<property role="TrG5h" value="computerSupertype" />
300+
<property role="TrG5h" value="computeSupertype" />
301301
<node concept="37vLTG" id="2rzAw9UV189" role="3clF46">
302302
<property role="TrG5h" value="types" />
303303
<node concept="2I9FWS" id="2rzAw9UV18a" role="1tU5fm" />
@@ -352,7 +352,7 @@
352352
<node concept="3clFbS" id="2rzAw9UVxor" role="3clFbx">
353353
<node concept="3cpWs6" id="2rzAw9UVxKv" role="3cqZAp">
354354
<node concept="3nyPlj" id="2rzAw9UV1by" role="3cqZAk">
355-
<ref role="37wK5l" to="9mim:2NHHcg2Ks0y" resolve="computerSupertype" />
355+
<ref role="37wK5l" to="9mim:2NHHcg2Ks0y" resolve="computeSupertype" />
356356
<node concept="37vLTw" id="2rzAw9UV1bv" role="37wK5m">
357357
<ref role="3cqZAo" node="2rzAw9UV189" resolve="types" />
358358
</node>
@@ -499,7 +499,7 @@
499499
<property role="TrG5h" value="superBaseType" />
500500
<node concept="3Tqbb2" id="2rzAw9V0r9x" role="1tU5fm" />
501501
<node concept="3nyPlj" id="2rzAw9V0rwL" role="33vP2m">
502-
<ref role="37wK5l" to="9mim:2NHHcg2Ks0y" resolve="computerSupertype" />
502+
<ref role="37wK5l" to="9mim:2NHHcg2Ks0y" resolve="computeSupertype" />
503503
<node concept="2OqwBi" id="2rzAw9V0rwM" role="37wK5m">
504504
<node concept="37vLTw" id="2rzAw9V0rwN" role="2Oq$k0">
505505
<ref role="3cqZAo" node="2rzAw9UYuJV" resolve="typesForUnit" />
@@ -675,7 +675,7 @@
675675
<property role="TrG5h" value="nonUnitsSuperType" />
676676
<node concept="3Tqbb2" id="66PK8Sylf7L" role="1tU5fm" />
677677
<node concept="3nyPlj" id="66PK8Sylfui" role="33vP2m">
678-
<ref role="37wK5l" to="9mim:2NHHcg2Ks0y" resolve="computerSupertype" />
678+
<ref role="37wK5l" to="9mim:2NHHcg2Ks0y" resolve="computeSupertype" />
679679
<node concept="2OqwBi" id="66PK8Sylkev" role="37wK5m">
680680
<node concept="37vLTw" id="66PK8SyliUu" role="2Oq$k0">
681681
<ref role="3cqZAo" node="2rzAw9UZA6t" resolve="typesWithoutUnitSpec" />

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

Lines changed: 191 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
<import index="tpd4" ref="r:00000000-0000-4000-0000-011c895902b4(jetbrains.mps.lang.typesystem.structure)" />
2424
<import index="kqnq" ref="r:7628c3bd-6988-4d33-9682-86b8cef4b8c0(com.mbeddr.mpsutil.interpreter.behavior)" />
2525
<import index="3673" ref="r:78633c85-d020-485e-aaa3-59e2daa3b826(com.mbeddr.mpsutil.interpreter.structure)" />
26+
<import index="5qo5" ref="r:6d93ddb1-b0b0-4eee-8079-51303666672a(org.iets3.core.expr.simpleTypes.structure)" />
27+
<import index="b0gq" ref="r:1eb914ff-b91c-4cbc-93c6-3ecde7821894(org.iets3.core.expr.typetags.units.structure)" />
2628
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
2729
</imports>
2830
<registry>
@@ -150,6 +152,9 @@
150152
</concept>
151153
<concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
152154
<concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
155+
<concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
156+
<child id="1079359253376" name="expression" index="1eOMHV" />
157+
</concept>
153158
<concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
154159
<child id="1081516765348" name="expression" index="3fr31v" />
155160
</concept>
@@ -236,6 +241,9 @@
236241
<reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
237242
</concept>
238243
<concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
244+
<concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
245+
<child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
246+
</concept>
239247
<concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
240248
<concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
241249
<child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
@@ -244,6 +252,9 @@
244252
<concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
245253
<reference id="1145383142433" name="elementConcept" index="2I9WkF" />
246254
</concept>
255+
<concept id="3562215692195599741" name="jetbrains.mps.lang.smodel.structure.SLinkImplicitSelect" flags="nn" index="13MTOL">
256+
<reference id="3562215692195600259" name="link" index="13MTZf" />
257+
</concept>
247258
<concept id="6677504323281689838" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3bZ5Sz">
248259
<reference id="6677504323281689839" name="conceptDeclaraton" index="3bZ5Sy" />
249260
</concept>
@@ -283,6 +294,9 @@
283294
<concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
284295
<child id="1204796294226" name="closure" index="23t8la" />
285296
</concept>
297+
<concept id="1176906603202" name="jetbrains.mps.baseLanguage.collections.structure.BinaryOperation" flags="nn" index="56pJg">
298+
<child id="1176906787974" name="rightExpression" index="576Qk" />
299+
</concept>
286300
<concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
287301
<child id="540871147943773366" name="argument" index="25WWJ7" />
288302
</concept>
@@ -301,6 +315,7 @@
301315
<child id="1235573175711" name="elementType" index="2HTBi0" />
302316
<child id="1235573187520" name="singletonValue" index="2HTEbv" />
303317
</concept>
318+
<concept id="1205598340672" name="jetbrains.mps.baseLanguage.collections.structure.DisjunctOperation" flags="nn" index="2NgGto" />
304319
<concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
305320
<concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
306321
<concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
@@ -824,6 +839,182 @@
824839
<ref role="ehGHo" to="3673:6bG6MAFRAaG" resolve="IInterpreterWrapperType" />
825840
</node>
826841
</node>
842+
<node concept="13i0hz" id="5L2mTKm_pxP" role="13h7CS">
843+
<property role="TrG5h" value="isSameAs" />
844+
<property role="13i0it" value="false" />
845+
<property role="13i0iv" value="false" />
846+
<ref role="13i0hy" to="pbu6:fIXgjlt4VE" resolve="isSameAs" />
847+
<node concept="3Tm1VV" id="5L2mTKm_pxQ" role="1B3o_S" />
848+
<node concept="3clFbS" id="5L2mTKm_py3" role="3clF47">
849+
<node concept="3clFbJ" id="5L2mTKm_tPO" role="3cqZAp">
850+
<node concept="3clFbS" id="5L2mTKm_tPQ" role="3clFbx">
851+
<node concept="3cpWs6" id="5L2mTKm_udj" role="3cqZAp">
852+
<node concept="3clFbT" id="5L2mTKm_udp" role="3cqZAk">
853+
<property role="3clFbU" value="false" />
854+
</node>
855+
</node>
856+
</node>
857+
<node concept="3clFbC" id="5L2mTKm_u8B" role="3clFbw">
858+
<node concept="10Nm6u" id="5L2mTKm_ucT" role="3uHU7w" />
859+
<node concept="37vLTw" id="5L2mTKm_tQ8" role="3uHU7B">
860+
<ref role="3cqZAo" node="5L2mTKm_py4" resolve="other" />
861+
</node>
862+
</node>
863+
</node>
864+
<node concept="3clFbJ" id="5L2mTKm_udI" role="3cqZAp">
865+
<node concept="3clFbS" id="5L2mTKm_udJ" role="3clFbx">
866+
<node concept="3cpWs6" id="5L2mTKm_udK" role="3cqZAp">
867+
<node concept="3clFbT" id="5L2mTKm_udL" role="3cqZAk">
868+
<property role="3clFbU" value="false" />
869+
</node>
870+
</node>
871+
</node>
872+
<node concept="3fqX7Q" id="5L2mTKm_un5" role="3clFbw">
873+
<node concept="1eOMI4" id="5L2mTKm_un9" role="3fr31v">
874+
<node concept="2OqwBi" id="5L2mTKm_uHw" role="1eOMHV">
875+
<node concept="37vLTw" id="5L2mTKm_un8" role="2Oq$k0">
876+
<ref role="3cqZAo" node="5L2mTKm_py4" resolve="other" />
877+
</node>
878+
<node concept="1mIQ4w" id="5L2mTKm_uZw" role="2OqNvi">
879+
<node concept="chp4Y" id="5L2mTKmAxJ$" role="cj9EA">
880+
<ref role="cht4Q" to="w1hl:1xEzHAktP2Q" resolve="TaggedType" />
881+
</node>
882+
</node>
883+
</node>
884+
</node>
885+
</node>
886+
</node>
887+
<node concept="3clFbJ" id="1yuOfVwynkm" role="3cqZAp">
888+
<node concept="3clFbS" id="1yuOfVwynko" role="3clFbx">
889+
<node concept="3cpWs6" id="1yuOfVwyqfI" role="3cqZAp">
890+
<node concept="3clFbT" id="1yuOfVwyqJ0" role="3cqZAk" />
891+
</node>
892+
</node>
893+
<node concept="3y3z36" id="1yuOfVwyoUm" role="3clFbw">
894+
<node concept="2OqwBi" id="1yuOfVwyplh" role="3uHU7w">
895+
<node concept="37vLTw" id="1yuOfVwyp84" role="2Oq$k0">
896+
<ref role="3cqZAo" node="5L2mTKm_py4" resolve="other" />
897+
</node>
898+
<node concept="2qgKlT" id="1yuOfVwyq09" role="2OqNvi">
899+
<ref role="37wK5l" to="pbu6:XhdFKv3UAU" resolve="baseType" />
900+
</node>
901+
</node>
902+
<node concept="2OqwBi" id="1yuOfVwynJt" role="3uHU7B">
903+
<node concept="13iPFW" id="1yuOfVwynsB" role="2Oq$k0" />
904+
<node concept="3TrEf2" id="1yuOfVwyo$Y" role="2OqNvi">
905+
<ref role="3Tt5mk" to="w1hl:1xEzHAktP2T" resolve="baseType" />
906+
</node>
907+
</node>
908+
</node>
909+
</node>
910+
<node concept="3cpWs8" id="5L2mTKm_vHg" role="3cqZAp">
911+
<node concept="3cpWsn" id="5L2mTKm_vHh" role="3cpWs9">
912+
<property role="TrG5h" value="casted" />
913+
<node concept="3Tqbb2" id="5L2mTKm_vHd" role="1tU5fm">
914+
<ref role="ehGHo" to="w1hl:1xEzHAktP2Q" resolve="TaggedType" />
915+
</node>
916+
<node concept="1PxgMI" id="5L2mTKm_vHi" role="33vP2m">
917+
<node concept="chp4Y" id="6b_jefnKz27" role="3oSUPX">
918+
<ref role="cht4Q" to="w1hl:1xEzHAktP2Q" resolve="TaggedType" />
919+
</node>
920+
<node concept="37vLTw" id="5L2mTKm_vHj" role="1m5AlR">
921+
<ref role="3cqZAo" node="5L2mTKm_py4" resolve="other" />
922+
</node>
923+
</node>
924+
</node>
925+
</node>
926+
<node concept="3cpWs8" id="1yuOfVwy7Mv" role="3cqZAp">
927+
<node concept="3cpWsn" id="1yuOfVwy7Mw" role="3cpWs9">
928+
<property role="TrG5h" value="thisUnits" />
929+
<node concept="A3Dl8" id="1yuOfVwy7Er" role="1tU5fm">
930+
<node concept="3Tqbb2" id="1yuOfVwy7Eu" role="A3Ik2">
931+
<ref role="ehGHo" to="b0gq:7eOyx9r3k4t" resolve="UnitSpecification" />
932+
</node>
933+
</node>
934+
<node concept="2OqwBi" id="1yuOfVwy7Mx" role="33vP2m">
935+
<node concept="2OqwBi" id="1yuOfVwy7My" role="2Oq$k0">
936+
<node concept="13iPFW" id="1yuOfVwy7Mz" role="2Oq$k0" />
937+
<node concept="3Tsc0h" id="1yuOfVwy7M$" role="2OqNvi">
938+
<ref role="3TtcxE" to="w1hl:1xEzHAktP2R" resolve="tags" />
939+
</node>
940+
</node>
941+
<node concept="v3k3i" id="1yuOfVwy7M_" role="2OqNvi">
942+
<node concept="chp4Y" id="1yuOfVwy7MA" role="v3oSu">
943+
<ref role="cht4Q" to="b0gq:7eOyx9r3k4t" resolve="UnitSpecification" />
944+
</node>
945+
</node>
946+
</node>
947+
</node>
948+
</node>
949+
<node concept="3cpWs8" id="1yuOfVwy8_N" role="3cqZAp">
950+
<node concept="3cpWsn" id="1yuOfVwy8_O" role="3cpWs9">
951+
<property role="TrG5h" value="otherUnits" />
952+
<node concept="A3Dl8" id="1yuOfVwy8_P" role="1tU5fm">
953+
<node concept="3Tqbb2" id="1yuOfVwy8_Q" role="A3Ik2">
954+
<ref role="ehGHo" to="b0gq:7eOyx9r3k4t" resolve="UnitSpecification" />
955+
</node>
956+
</node>
957+
<node concept="2OqwBi" id="1yuOfVwy8_R" role="33vP2m">
958+
<node concept="2OqwBi" id="1yuOfVwy8_S" role="2Oq$k0">
959+
<node concept="37vLTw" id="1yuOfVwy8No" role="2Oq$k0">
960+
<ref role="3cqZAo" node="5L2mTKm_vHh" resolve="casted" />
961+
</node>
962+
<node concept="3Tsc0h" id="1yuOfVwy8_U" role="2OqNvi">
963+
<ref role="3TtcxE" to="w1hl:1xEzHAktP2R" resolve="tags" />
964+
</node>
965+
</node>
966+
<node concept="v3k3i" id="1yuOfVwy8_V" role="2OqNvi">
967+
<node concept="chp4Y" id="1yuOfVwy8_W" role="v3oSu">
968+
<ref role="cht4Q" to="b0gq:7eOyx9r3k4t" resolve="UnitSpecification" />
969+
</node>
970+
</node>
971+
</node>
972+
</node>
973+
</node>
974+
<node concept="3cpWs6" id="3Up1DZuQD0k" role="3cqZAp">
975+
<node concept="2OqwBi" id="1yuOfVwyi98" role="3cqZAk">
976+
<node concept="2OqwBi" id="1yuOfVwydg4" role="2Oq$k0">
977+
<node concept="2OqwBi" id="1yuOfVwycnv" role="2Oq$k0">
978+
<node concept="2OqwBi" id="1yuOfVwyamm" role="2Oq$k0">
979+
<node concept="37vLTw" id="1yuOfVwy9Xr" role="2Oq$k0">
980+
<ref role="3cqZAo" node="1yuOfVwy7Mw" resolve="thisUnits" />
981+
</node>
982+
<node concept="13MTOL" id="1yuOfVwybVD" role="2OqNvi">
983+
<ref role="13MTZf" to="b0gq:7eOyx9r3qG3" resolve="components" />
984+
</node>
985+
</node>
986+
<node concept="13MTOL" id="1yuOfVwyc_g" role="2OqNvi">
987+
<ref role="13MTZf" to="b0gq:7eOyx9r3qFW" resolve="unit" />
988+
</node>
989+
</node>
990+
<node concept="2NgGto" id="30JUdzLCGDF" role="2OqNvi">
991+
<node concept="2OqwBi" id="30JUdzLCK4x" role="576Qk">
992+
<node concept="2OqwBi" id="30JUdzLCI9B" role="2Oq$k0">
993+
<node concept="37vLTw" id="30JUdzLCGTD" role="2Oq$k0">
994+
<ref role="3cqZAo" node="1yuOfVwy8_O" resolve="otherUnits" />
995+
</node>
996+
<node concept="13MTOL" id="30JUdzLCIPE" role="2OqNvi">
997+
<ref role="13MTZf" to="b0gq:7eOyx9r3qG3" resolve="components" />
998+
</node>
999+
</node>
1000+
<node concept="13MTOL" id="30JUdzLCKD7" role="2OqNvi">
1001+
<ref role="13MTZf" to="b0gq:7eOyx9r3qFW" resolve="unit" />
1002+
</node>
1003+
</node>
1004+
</node>
1005+
</node>
1006+
<node concept="1v1jN8" id="1yuOfVwyjdz" role="2OqNvi" />
1007+
</node>
1008+
</node>
1009+
</node>
1010+
<node concept="37vLTG" id="5L2mTKm_py4" role="3clF46">
1011+
<property role="TrG5h" value="other" />
1012+
<node concept="3Tqbb2" id="5L2mTKm_py5" role="1tU5fm">
1013+
<ref role="ehGHo" to="hm2y:6sdnDbSlaok" resolve="Type" />
1014+
</node>
1015+
</node>
1016+
<node concept="10P_77" id="5L2mTKm_py6" role="3clF45" />
1017+
</node>
8271018
</node>
8281019
<node concept="13h7C7" id="4HxogODTmV$">
8291020
<ref role="13h7C2" to="w1hl:4HxogODR$_x" resolve="ITag" />

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/models/org/iets3/core/expr/typetags/structure.mps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</languages>
77
<imports>
88
<import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" />
9-
<import index="3673" ref="r:78633c85-d020-485e-aaa3-59e2daa3b826(com.mbeddr.mpsutil.interpreter.structure)" implicit="true" />
9+
<import index="3673" ref="r:78633c85-d020-485e-aaa3-59e2daa3b826(com.mbeddr.mpsutil.interpreter.structure)" />
1010
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
1111
</imports>
1212
<registry>

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/org.iets3.core.expr.typetags.mpl‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,11 @@
105105
<dependency reexport="false">20c6e580-bdc5-4067-8049-d7e3265a86de(jetbrains.mps.typesystemEngine)</dependency>
106106
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
107107
<dependency reexport="false">7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)</dependency>
108-
<dependency reexport="false">47f075a6-558e-4640-a606-7ce0236c8023(com.mbeddr.mpsutil.interpreter)</dependency>
109108
<dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
110109
<dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
111110
<dependency reexport="false">71934284-d7d1-45ee-a054-8c072591085f(org.iets3.core.expr.toplevel)</dependency>
111+
<dependency reexport="false">cb91a38e-738a-4811-a96d-448d08f526fa(org.iets3.core.expr.typetags.units)</dependency>
112+
<dependency reexport="false">47f075a6-558e-4640-a606-7ce0236c8023(com.mbeddr.mpsutil.interpreter)</dependency>
112113
</dependencies>
113114
<languageVersions>
114115
<language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="2" />
@@ -193,8 +194,10 @@
193194
<module reference="2f7e2e35-6e74-4c43-9fa5-2465d68f5996(org.iets3.core.expr.collections)" version="5" />
194195
<module reference="9464fa06-5ab9-409b-9274-64ab29588457(org.iets3.core.expr.lambda)" version="0" />
195196
<module reference="f3eafff0-30d2-46d6-9150-f0f3b880ce27(org.iets3.core.expr.path)" version="0" />
197+
<module reference="6b277d9a-d52d-416f-a209-1919bd737f50(org.iets3.core.expr.simpleTypes)" version="1" />
196198
<module reference="71934284-d7d1-45ee-a054-8c072591085f(org.iets3.core.expr.toplevel)" version="2" />
197199
<module reference="5186c6ce-428c-4f09-a9df-73d9e86c27d3(org.iets3.core.expr.typetags)" version="0" />
200+
<module reference="cb91a38e-738a-4811-a96d-448d08f526fa(org.iets3.core.expr.typetags.units)" version="1" />
198201
</dependencyVersions>
199202
<extendedLanguages>
200203
<extendedLanguage>cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)</extendedLanguage>

0 commit comments

Comments
 (0)