natas_hw
/
mps-coderules
mirror of https://github.com/JetBrains/mps-coderules
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor types in all mps foundation langs. Drop node-ptr usage as anchor in terms. 

Drop node-ptr in node features, macro calls.
Drop node-ptr types in rule templates and recover closures,
fix BiConsumer params
Drop node-ptr// refs where appropriate.
Drop pointer operations from macro calls and term ctor's; add resolve to FunctionTypeLookup static table.
Drop node pointer operations from constraints, add require statements in SModel types macro table.
This commit is contained in:
Fedor Isakov 2020-11-09 12:28:19 +01:00
parent 2c8f1a9294
commit fe16b80132
12 changed files with 4658 additions and 3097 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
View File

@ -383,7 +383,7 @@
</node>
<node concept="3uibUv" id="5fMWD6IydIz" role="3vLBG7">
<ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
<node concept="2sp9CU" id="5fMWD6IydI$" role="11_B2D" />
<node concept="2sp9CU" id="3CulEO2bihL" role="11_B2D" />
<node concept="3Tqbb2" id="5fMWD6IydI_" role="11_B2D" />
</node>
</node>

6
samples/fitch/languages/samples.fitch/models/types.mps
View File

@ -212,7 +212,7 @@
</node>
<node concept="3uibUv" id="5fMWD6Iy9zN" role="3vLBG7">
<ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
<node concept="2sp9CU" id="5fMWD6Iy9zO" role="11_B2D" />
<node concept="2sp9CU" id="3CulEO2biwA" role="11_B2D" />
<node concept="3Tqbb2" id="5fMWD6Iy9zP" role="11_B2D" />
</node>
</node>
@ -266,7 +266,7 @@
</node>
<node concept="3uibUv" id="5fMWD6Iy9Aj" role="3vLBG7">
<ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
<node concept="2sp9CU" id="5fMWD6Iy9Ak" role="11_B2D" />
<node concept="2sp9CU" id="3CulEO2bixG" role="11_B2D" />
<node concept="3Tqbb2" id="5fMWD6Iy9Al" role="11_B2D" />
</node>
</node>
@ -431,7 +431,7 @@
</node>
<node concept="3uibUv" id="5fMWD6Iy9CH" role="3vLBG7">
<ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
<node concept="2sp9CU" id="5fMWD6Iy9CI" role="11_B2D" />
<node concept="2sp9CU" id="3CulEO2biyM" role="11_B2D" />
<node concept="3Tqbb2" id="5fMWD6Iy9CJ" role="11_B2D" />
</node>
</node>

57
samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
View File

@ -3709,7 +3709,7 @@
</node>
<node concept="3uibUv" id="5fMWD6IxD5s" role="3vLBG7">
<ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
<node concept="2sp9CU" id="5fMWD6IxD5t" role="11_B2D" />
<node concept="2sp9CU" id="3CulEO2bjq6" role="11_B2D" />
<node concept="3Tqbb2" id="5fMWD6IxD5u" role="11_B2D" />
</node>
</node>
@ -3789,7 +3789,7 @@
</node>
<node concept="3uibUv" id="5fMWD6IxD8p" role="3vLBG7">
<ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
<node concept="2sp9CU" id="5fMWD6IxD8q" role="11_B2D" />
<node concept="2sp9CU" id="3CulEO2bjrc" role="11_B2D" />
<node concept="3Tqbb2" id="5fMWD6IxD8r" role="11_B2D" />
</node>
</node>
@ -10662,11 +10662,8 @@
<ref role="3Tt5mk" to="8tt8:2O9ahh6mHnL" resolve="typeVar" />
</node>
</node>
<node concept="2OqwBi" id="5itBwM9xeAd" role="3jicU7">
<node concept="3A2sRY" id="5itBwM9xeu4" role="2Oq$k0">
<ref role="3A2yKK" node="47tET_W4WOD" resolve="tc" />
</node>
<node concept="iZEcu" id="5itBwM9xeCT" role="2OqNvi" />
<node concept="3A2sRY" id="5itBwM9xeu4" role="3jicU7">
<ref role="3A2yKK" node="47tET_W4WOD" resolve="tc" />
</node>
<node concept="a7P8L" id="5itBwM9xd_u" role="3jm6SO">
<ref role="a7OzE" node="47tET_W4WO4" resolve="Ctr" />
@ -10762,20 +10759,17 @@
</node>
<node concept="3cpWs8" id="47tET_WsEYJ" role="3cqZAp">
<node concept="3cpWsn" id="47tET_WsEYM" role="3cpWs9">
<property role="TrG5h" value="tcPtr" />
<node concept="2sp9CU" id="47tET_WsEYH" role="1tU5fm">
<ref role="2sp9C9" to="8tt8:2O9ahh6mHnA" resolve="Typeclass" />
<property role="TrG5h" value="tc" />
<node concept="3Tqbb2" id="3CulEO1Zy2r" role="1tU5fm">
<ref role="ehGHo" to="8tt8:2O9ahh6mHnA" resolve="Typeclass" />
</node>
<node concept="2OqwBi" id="47tET_WsFW6" role="33vP2m">
<node concept="2OqwBi" id="47tET_WsF91" role="2Oq$k0">
<node concept="3A2sRY" id="47tET_WsEZw" role="2Oq$k0">
<ref role="3A2yKK" node="47tET_W4OB4" resolve="inst" />
</node>
<node concept="3TrEf2" id="47tET_WsFnw" role="2OqNvi">
<ref role="3Tt5mk" to="8tt8:2O9ahh6mHo2" resolve="typeclass" />
</node>
<node concept="2OqwBi" id="47tET_WsF91" role="33vP2m">
<node concept="3A2sRY" id="47tET_WsEZw" role="2Oq$k0">
<ref role="3A2yKK" node="47tET_W4OB4" resolve="inst" />
</node>
<node concept="3TrEf2" id="47tET_WsFnw" role="2OqNvi">
<ref role="3Tt5mk" to="8tt8:2O9ahh6mHo2" resolve="typeclass" />
</node>
<node concept="iZEcu" id="47tET_WsGAk" role="2OqNvi" />
</node>
</node>
</node>
@ -10882,7 +10876,7 @@
<node concept="nsMwS" id="47tET_W_5pl" role="ns1xD">
<ref role="nsMwP" node="47tET_W4Sc3" resolve="typeclass" />
<node concept="37vLTw" id="47tET_W_5pp" role="nsMwV">
<ref role="3cqZAo" node="47tET_WsEYM" resolve="tcPtr" />
<ref role="3cqZAo" node="47tET_WsEYM" resolve="tc" />
</node>
</node>
</node>
@ -16167,16 +16161,13 @@
<ref role="3Tt5mk" to="8tt8:2O9ahh6tFol" resolve="varRef" />
</node>
</node>
<node concept="2OqwBi" id="5itBwM9CyR2" role="3jicU7">
<node concept="2OqwBi" id="5itBwM9Cy_A" role="2Oq$k0">
<node concept="3j8tct" id="5itBwM9Cyuy" role="2Oq$k0">
<ref role="3j8tcu" node="5itBwM9CvD9" resolve="ctrs" />
</node>
<node concept="3TrEf2" id="5itBwM9CyI2" role="2OqNvi">
<ref role="3Tt5mk" to="8tt8:2O9ahh6mHvj" resolve="typeclass" />
</node>
<node concept="2OqwBi" id="5itBwM9Cy_A" role="3jicU7">
<node concept="3j8tct" id="5itBwM9Cyuy" role="2Oq$k0">
<ref role="3j8tcu" node="5itBwM9CvD9" resolve="ctrs" />
</node>
<node concept="3TrEf2" id="5itBwM9CyI2" role="2OqNvi">
<ref role="3Tt5mk" to="8tt8:2O9ahh6mHvj" resolve="typeclass" />
</node>
<node concept="iZEcu" id="5itBwM9Cznl" role="2OqNvi" />
</node>
<node concept="a7P8L" id="5itBwM9Cxal" role="3jm6SO">
<ref role="a7OzE" node="5itBwM9KVQT" resolve="Type" />
@ -16200,9 +16191,9 @@
</node>
</node>
<node concept="3hPv5a" id="5itBwM9nSMV" role="3hP23H">
<property role="TrG5h" value="tcPtr" />
<node concept="2sp9CU" id="5itBwM9nSN1" role="3hPmi9">
<ref role="2sp9C9" to="8tt8:2O9ahh6mHnA" resolve="Typeclass" />
<property role="TrG5h" value="tc" />
<node concept="3Tqbb2" id="3CulEO1Zy2k" role="3hPmi9">
<ref role="ehGHo" to="8tt8:2O9ahh6mHnA" resolve="Typeclass" />
</node>
</node>
<node concept="3clFbS" id="5itBwM9nSFk" role="3hEL4E">
@ -16227,7 +16218,7 @@
<node concept="nsMwS" id="5itBwM9nSQi" role="ns1xD">
<ref role="nsMwP" node="47tET_W4Sc3" resolve="typeclass" />
<node concept="3hN9Ij" id="7L5omgeUgbA" role="nsMwV">
<ref role="3hLkJx" node="5itBwM9nSMV" resolve="tcPtr" />
<ref role="3hLkJx" node="5itBwM9nSMV" resolve="tc" />
</node>
</node>
</node>

