Skip to content

Commit ab8cc89

Browse files
mgronovermgronover
authored
Merge pull request #872 from IETS3/bugfix/TypeSystemImprovement
Bugfix/type system improvement
2 parents 63658ef + e32a693 commit ab8cc89

File tree

4 files changed

+580
-16
lines changed

4 files changed

+580
-16
lines changed

‎code/languages/org.iets3.opensource/languages/org.iets3.core.base/org.iets3.core.base.mpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
1717
<dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
1818
<dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
19-
<dependency reexport="false">5454dbfd-2075-4de0-b85e-fa645eb6957e(com.mbeddr.mpsutil.serializer.xml)</dependency>
19+
<dependency reexport="false">5454dbfd-2075-4de0-b85e-fa645eb6957e(de.itemis.mps.utils.serializer.xml)</dependency>
2020
<dependency reexport="false">f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)</dependency>
2121
</dependencies>
2222
<languageVersions>
@@ -72,10 +72,10 @@
7272
<module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
7373
<module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
7474
<module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
75-
<module reference="5454dbfd-2075-4de0-b85e-fa645eb6957e(com.mbeddr.mpsutil.serializer.xml)" version="0" />
7675
<module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
7776
<module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
7877
<module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
78+
<module reference="5454dbfd-2075-4de0-b85e-fa645eb6957e(de.itemis.mps.utils.serializer.xml)" version="0" />
7979
<module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
8080
<module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
8181
<module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />

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

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22903,6 +22903,84 @@
2290322903
</node>
2290422904
<node concept="17QB3L" id="7VuYlCR4z4M" role="3clF45" />
2290522905
</node>
22906+
<node concept="13i0hz" id="H8GgRpqbgk" role="13h7CS">
22907+
<property role="TrG5h" value="sortTypes" />
22908+
<node concept="3Tm1VV" id="H8GgRpqbgl" role="1B3o_S" />
22909+
<node concept="3cqZAl" id="H8GgRpqtdX" role="3clF45" />
22910+
<node concept="3clFbS" id="H8GgRpqbgn" role="3clF47">
22911+
<node concept="3cpWs8" id="H8GgRpq_ig" role="3cqZAp">
22912+
<node concept="3cpWsn" id="H8GgRpq_ij" role="3cpWs9">
22913+
<property role="TrG5h" value="sortedTypes" />
22914+
<node concept="2I9FWS" id="H8GgRpq_ie" role="1tU5fm">
22915+
<ref role="2I9WkF" to="hm2y:6sdnDbSlaok" resolve="Type" />
22916+
</node>
22917+
<node concept="2OqwBi" id="H8GgRpqPv3" role="33vP2m">
22918+
<node concept="2OqwBi" id="H8GgRpqBU5" role="2Oq$k0">
22919+
<node concept="2OqwBi" id="H8GgRpqtp5" role="2Oq$k0">
22920+
<node concept="13iPFW" id="H8GgRpqtew" role="2Oq$k0" />
22921+
<node concept="3Tsc0h" id="H8GgRpqtFR" role="2OqNvi">
22922+
<ref role="3TtcxE" to="hm2y:7VuYlCQZ3lm" resolve="types" />
22923+
</node>
22924+
</node>
22925+
<node concept="2S7cBI" id="H8GgRpqMKU" role="2OqNvi">
22926+
<node concept="1bVj0M" id="H8GgRpqMKW" role="23t8la">
22927+
<node concept="3clFbS" id="H8GgRpqMKX" role="1bW5cS">
22928+
<node concept="3clFbF" id="H8GgRpqMQm" role="3cqZAp">
22929+
<node concept="2OqwBi" id="H8GgRpqO9H" role="3clFbG">
22930+
<node concept="2OqwBi" id="H8GgRpqN5i" role="2Oq$k0">
22931+
<node concept="37vLTw" id="H8GgRpqMQl" role="2Oq$k0">
22932+
<ref role="3cqZAo" node="H8GgRpqMKY" resolve="it" />
22933+
</node>
22934+
<node concept="2yIwOk" id="H8GgRpqNHd" role="2OqNvi" />
22935+
</node>
22936+
<node concept="liA8E" id="H8GgRpqOBY" role="2OqNvi">
22937+
<ref role="37wK5l" to="c17a:~SAbstractConcept.getName()" resolve="getName" />
22938+
</node>
22939+
</node>
22940+
</node>
22941+
</node>
22942+
<node concept="Rh6nW" id="H8GgRpqMKY" role="1bW2Oz">
22943+
<property role="TrG5h" value="it" />
22944+
<node concept="2jxLKc" id="H8GgRpqMKZ" role="1tU5fm" />
22945+
</node>
22946+
</node>
22947+
<node concept="1nlBCl" id="H8GgRpqML0" role="2S7zOq">
22948+
<property role="3clFbU" value="true" />
22949+
</node>
22950+
</node>
22951+
</node>
22952+
<node concept="ANE8D" id="H8GgRpqQu3" role="2OqNvi" />
22953+
</node>
22954+
</node>
22955+
</node>
22956+
<node concept="3clFbF" id="H8GgRpqQBG" role="3cqZAp">
22957+
<node concept="2OqwBi" id="H8GgRpqTBH" role="3clFbG">
22958+
<node concept="2OqwBi" id="H8GgRpqQUt" role="2Oq$k0">
22959+
<node concept="13iPFW" id="H8GgRpqQBE" role="2Oq$k0" />
22960+
<node concept="3Tsc0h" id="H8GgRpqRuE" role="2OqNvi">
22961+
<ref role="3TtcxE" to="hm2y:7VuYlCQZ3lm" resolve="types" />
22962+
</node>
22963+
</node>
22964+
<node concept="2Kehj3" id="H8GgRpqYAB" role="2OqNvi" />
22965+
</node>
22966+
</node>
22967+
<node concept="3clFbF" id="H8GgRpr4Hu" role="3cqZAp">
22968+
<node concept="2OqwBi" id="H8GgRprgMy" role="3clFbG">
22969+
<node concept="2OqwBi" id="H8GgRpr84a" role="2Oq$k0">
22970+
<node concept="13iPFW" id="H8GgRpr4Hs" role="2Oq$k0" />
22971+
<node concept="3Tsc0h" id="H8GgRprbCF" role="2OqNvi">
22972+
<ref role="3TtcxE" to="hm2y:7VuYlCQZ3lm" resolve="types" />
22973+
</node>
22974+
</node>
22975+
<node concept="X8dFx" id="H8GgRprm0$" role="2OqNvi">
22976+
<node concept="37vLTw" id="H8GgRprqSp" role="25WWJ7">
22977+
<ref role="3cqZAo" node="H8GgRpq_ij" resolve="sortedTypes" />
22978+
</node>
22979+
</node>
22980+
</node>
22981+
</node>
22982+
</node>
22983+
</node>
2290622984
</node>
2290722985
<node concept="13h7C7" id="XblfskIwwQ">
2290822986
<ref role="13h7C2" to="hm2y:XblfskIwr9" resolve="IMultiTraceRoot" />

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