4210
samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps
View File

File diff suppressed because it is too large Load Diff

172
samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.types.mps
View File

@ -160,7 +160,6 @@
<concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
<reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
</concept>
<concept id="5045161044515397667" name="jetbrains.mps.lang.smodel.structure.Node_PointerOperation" flags="ng" index="iZEcu" />
<concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
<concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
<child id="7400021826774799510" name="ref" index="2tJFKM" />
@ -2255,11 +2254,8 @@
<ref role="ns1xF" node="3Z1xyIw$iHJ" resolve="customContainer" />
<node concept="nsMwS" id="3Z1xyIw_hXM" role="ns1xD">
<ref role="nsMwP" node="3Z1xyIw$iIA" resolve="decl" />
<node concept="2OqwBi" id="3Z1xyIw_i0d" role="nsMwV">
<node concept="3hN9Ij" id="3Z1xyIw_hXQ" role="2Oq$k0">
<ref role="3hLkJx" node="3Z1xyIw_6NZ" resolve="decl" />
</node>
<node concept="iZEcu" id="3Z1xyIw_i1h" role="2OqNvi" />
<node concept="3hN9Ij" id="3Z1xyIw_hXQ" role="nsMwV">
<ref role="3hLkJx" node="3Z1xyIw_6NZ" resolve="decl" />
</node>
</node>
<node concept="nsMwS" id="3Z1xyIw_i1M" role="ns1xD">
@ -5506,9 +5502,14 @@
<ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
<node concept="nsMwS" id="1oUE7CX4Ntb" role="ns1xD">
<ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
<node concept="2tJFMh" id="1oUE7CX4Ntf" role="nsMwV">
<node concept="ZC_QK" id="1oUE7CX4O8w" role="2tJFKM">
<ref role="2aWVGs" to="33ny:~Collection" resolve="Collection" />
<node concept="2OqwBi" id="3CulEO1Y7$k" role="nsMwV">
<node concept="2c44tf" id="3CulEO1Y7$l" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1Y7$m" role="2c44tc">
<ref role="3uigEE" to="33ny:~Collection" resolve="Collection" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1Y7$n" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
</node>
@ -5589,9 +5590,14 @@
<ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
<node concept="nsMwS" id="1oUE7CX4NRA" role="ns1xD">
<ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
<node concept="2tJFMh" id="1oUE7CX4NRB" role="nsMwV">
<node concept="ZC_QK" id="1oUE7CX4OrC" role="2tJFKM">
<ref role="2aWVGs" to="33ny:~List" resolve="List" />
<node concept="2OqwBi" id="3CulEO1Y7$o" role="nsMwV">
<node concept="2c44tf" id="3CulEO1Y7$p" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1Y7$q" role="2c44tc">
<ref role="3uigEE" to="33ny:~List" resolve="List" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1Y7$r" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
</node>
@ -5672,9 +5678,14 @@
<ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
<node concept="nsMwS" id="1oUE7CX4NUB" role="ns1xD">
<ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
<node concept="2tJFMh" id="1oUE7CX4NUC" role="nsMwV">
<node concept="ZC_QK" id="1oUE7CX5gS0" role="2tJFKM">
<ref role="2aWVGs" to="33ny:~LinkedList" resolve="LinkedList" />
<node concept="2OqwBi" id="3CulEO1Y7$s" role="nsMwV">
<node concept="2c44tf" id="3CulEO1Y7$t" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1Y7$u" role="2c44tc">
<ref role="3uigEE" to="33ny:~LinkedList" resolve="LinkedList" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1Y7$v" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
</node>
@ -5755,9 +5766,14 @@
<ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
<node concept="nsMwS" id="1oUE7CX4NVa" role="ns1xD">
<ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
<node concept="2tJFMh" id="1oUE7CX4NVb" role="nsMwV">
<node concept="ZC_QK" id="1oUE7CX5h_i" role="2tJFKM">
<ref role="2aWVGs" to="33ny:~Deque" resolve="Deque" />
<node concept="2OqwBi" id="3CulEO1Y7$w" role="nsMwV">
<node concept="2c44tf" id="3CulEO1Y7$x" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1Y7$y" role="2c44tc">
<ref role="3uigEE" to="33ny:~Deque" resolve="Deque" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1Y7$z" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
</node>
@ -5838,9 +5854,14 @@
<ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
<node concept="nsMwS" id="1oUE7CX4NZc" role="ns1xD">
<ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
<node concept="2tJFMh" id="1oUE7CX4NZd" role="nsMwV">
<node concept="ZC_QK" id="1oUE7CXhe$o" role="2tJFKM">
<ref role="2aWVGs" to="33ny:~Deque" resolve="Deque" />
<node concept="2OqwBi" id="3CulEO1Y7$$" role="nsMwV">
<node concept="2c44tf" id="3CulEO1Y7$_" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1Y7$A" role="2c44tc">
<ref role="3uigEE" to="33ny:~Deque" resolve="Deque" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1Y7$B" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
</node>
@ -5921,9 +5942,14 @@
<ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
<node concept="nsMwS" id="1oUE7CX4NZJ" role="ns1xD">
<ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
<node concept="2tJFMh" id="1oUE7CX4NZK" role="nsMwV">
<node concept="ZC_QK" id="1oUE7CX5gSk" role="2tJFKM">
<ref role="2aWVGs" to="33ny:~Deque" resolve="Deque" />
<node concept="2OqwBi" id="3CulEO1Y7$C" role="nsMwV">
<node concept="2c44tf" id="3CulEO1Y7$D" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1Y7$E" role="2c44tc">
<ref role="3uigEE" to="33ny:~Deque" resolve="Deque" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1Y7$F" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
</node>
@ -6004,9 +6030,14 @@
<ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
<node concept="nsMwS" id="1oUE7CX4O2k" role="ns1xD">
<ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
<node concept="2tJFMh" id="1oUE7CX4O2l" role="nsMwV">
<node concept="ZC_QK" id="1oUE7CX4Orz" role="2tJFKM">
<ref role="2aWVGs" to="33ny:~Set" resolve="Set" />
<node concept="2OqwBi" id="3CulEO1Y7$G" role="nsMwV">
<node concept="2c44tf" id="3CulEO1Y7$H" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1Y7$I" role="2c44tc">
<ref role="3uigEE" to="33ny:~Set" resolve="Set" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1Y7$J" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
</node>
@ -6087,9 +6118,14 @@
<ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
<node concept="nsMwS" id="1oUE7CX5kRc" role="ns1xD">
<ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
<node concept="2tJFMh" id="1oUE7CX5kRd" role="nsMwV">
<node concept="ZC_QK" id="1oUE7CX5kU3" role="2tJFKM">
<ref role="2aWVGs" to="33ny:~SortedSet" resolve="SortedSet" />
<node concept="2OqwBi" id="3CulEO1Y7$K" role="nsMwV">
<node concept="2c44tf" id="3CulEO1Y7$L" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1Y7$M" role="2c44tc">
<ref role="3uigEE" to="33ny:~SortedSet" resolve="SortedSet" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1Y7$N" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
</node>
@ -6181,9 +6217,14 @@
<ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
<node concept="nsMwS" id="1oUE7CX5kO1" role="ns1xD">
<ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
<node concept="2tJFMh" id="1oUE7CX5kO2" role="nsMwV">
<node concept="ZC_QK" id="1oUE7CX5l1T" role="2tJFKM">
<ref role="2aWVGs" to="33ny:~Map" resolve="Map" />
<node concept="2OqwBi" id="3CulEO1Y7$O" role="nsMwV">
<node concept="2c44tf" id="3CulEO1Y7$P" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1Y7$Q" role="2c44tc">
<ref role="3uigEE" to="33ny:~Map" resolve="Map" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1Y7$R" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
</node>
@ -6280,9 +6321,14 @@
<ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
<node concept="nsMwS" id="1oUE7CX5lrO" role="ns1xD">
<ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
<node concept="2tJFMh" id="1oUE7CX5lrP" role="nsMwV">
<node concept="ZC_QK" id="1oUE7CX5luV" role="2tJFKM">
<ref role="2aWVGs" to="33ny:~SortedMap" resolve="SortedMap" />
<node concept="2OqwBi" id="3CulEO1Y7$S" role="nsMwV">
<node concept="2c44tf" id="3CulEO1Y7$T" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1Y7$U" role="2c44tc">
<ref role="3uigEE" to="33ny:~SortedMap" resolve="SortedMap" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1Y7$V" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
</node>
@ -6380,9 +6426,14 @@
<ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
<node concept="nsMwS" id="1oUE7CX4O90" role="ns1xD">
<ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
<node concept="2tJFMh" id="1oUE7CX4O91" role="nsMwV">
<node concept="ZC_QK" id="1oUE7CX4OmK" role="2tJFKM">
<ref role="2aWVGs" to="33ny:~Iterator" resolve="Iterator" />
<node concept="2OqwBi" id="3CulEO1Y7$W" role="nsMwV">
<node concept="2c44tf" id="3CulEO1Y7$X" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1Y7$Y" role="2c44tc">
<ref role="3uigEE" to="33ny:~Iterator" resolve="Iterator" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1Y7$Z" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
</node>
@ -6475,9 +6526,14 @@
<ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
<node concept="nsMwS" id="3Z1xyIwARfT" role="ns1xD">
<ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
<node concept="2tJFMh" id="3Z1xyIwARfU" role="nsMwV">
<node concept="ZC_QK" id="3Z1xyIwARfV" role="2tJFKM">
<ref role="2aWVGs" to="33ny:~Iterator" resolve="Iterator" />
<node concept="2OqwBi" id="3CulEO1Y7_0" role="nsMwV">
<node concept="2c44tf" id="3CulEO1Y7_1" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1Y7_2" role="2c44tc">
<ref role="3uigEE" to="33ny:~Iterator" resolve="Iterator" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1Y7_3" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
</node>
@ -20829,9 +20885,14 @@
<ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
<node concept="nsMwS" id="3Z1xyIwnvq0" role="ns1xD">
<ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
<node concept="2tJFMh" id="3Z1xyIwnvq1" role="nsMwV">
<node concept="ZC_QK" id="3Z1xyIwnvq2" role="2tJFKM">
<ref role="2aWVGs" to="wyt6:~Comparable" resolve="Comparable" />
<node concept="2OqwBi" id="3CulEO1Y7_4" role="nsMwV">
<node concept="2c44tf" id="3CulEO1Y7_5" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1Y7_6" role="2c44tc">
<ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1Y7_7" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
</node>
@ -25277,11 +25338,8 @@
<ref role="ns1xF" node="3Z1xyIw$iHJ" resolve="customContainer" />
<node concept="nsMwS" id="3Z1xyIw$xlJ" role="ns1xD">
<ref role="nsMwP" node="3Z1xyIw$iIA" resolve="decl" />
<node concept="2OqwBi" id="3Z1xyIw$xvI" role="nsMwV">
<node concept="3j8tct" id="3Z1xyIw$xlN" role="2Oq$k0">
<ref role="3j8tcu" node="3Z1xyIw$k4y" resolve="decl" />
</node>
<node concept="iZEcu" id="3Z1xyIw$xGG" role="2OqNvi" />
<node concept="3j8tct" id="3Z1xyIw$xlN" role="nsMwV">
<ref role="3j8tcu" node="3Z1xyIw$k4y" resolve="decl" />
</node>
</node>
<node concept="nsMwS" id="3Z1xyIw$Ds9" role="ns1xD">
@ -25383,11 +25441,8 @@
<ref role="ns1xF" node="3Z1xyIw$iHJ" resolve="customContainer" />
<node concept="nsMwS" id="3Z1xyIw_SPY" role="ns1xD">
<ref role="nsMwP" node="3Z1xyIw$iIA" resolve="decl" />
<node concept="2OqwBi" id="3Z1xyIw_TaQ" role="nsMwV">
<node concept="3A2sRY" id="3Z1xyIw_T8v" role="2Oq$k0">
<ref role="3A2yKK" node="3Z1xyIw_SPD" resolve="decl" />
</node>
<node concept="iZEcu" id="3Z1xyIw_Tcd" role="2OqNvi" />
<node concept="3A2sRY" id="3Z1xyIw_T8v" role="nsMwV">
<ref role="3A2yKK" node="3Z1xyIw_SPD" resolve="decl" />
</node>
</node>
<node concept="nsMwS" id="3Z1xyIw_TeR" role="ns1xD">
@ -25408,11 +25463,8 @@
<ref role="ns1xF" node="3Z1xyIw$iHJ" resolve="customContainer" />
<node concept="nsMwS" id="3Z1xyIw_Tff" role="ns1xD">
<ref role="nsMwP" node="3Z1xyIw$iIA" resolve="decl" />
<node concept="2OqwBi" id="3Z1xyIw_ThH" role="nsMwV">
<node concept="3A2sRY" id="3Z1xyIw_Tfm" role="2Oq$k0">
<ref role="3A2yKK" node="3Z1xyIw_SPD" resolve="decl" />
</node>
<node concept="iZEcu" id="3Z1xyIw_Tk2" role="2OqNvi" />
<node concept="3A2sRY" id="3Z1xyIw_Tfm" role="nsMwV">
<ref role="3A2yKK" node="3Z1xyIw_SPD" resolve="decl" />
</node>
</node>
<node concept="nsMwS" id="3Z1xyIw_SQ4" role="ns1xD">

34
samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/models/jetbrains.mps.baseLanguage.sequence.types.mps
View File

@ -34,9 +34,9 @@
<reference id="1107535924139" name="classifier" index="3uigEE" />
</concept>
</language>
<language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
<concept id="4733039728785194814" name="jetbrains.mps.lang.modelapi.structure.NamedNodeReference" flags="ng" index="ZC_QK">
<reference id="7256306938026143658" name="target" index="2aWVGs" />
<language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
<concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
<child id="1196350785114" name="quotedNode" index="2c44tc" />
</concept>
</language>
<language id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic">
@ -62,13 +62,13 @@
</concept>
</language>
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
<concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
<child id="7400021826774799510" name="ref" index="2tJFKM" />
</concept>
<concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
<reference id="1138405853777" name="concept" index="ehGHo" />
</concept>
<concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
<reference id="1138056516764" name="link" index="3Tt5mk" />
</concept>
</language>
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
@ -507,9 +507,14 @@
<ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
<node concept="nsMwS" id="3MFPGC50E0W" role="ns1xD">
<ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
<node concept="2tJFMh" id="3MFPGC50E3a" role="nsMwV">
<node concept="ZC_QK" id="3MFPGC50E40" role="2tJFKM">
<ref role="2aWVGs" to="wyt6:~Iterable" resolve="Iterable" />
<node concept="2OqwBi" id="3CulEO1Y7_g" role="nsMwV">
<node concept="2c44tf" id="3CulEO1Y7_h" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1Y7_i" role="2c44tc">
<ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1Y7_j" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
</node>
@ -607,9 +612,14 @@
<ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
<node concept="nsMwS" id="3MFPGC50Fah" role="ns1xD">
<ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
<node concept="2tJFMh" id="3MFPGC50Fai" role="nsMwV">
<node concept="ZC_QK" id="3MFPGC50Faj" role="2tJFKM">
<ref role="2aWVGs" to="wyt6:~Iterable" resolve="Iterable" />
<node concept="2OqwBi" id="3CulEO1Y7_k" role="nsMwV">
<node concept="2c44tf" id="3CulEO1Y7_l" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1Y7_m" role="2c44tc">
<ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1Y7_n" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
</node>