Lines changed: 111 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
<import index="btm1" ref="b0f8641f-bd77-4421-8425-30d9088a82f7/java:org.apache.commons.lang3(org.apache.commons/)" />
2323
<import index="xfg9" ref="r:ac28053f-2041-47f6-806b-ecfaca05a64a(org.iets3.core.expr.base.runtime.runtime)" />
2424
<import index="90d" ref="r:421d64ed-8024-497f-aeab-8bddeb389dd2(jetbrains.mps.lang.extension.methods)" />
25+
<import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
2526
<import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
27+
<import index="pbu6" ref="r:83e946de-2a7f-4a4c-b3c9-4f671aa7f2db(org.iets3.core.expr.base.behavior)" implicit="true" />
2628
</imports>
2729
<registry>
2830
<language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -100,6 +102,9 @@
100102
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
101103
<child id="1068431790190" name="initializer" index="33vP2m" />
102104
</concept>
105+
<concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
106+
<property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
107+
</concept>
103108
<concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
104109
<reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
105110
</concept>
@@ -195,6 +200,7 @@
195200
<concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
196201
<concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
197202
<reference id="1170346070688" name="classifier" index="1Y3XeK" />
203+
<child id="1201186121363" name="typeParameter" index="2Ghqu4" />
198204
</concept>
199205
</language>
200206
<language id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension">
@@ -359,6 +365,7 @@
359365
<concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
360366
<concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
361367
<concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
368+
<concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
362369
<concept id="1225711141656" name="jetbrains.mps.baseLanguage.collections.structure.ListElementAccessExpression" flags="nn" index="1y4W85">
363370
<child id="1225711182005" name="list" index="1y566C" />
364371
<child id="1225711191269" name="index" index="1y58nS" />
@@ -1935,6 +1942,99 @@
19351942
</node>
19361943
</node>
19371944
</node>
1945+
<node concept="3clFbF" id="738HPfgQhkT" role="3cqZAp">
1946+
<node concept="2OqwBi" id="738HPfgQtDZ" role="3clFbG">
1947+
<node concept="37vLTw" id="738HPfgQhkR" role="2Oq$k0">
1948+
<ref role="3cqZAo" node="1cX0cm8Zurw" resolve="jt" />
1949+
</node>
1950+
<node concept="2qgKlT" id="738HPfgQB1O" role="2OqNvi">
1951+
<ref role="37wK5l" to="pbu6:H8GgRpqbgk" resolve="sortTypes" />
1952+
</node>
1953+
</node>
1954+
</node>
1955+
<node concept="3clFbF" id="7JCDpchDZwS" role="3cqZAp">
1956+
<node concept="2OqwBi" id="7JCDpchEFHq" role="3clFbG">
1957+
<node concept="2OqwBi" id="7JCDpchEaLn" role="2Oq$k0">
1958+
<node concept="37vLTw" id="7JCDpchDZwR" role="2Oq$k0">
1959+
<ref role="3cqZAo" node="1cX0cm8Zurw" resolve="jt" />
1960+
</node>
1961+
<node concept="3Tsc0h" id="7JCDpchEouj" role="2OqNvi">
1962+
<ref role="3TtcxE" to="hm2y:7VuYlCQZ3lm" resolve="types" />
1963+
</node>
1964+
</node>
1965+
<node concept="liA8E" id="7JCDpchF17F" role="2OqNvi">
1966+
<ref role="37wK5l" to="33ny:~Collection.removeIf(java.util.function.Predicate)" resolve="removeIf" />
1967+
<node concept="2ShNRf" id="7JCDpchLjN2" role="37wK5m">
1968+
<node concept="YeOm9" id="7JCDpchL_eb" role="2ShVmc">
1969+
<node concept="1Y3b0j" id="7JCDpchL_ee" role="YeSDq">
1970+
<property role="2bfB8j" value="true" />
1971+
<property role="373rjd" value="true" />
1972+
<ref role="1Y3XeK" to="82uw:~Predicate" resolve="Predicate" />
1973+
<ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
1974+
<node concept="3Tm1VV" id="7JCDpchL_ef" role="1B3o_S" />
1975+
<node concept="3clFb_" id="7JCDpchL_et" role="jymVt">
1976+
<property role="TrG5h" value="test" />
1977+
<node concept="3Tm1VV" id="7JCDpchL_eu" role="1B3o_S" />
1978+
<node concept="10P_77" id="7JCDpchL_ew" role="3clF45" />
1979+
<node concept="37vLTG" id="7JCDpchL_ex" role="3clF46">
1980+
<property role="TrG5h" value="p1" />
1981+
<node concept="3uibUv" id="7JCDpchL_i0" role="1tU5fm">
1982+
<ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
1983+
</node>
1984+
</node>
1985+
<node concept="3clFbS" id="7JCDpchL_ez" role="3clF47">
1986+
<node concept="3clFbF" id="7JCDpchLOGR" role="3cqZAp">
1987+
<node concept="2OqwBi" id="7JCDpchLYU4" role="3clFbG">
1988+
<node concept="37vLTw" id="7JCDpchLOGQ" role="2Oq$k0">
1989+
<ref role="3cqZAo" node="7JCDpchL_ex" resolve="p1" />
1990+
</node>
1991+
<node concept="liA8E" id="7JCDpchMax_" role="2OqNvi">
1992+
<ref role="37wK5l" to="mhbf:~SNode.isInstanceOfConcept(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="isInstanceOfConcept" />
1993+
<node concept="35c_gC" id="7JCDpchMp6y" role="37wK5m">
1994+
<ref role="35c_gD" to="hm2y:3tcv7J0pmjC" resolve="EmptyType" />
1995+
</node>
1996+
</node>
1997+
</node>
1998+
</node>
1999+
</node>
2000+
<node concept="2AHcQZ" id="7JCDpchL_e_" role="2AJF6D">
2001+
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
2002+
</node>
2003+
</node>
2004+
<node concept="3uibUv" id="7JCDpchL_hZ" role="2Ghqu4">
2005+
<ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
2006+
</node>
2007+
</node>
2008+
</node>
2009+
</node>
2010+
</node>
2011+
</node>
2012+
</node>
2013+
<node concept="3clFbJ" id="7JCDpch_jK9" role="3cqZAp">
2014+
<node concept="3clFbS" id="7JCDpch_jKb" role="3clFbx">
2015+
<node concept="3cpWs6" id="7JCDpchOmSQ" role="3cqZAp">
2016+
<node concept="2ShNRf" id="7JCDpchOI_u" role="3cqZAk">
2017+
<node concept="3zrR0B" id="7JCDpchOIyJ" role="2ShVmc">
2018+
<node concept="3Tqbb2" id="7JCDpchOIyK" role="3zrR0E">
2019+
<ref role="ehGHo" to="hm2y:3tcv7J0pmjC" resolve="EmptyType" />
2020+
</node>
2021+
</node>
2022+
</node>
2023+
</node>
2024+
</node>
2025+
<node concept="2OqwBi" id="7JCDpch$tFj" role="3clFbw">
2026+
<node concept="2OqwBi" id="7JCDpch$3ie" role="2Oq$k0">
2027+
<node concept="37vLTw" id="7JCDpchzQLK" role="2Oq$k0">
2028+
<ref role="3cqZAo" node="1cX0cm8Zurw" resolve="jt" />
2029+
</node>
2030+
<node concept="3Tsc0h" id="7JCDpch$eRZ" role="2OqNvi">
2031+
<ref role="3TtcxE" to="hm2y:7VuYlCQZ3lm" resolve="types" />
2032+
</node>
2033+
</node>
2034+
<node concept="1v1jN8" id="7JCDpchNXIY" role="2OqNvi" />
2035+
</node>
2036+
</node>
2037+
<node concept="3clFbH" id="7JCDpchRjjZ" role="3cqZAp" />
19382038
<node concept="3clFbJ" id="6irnVZTrlW7" role="3cqZAp">
19392039
<node concept="3clFbS" id="6irnVZTrlW9" role="3clFbx">
19402040
<node concept="3cpWs6" id="6irnVZTtp2C" role="3cqZAp">
@@ -2608,6 +2708,16 @@
26082708
</node>
26092709
</node>
26102710
</node>
2711+
<node concept="3clFbF" id="738HPfgQXcL" role="3cqZAp">
2712+
<node concept="2OqwBi" id="738HPfgR54b" role="3clFbG">
2713+
<node concept="37vLTw" id="738HPfgQXcJ" role="2Oq$k0">
2714+
<ref role="3cqZAo" node="1G7Ce6wlPOc" resolve="jt" />
2715+
</node>
2716+
<node concept="2qgKlT" id="738HPfgRkXU" role="2OqNvi">
2717+
<ref role="37wK5l" to="pbu6:H8GgRpqbgk" resolve="sortTypes" />
2718+
</node>
2719+
</node>
2720+
</node>
26112721
<node concept="3cpWs6" id="1G7Ce6w_U39" role="3cqZAp">
26122722
<node concept="37vLTw" id="1G7Ce6wA3HL" role="3cqZAk">
26132723
<ref role="3cqZAo" node="1G7Ce6wlPOc" resolve="jt" />
@@ -2671,7 +2781,7 @@
26712781
</node>
26722782
</node>
26732783
</node>
2674-
<node concept="3clFbH" id="5Am5nOKXK3Z" role="3cqZAp" />
2784+
<node concept="3clFbH" id="7JCDpchWuq7" role="3cqZAp" />
26752785
<node concept="3cpWs8" id="1G7Ce6wQ1ls" role="3cqZAp">
26762786
<node concept="3cpWsn" id="1G7Ce6wQ1lv" role="3cpWs9">
26772787
<property role="TrG5h" value="idxA" />

0 commit comments

Comments
 (0)