5
samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps
View File

@ -152,7 +152,6 @@
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
<concept id="1179168000618" name="jetbrains.mps.lang.smodel.structure.Node_GetIndexInParentOperation" flags="nn" index="2bSWHS" />
<concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
<concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU" />
<concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
<concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
<reference id="1145383142433" name="elementConcept" index="2I9WkF" />
@ -466,7 +465,7 @@
<property role="TrG5h" value="tupleAccessImpl" />
<node concept="1zAUYm" id="1PW9iVES6h8" role="1zAUyy">
<property role="TrG5h" value="tuple" />
<node concept="2sp9CU" id="500mE4_uhvH" role="3gTf24" />
<node concept="3Tqbb2" id="3CulEO2ic5P" role="3gTf24" />
</node>
<node concept="1zAUYm" id="500mE4_uhc0" role="1zAUyy">
<property role="TrG5h" value="index" />
@ -1006,7 +1005,7 @@
<node concept="aZer4" id="500mE4_upiQ" role="3XD1gS">
<property role="TrG5h" value="Tuple" />
</node>
<node concept="2sp9CU" id="500mE4_uplQ" role="3vLBG7" />
<node concept="3Tqbb2" id="3CulEO26Uye" role="3vLBG7" />
</node>
<node concept="3xSepi" id="500mE4_upcm" role="3xSepv">
<node concept="3Aq9E8" id="500mE4_upcn" role="3xSepj">

1301
samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
View File

File diff suppressed because it is too large Load Diff

24
samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.types.mps
View File

@ -12,6 +12,7 @@
<import index="kqnc" ref="r:92b96158-68e6-4f53-a32b-36e2b456fe01(jetbrains.mps.baseLanguageExt.types)" />
<import index="tp68" ref="r:00000000-0000-4000-0000-011c895903ac(jetbrains.mps.baseLanguageInternal.structure)" />
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
<import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
</imports>
<registry>
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@ -28,13 +29,16 @@
<concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
<child id="1068581517665" name="statement" index="3cqZAp" />
</concept>
<concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
<reference id="1107535924139" name="classifier" index="3uigEE" />
</concept>
<concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
<child id="8356039341262087992" name="line" index="1aUNEU" />
</concept>
</language>
<language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
<concept id="4733039728785194814" name="jetbrains.mps.lang.modelapi.structure.NamedNodeReference" flags="ng" index="ZC_QK">
<reference id="7256306938026143658" name="target" index="2aWVGs" />
<language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
<concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
<child id="1196350785114" name="quotedNode" index="2c44tc" />
</concept>
</language>
<language id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic">
@ -60,9 +64,6 @@
</concept>
</language>
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
<concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
<child id="7400021826774799510" name="ref" index="2tJFKM" />
</concept>
<concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
<reference id="1138056516764" name="link" index="3Tt5mk" />
</concept>
@ -1150,9 +1151,14 @@
<ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
<node concept="nsMwS" id="7gMIJIxWlC0" role="ns1xD">
<ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
<node concept="2tJFMh" id="7gMIJIxWlGH" role="nsMwV">
<node concept="ZC_QK" id="7gMIJIxWlGP" role="2tJFKM">
<ref role="2aWVGs" to="wyt6:~Class" resolve="Class" />
<node concept="2OqwBi" id="3CulEO1Y7_o" role="nsMwV">
<node concept="2c44tf" id="3CulEO1Y7_p" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1Y7_q" role="2c44tc">
<ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1Y7_r" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
</node>

133
samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.types.mps
View File

@ -17,6 +17,7 @@
<import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
<import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" />
<import index="wq2x" ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.coderules.structure)" />
<import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
<import index="x5bw" ref="r:15ea4f4e-2f41-4ce3-b7e4-a4e0737f0171(jetbrains.mps.lang.coderules.behavior)" implicit="true" />
</imports>
<registry>
@ -100,11 +101,6 @@
<child id="1196350785114" name="quotedNode" index="2c44tc" />
</concept>
</language>
<language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
<concept id="4733039728785194814" name="jetbrains.mps.lang.modelapi.structure.NamedNodeReference" flags="ng" index="ZC_QK">
<reference id="7256306938026143658" name="target" index="2aWVGs" />
</concept>
</language>
<language id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic">
<concept id="8456919074574710634" name="jetbrains.mps.logic.structure.ExpressionItem" flags="ng" index="37jhX">
<child id="8456919074574710741" name="code" index="37jj2" />
@ -137,9 +133,6 @@
<concept id="5045161044515397667" name="jetbrains.mps.lang.smodel.structure.Node_PointerOperation" flags="ng" index="iZEcu" />
<concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
<concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU" />
<concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
<child id="7400021826774799510" name="ref" index="2tJFKM" />
</concept>
<concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
<child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
<child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
@ -618,9 +611,14 @@
<node concept="3I6s7M" id="kHzC1TY7_k" role="3I6sU7">
<node concept="3jm4v3" id="kHzC1TY7_i" role="3I6s78">
<ref role="3jm46O" to="kqnc:3qUnz9vk$1o" resolve="classifierTypeNonGeneric" />
<node concept="2tJFMh" id="7LI_gNMWubV" role="3jicU7">
<node concept="ZC_QK" id="7LI_gNMWuc4" role="2tJFKM">
<ref role="2aWVGs" to="bj13:~LogicalContext" resolve="LogicalContext" />
<node concept="2OqwBi" id="3CulEO1ZTVm" role="3jicU7">
<node concept="2c44tf" id="3CulEO1ZTVn" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1ZTVo" role="2c44tc">
<ref role="3uigEE" to="bj13:~LogicalContext" resolve="LogicalContext" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1ZTVp" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
<node concept="a7P8L" id="kHzC1TY7A0" role="3jm6SO">
@ -829,25 +827,22 @@
<ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
<node concept="nsMwS" id="7LI_gNMWxiz" role="ns1xD">
<ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
<node concept="2OqwBi" id="3bgqfmmKMvX" role="nsMwV">
<node concept="2OqwBi" id="7LI_gNMWxRY" role="2Oq$k0">
<node concept="1PxgMI" id="7LI_gNMWxK6" role="2Oq$k0">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="7LI_gNMWxKS" role="3oSUPX">
<ref role="cht4Q" to="wq2x:5NuEpF1if3e" resolve="RuleInputSpecification" />
</node>
<node concept="2OqwBi" id="7LI_gNMWxsx" role="1m5AlR">
<node concept="3A2sRY" id="7LI_gNMWxiB" role="2Oq$k0">
<ref role="3A2yKK" node="7LI_gNMWxa3" resolve="rid" />
</node>
<node concept="1mfA1w" id="7LI_gNMWxDp" role="2OqNvi" />
</node>
<node concept="2OqwBi" id="7LI_gNMWxRY" role="nsMwV">
<node concept="1PxgMI" id="7LI_gNMWxK6" role="2Oq$k0">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="7LI_gNMWxKS" role="3oSUPX">
<ref role="cht4Q" to="wq2x:5NuEpF1if3e" resolve="RuleInputSpecification" />
</node>
<node concept="3TrEf2" id="3bgqfmmKMhu" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:5NuEpF1iiA0" resolve="applicableConcept" />
<node concept="2OqwBi" id="7LI_gNMWxsx" role="1m5AlR">
<node concept="3A2sRY" id="7LI_gNMWxiB" role="2Oq$k0">
<ref role="3A2yKK" node="7LI_gNMWxa3" resolve="rid" />
</node>
<node concept="1mfA1w" id="7LI_gNMWxDp" role="2OqNvi" />
</node>
</node>
<node concept="iZEcu" id="3bgqfmmKMMM" role="2OqNvi" />
<node concept="3TrEf2" id="3bgqfmmKMhu" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:5NuEpF1iiA0" resolve="applicableConcept" />
</node>
</node>
</node>
</node>
@ -1433,25 +1428,22 @@
<ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
<node concept="nsMwS" id="7LI_gNMXGjy" role="ns1xD">
<ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
<node concept="2OqwBi" id="3bgqfmmKN9N" role="nsMwV">
<node concept="2OqwBi" id="7LI_gNMXGjz" role="2Oq$k0">
<node concept="1PxgMI" id="7LI_gNMXGj$" role="2Oq$k0">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="7LI_gNMXHia" role="3oSUPX">
<ref role="cht4Q" to="wq2x:5itBwM66cNU" resolve="ExpandMacroInputSpecification" />
</node>
<node concept="2OqwBi" id="7LI_gNMXGjA" role="1m5AlR">
<node concept="3A2sRY" id="2Qsys8b2h8j" role="2Oq$k0">
<ref role="3A2yKK" node="2Qsys8b2gn5" resolve="emid" />
</node>
<node concept="1mfA1w" id="7LI_gNMXGjC" role="2OqNvi" />
</node>
<node concept="2OqwBi" id="7LI_gNMXGjz" role="nsMwV">
<node concept="1PxgMI" id="7LI_gNMXGj$" role="2Oq$k0">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="7LI_gNMXHia" role="3oSUPX">
<ref role="cht4Q" to="wq2x:5itBwM66cNU" resolve="ExpandMacroInputSpecification" />
</node>
<node concept="3TrEf2" id="3bgqfmmKMV1" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:5itBwM66ULm" resolve="applicableConcept" />
<node concept="2OqwBi" id="7LI_gNMXGjA" role="1m5AlR">
<node concept="3A2sRY" id="2Qsys8b2h8j" role="2Oq$k0">
<ref role="3A2yKK" node="2Qsys8b2gn5" resolve="emid" />
</node>
<node concept="1mfA1w" id="7LI_gNMXGjC" role="2OqNvi" />
</node>
</node>
<node concept="iZEcu" id="3bgqfmmKNs_" role="2OqNvi" />
<node concept="3TrEf2" id="3bgqfmmKMV1" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:5itBwM66ULm" resolve="applicableConcept" />
</node>
</node>
</node>
</node>
@ -1636,21 +1628,18 @@
<ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
<node concept="nsMwS" id="61G6TdBIz7X" role="ns1xD">
<ref role="nsMwP" to="jxwi:7LI_gNMWxb4" resolve="concept" />
<node concept="2OqwBi" id="61G6TdBI_1L" role="nsMwV">
<node concept="2OqwBi" id="61G6TdBI$iz" role="2Oq$k0">
<node concept="2OqwBi" id="61G6TdBIzVt" role="2Oq$k0">
<node concept="3A2sRY" id="61G6TdBIzSj" role="2Oq$k0">
<ref role="3A2yKK" node="51ek2rSd6bj" resolve="emc" />
</node>
<node concept="3TrEf2" id="61G6TdBI$8l" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:5itBwM7GBLp" resolve="template" />
</node>
<node concept="2OqwBi" id="61G6TdBI$iz" role="nsMwV">
<node concept="2OqwBi" id="61G6TdBIzVt" role="2Oq$k0">
<node concept="3A2sRY" id="61G6TdBIzSj" role="2Oq$k0">
<ref role="3A2yKK" node="51ek2rSd6bj" resolve="emc" />
</node>
<node concept="3TrEf2" id="61G6TdBI$zP" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:5itBwM6dfdw" resolve="applicableConcept" />
<node concept="3TrEf2" id="61G6TdBI$8l" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:5itBwM7GBLp" resolve="template" />
</node>
</node>
<node concept="iZEcu" id="61G6TdBI_S8" role="2OqNvi" />
<node concept="3TrEf2" id="61G6TdBI$zP" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:5itBwM6dfdw" resolve="applicableConcept" />
</node>
</node>
</node>
</node>
@ -2261,9 +2250,14 @@
<ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
<node concept="nsMwS" id="61G6TdCWQQm" role="ns1xD">
<ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
<node concept="2tJFMh" id="61G6TdCWQQn" role="nsMwV">
<node concept="ZC_QK" id="61G6TdCWQQo" role="2tJFKM">
<ref role="2aWVGs" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
<node concept="2OqwBi" id="3CulEO1Y7_8" role="nsMwV">
<node concept="2c44tf" id="3CulEO1Y7_9" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1Y7_a" role="2c44tc">
<ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1Y7_b" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
</node>
@ -2343,9 +2337,14 @@
<ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
<node concept="nsMwS" id="61G6TdCWQRD" role="ns1xD">
<ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
<node concept="2tJFMh" id="61G6TdCWQRE" role="nsMwV">
<node concept="ZC_QK" id="61G6TdCWQRF" role="2tJFKM">
<ref role="2aWVGs" to="6exd:3OPtF03lco4" resolve="ListNode" />
<node concept="2OqwBi" id="3CulEO1Y7_c" role="nsMwV">
<node concept="2c44tf" id="3CulEO1Y7_d" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1Y7_e" role="2c44tc">
<ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1Y7_f" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
</node>
@ -2607,7 +2606,7 @@
</node>
<node concept="3uibUv" id="5fMWD6HQXZl" role="3vLBG7">
<ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
<node concept="2sp9CU" id="5fMWD6HQXZm" role="11_B2D" />
<node concept="2sp9CU" id="3CulEO2bgcX" role="11_B2D" />
<node concept="3Tqbb2" id="5fMWD6HQXZn" role="11_B2D" />
</node>
</node>
@ -2670,7 +2669,7 @@
</node>
<node concept="3uibUv" id="51ek2rSbOTR" role="3vLBG7">
<ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
<node concept="2sp9CU" id="51ek2rSbOTS" role="11_B2D" />
<node concept="2sp9CU" id="3CulEO2bgf4" role="11_B2D" />
<node concept="3Tqbb2" id="51ek2rSbOTT" role="11_B2D" />
</node>
</node>
@ -2733,7 +2732,7 @@
</node>
<node concept="3uibUv" id="6zber0NTBEq" role="3vLBG7">
<ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
<node concept="2sp9CU" id="6zber0NTBEr" role="11_B2D" />
<node concept="2sp9CU" id="3CulEO2bggV" role="11_B2D" />
<node concept="3Tqbb2" id="6zber0NTBEs" role="11_B2D" />
</node>
</node>
@ -2819,7 +2818,7 @@
</node>
<node concept="3uibUv" id="14oWJ2NxubB" role="3vLBG7">
<ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
<node concept="2sp9CU" id="14oWJ2NxubC" role="11_B2D" />
<node concept="2sp9CU" id="3CulEO2bgph" role="11_B2D" />
<node concept="3Tqbb2" id="Q_4x90cBck" role="11_B2D" />
</node>
</node>
@ -2934,7 +2933,7 @@
</node>
<node concept="3uibUv" id="51ek2rSbXfu" role="3vLBG7">
<ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
<node concept="2sp9CU" id="51ek2rSbXfv" role="11_B2D" />
<node concept="2sp9CU" id="3CulEO2bg_J" role="11_B2D" />
<node concept="3Tqbb2" id="51ek2rSbXfw" role="11_B2D" />
</node>
</node>
@ -3049,7 +3048,7 @@
</node>
<node concept="3uibUv" id="6zber0NTCsw" role="3vLBG7">
<ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
<node concept="2sp9CU" id="6zber0NTCsx" role="11_B2D" />
<node concept="2sp9CU" id="3CulEO2bgK$" role="11_B2D" />
<node concept="3Tqbb2" id="6zber0NTCsy" role="11_B2D" />
</node>
</node>

1698
samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps
View File

File diff suppressed because it is too large Load Diff

113
samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.types.mps
View File

@ -19,6 +19,7 @@
<import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
<import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" />
<import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
<import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
</imports>
<registry>
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@ -77,11 +78,6 @@
<child id="1196350785114" name="quotedNode" index="2c44tc" />
</concept>
</language>
<language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
<concept id="4733039728785194814" name="jetbrains.mps.lang.modelapi.structure.NamedNodeReference" flags="ng" index="ZC_QK">
<reference id="7256306938026143658" name="target" index="2aWVGs" />
</concept>
</language>
<language id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic">
<concept id="8456919074574710634" name="jetbrains.mps.logic.structure.ExpressionItem" flags="ng" index="37jhX">
<child id="8456919074574710741" name="code" index="37jj2" />
@ -119,9 +115,6 @@
</concept>
<concept id="5045161044515397667" name="jetbrains.mps.lang.smodel.structure.Node_PointerOperation" flags="ng" index="iZEcu" />
<concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU" />
<concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
<child id="7400021826774799510" name="ref" index="2tJFKM" />
</concept>
<concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
<child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
<child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
@ -1059,9 +1052,14 @@
<node concept="3Aqczg" id="kHzC1TY8Hd" role="3cqZAp">
<node concept="3jm4v3" id="kHzC1TY8Hb" role="3Aqpz8">
<ref role="3jm46O" to="kqnc:3qUnz9vk$1o" resolve="classifierTypeNonGeneric" />
<node concept="2tJFMh" id="kHzC1TY8Hy" role="3jicU7">
<node concept="ZC_QK" id="kHzC1TY8Hz" role="2tJFKM">
<ref role="2aWVGs" to="6exd:6YPNC4OECgm" resolve="ListRole" />
<node concept="2OqwBi" id="3CulEO1ZTUi" role="3jicU7">
<node concept="2c44tf" id="3CulEO1ZTUj" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1ZTUk" role="2c44tc">
<ref role="3uigEE" to="6exd:6YPNC4OECgm" resolve="ListRole" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1ZTUl" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
<node concept="a7P8L" id="kHzC1TY8Hr" role="3jm6SO">
@ -1076,9 +1074,14 @@
<node concept="3Aqczg" id="kHzC1TYa92" role="3cqZAp">
<node concept="3jm4v3" id="kHzC1TYa93" role="3Aqpz8">
<ref role="3jm46O" to="kqnc:3qUnz9vk$1o" resolve="classifierTypeNonGeneric" />
<node concept="2tJFMh" id="kHzC1TYa94" role="3jicU7">
<node concept="ZC_QK" id="kHzC1TYa$8" role="2tJFKM">
<ref role="2aWVGs" to="6exd:6YPNC4NYnau" resolve="ChildRole" />
<node concept="2OqwBi" id="3CulEO1ZTUm" role="3jicU7">
<node concept="2c44tf" id="3CulEO1ZTUn" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1ZTUo" role="2c44tc">
<ref role="3uigEE" to="6exd:6YPNC4NYnau" resolve="ChildRole" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1ZTUp" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
<node concept="a7P8L" id="kHzC1TYa96" role="3jm6SO">
@ -1112,14 +1115,19 @@
<node concept="3Aqczg" id="kHzC1TYayM" role="3cqZAp">
<node concept="3jm4v3" id="kHzC1TYayN" role="3Aqpz8">
<ref role="3jm46O" to="kqnc:3qUnz9vk$1o" resolve="classifierTypeNonGeneric" />
<node concept="2tJFMh" id="7LI_gNMB5SI" role="3jicU7">
<node concept="ZC_QK" id="7LI_gNMB6kv" role="2tJFKM">
<ref role="2aWVGs" to="kqnc:3Qp4N06bUDh" resolve="Value" />
</node>
</node>
<node concept="a7P8L" id="kHzC1TYayQ" role="3jm6SO">
<ref role="a7OzE" node="kHzC1TY8Gz" resolve="Cls" />
</node>
<node concept="2OqwBi" id="3CulEO26nN8" role="3jicU7">
<node concept="2c44tf" id="3CulEO26nN9" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO26nNa" role="2c44tc">
<ref role="3uigEE" to="6exd:2xQ7eRAD2dj" resolve="Value" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO26nNb" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="7LI_gNMB6k_" role="3cqZAp" />
@ -1145,9 +1153,14 @@
<node concept="3Aqczg" id="kHzC1TYazd" role="3cqZAp">
<node concept="3jm4v3" id="kHzC1TYaze" role="3Aqpz8">
<ref role="3jm46O" to="kqnc:3qUnz9vk$1o" resolve="classifierTypeNonGeneric" />
<node concept="2tJFMh" id="7LI_gNMB5sN" role="3jicU7">
<node concept="ZC_QK" id="7LI_gNMB5Sy" role="2tJFKM">
<ref role="2aWVGs" to="6exd:3OPtF03lco4" resolve="ListNode" />
<node concept="2OqwBi" id="3CulEO1ZTUu" role="3jicU7">
<node concept="2c44tf" id="3CulEO1ZTUv" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1ZTUw" role="2c44tc">
<ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1ZTUx" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
<node concept="a7P8L" id="kHzC1TYazh" role="3jm6SO">
@ -1178,9 +1191,14 @@
<node concept="3Aqczg" id="kHzC1TYazC" role="3cqZAp">
<node concept="3jm4v3" id="kHzC1TYazD" role="3Aqpz8">
<ref role="3jm46O" to="kqnc:3qUnz9vk$1o" resolve="classifierTypeNonGeneric" />
<node concept="2tJFMh" id="7LI_gNMB5sv" role="3jicU7">
<node concept="ZC_QK" id="7LI_gNMB5sB" role="2tJFKM">
<ref role="2aWVGs" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
<node concept="2OqwBi" id="3CulEO1ZTUy" role="3jicU7">
<node concept="2c44tf" id="3CulEO1ZTUz" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1ZTU$" role="2c44tc">
<ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1ZTU_" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
<node concept="a7P8L" id="kHzC1TYazG" role="3jm6SO">
@ -1259,9 +1277,14 @@
<node concept="3I6s7M" id="kHzC1TYbLu" role="3I6sU7">
<node concept="3jm4v3" id="kHzC1TYbLs" role="3I6s78">
<ref role="3jm46O" to="kqnc:3qUnz9vk$1o" resolve="classifierTypeNonGeneric" />
<node concept="2tJFMh" id="7LI_gNMBfhq" role="3jicU7">
<node concept="ZC_QK" id="7LI_gNMBfGI" role="2tJFKM">
<ref role="2aWVGs" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
<node concept="2OqwBi" id="3CulEO1ZTUA" role="3jicU7">
<node concept="2c44tf" id="3CulEO1ZTUB" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1ZTUC" role="2c44tc">
<ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1ZTUD" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
<node concept="a7P8L" id="kHzC1TYbLH" role="3jm6SO">
@ -1365,9 +1388,14 @@
<ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
<node concept="nsMwS" id="7LI_gNMpYwT" role="ns1xD">
<ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
<node concept="2tJFMh" id="7LI_gNMpYwX" role="nsMwV">
<node concept="ZC_QK" id="7LI_gNMpYx5" role="2tJFKM">
<ref role="2aWVGs" to="bj13:~MetaLogical" resolve="MetaLogical" />
<node concept="2OqwBi" id="3CulEO1Y7yC" role="nsMwV">
<node concept="2c44tf" id="3CulEO1Y7yD" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1Y7yE" role="2c44tc">
<ref role="3uigEE" to="bj13:~MetaLogical" resolve="MetaLogical" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1Y7yF" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
</node>
@ -1421,9 +1449,14 @@
<ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
<node concept="nsMwS" id="7LI_gNMpYy2" role="ns1xD">
<ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
<node concept="2tJFMh" id="7LI_gNMpYy6" role="nsMwV">
<node concept="ZC_QK" id="7LI_gNMpYye" role="2tJFKM">
<ref role="2aWVGs" to="oy3s:1fvYCPC9rB6" resolve="MetaLogicalArray" />
<node concept="2OqwBi" id="3CulEO1Y7yG" role="nsMwV">
<node concept="2c44tf" id="3CulEO1Y7yH" role="2Oq$k0">
<node concept="3uibUv" id="3CulEO1Y7yI" role="2c44tc">
<ref role="3uigEE" to="oy3s:1fvYCPC9rB6" resolve="MetaLogicalArray" />
</node>
</node>
<node concept="3TrEf2" id="3CulEO1Y7yJ" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
</node>
</node>
</node>
@ -1737,7 +1770,7 @@
</node>
<node concept="3uibUv" id="5fMWD6HQXZl" role="3vLBG7">
<ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
<node concept="2sp9CU" id="5fMWD6HQXZm" role="11_B2D" />
<node concept="2sp9CU" id="3CulEO2bhzm" role="11_B2D" />
<node concept="3Tqbb2" id="5fMWD6HQXZn" role="11_B2D" />
</node>
</node>
@ -1800,7 +1833,7 @@
</node>
<node concept="3uibUv" id="5X1yxJH__SO" role="3vLBG7">
<ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
<node concept="2sp9CU" id="5X1yxJH__SP" role="11_B2D" />
<node concept="2sp9CU" id="3CulEO2bh_d" role="11_B2D" />
<node concept="3Tqbb2" id="5X1yxJH__SQ" role="11_B2D" />
</node>
</node>
@ -1863,7 +1896,7 @@
</node>
<node concept="3uibUv" id="5X1yxJH_Ayt" role="3vLBG7">
<ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
<node concept="2sp9CU" id="5X1yxJH_Ayu" role="11_B2D" />
<node concept="2sp9CU" id="3CulEO2bhB4" role="11_B2D" />
<node concept="3Tqbb2" id="q1hCiyb545" role="11_B2D" />
</node>
</node>
@ -1949,7 +1982,7 @@
</node>
<node concept="3uibUv" id="6QbNnfq3aCz" role="3vLBG7">
<ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
<node concept="2sp9CU" id="6QbNnfq3aC$" role="11_B2D" />
<node concept="2sp9CU" id="3CulEO2bhCV" role="11_B2D" />
<node concept="3Tqbb2" id="q1hCixQWcd" role="11_B2D" />
</node>
</node>
@ -2065,7 +2098,7 @@
</node>
<node concept="3uibUv" id="14oWJ2NxubB" role="3vLBG7">
<ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
<node concept="2sp9CU" id="14oWJ2NxubC" role="11_B2D" />
<node concept="2sp9CU" id="3CulEO2bhOE" role="11_B2D" />
<node concept="3Tqbb2" id="Q_4x90cBck" role="11_B2D" />
</node>
</node>
@ -2180,7 +2213,7 @@
</node>
<node concept="3uibUv" id="14oWJ2NxwyV" role="3vLBG7">
<ref role="3uigEE" to="82uw:~BiConsumer" resolve="BiConsumer" />
<node concept="2sp9CU" id="14oWJ2NxwyW" role="11_B2D" />
<node concept="2sp9CU" id="3CulEO2bibP" role="11_B2D" />
<node concept="3Tqbb2" id="14oWJ2NxwyX" role="11_B2D" />
</node>
</node>