Skip to content

Commit 0fe1e95

Browse files
author
Alexander Pann
committed
Inline the ITypeCanBeSorted interfaces as a method of Type
1 parent 6191e2c commit 0fe1e95

File tree

10 files changed

+313
-52
lines changed

10 files changed

+313
-52
lines changed

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

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6242,6 +6242,17 @@
62426242
</node>
62436243
<node concept="17QB3L" id="1CNpG_h2Db0" role="3clF45" />
62446244
</node>
6245+
<node concept="13i0hz" id="7k6A8Wfp3IU" role="13h7CS">
6246+
<property role="TrG5h" value="canBeSorted" />
6247+
<property role="13i0it" value="true" />
6248+
<node concept="3Tm1VV" id="7k6A8Wfp3IV" role="1B3o_S" />
6249+
<node concept="10P_77" id="7k6A8Wfp7FV" role="3clF45" />
6250+
<node concept="3clFbS" id="7k6A8Wfp3IX" role="3clF47">
6251+
<node concept="3clFbF" id="7k6A8Wfp7GZ" role="3cqZAp">
6252+
<node concept="3clFbT" id="7k6A8Wfp7GY" role="3clFbG" />
6253+
</node>
6254+
</node>
6255+
</node>
62456256
</node>
62466257
<node concept="13h7C7" id="6XENO0rLjw">
62476258
<ref role="13h7C2" to="hm2y:6XENO0rLj7" resolve="IIsSingleSymbol" />
@@ -26865,23 +26876,23 @@
2686526876
<node concept="17QB3L" id="6ngDzsNlH8k" role="3clF45" />
2686626877
</node>
2686726878
</node>
26868-
<node concept="13h7C7" id="3sWKo0FtLz7">
26869-
<ref role="13h7C2" to="hm2y:3sWKo0FlPLx" resolve="ITypeCanBeSorted" />
26870-
<node concept="13i0hz" id="3sWKo0FtLzi" role="13h7CS">
26871-
<property role="13i0it" value="true" />
26872-
<property role="TrG5h" value="isSortingSupported" />
26873-
<node concept="3Tm1VV" id="3sWKo0FtLzj" role="1B3o_S" />
26874-
<node concept="10P_77" id="3sWKo0FtLzy" role="3clF45" />
26875-
<node concept="3clFbS" id="3sWKo0FtLzl" role="3clF47">
26876-
<node concept="3clFbF" id="3sWKo0FtL$e" role="3cqZAp">
26877-
<node concept="3clFbT" id="3sWKo0FtL$d" role="3clFbG">
26879+
<node concept="13h7C7" id="7k6A8Wfp7KX">
26880+
<ref role="13h7C2" to="hm2y:6sdnDbSlMSN" resolve="PrimitiveType" />
26881+
<node concept="13hLZK" id="7k6A8Wfp7KY" role="13h7CW">
26882+
<node concept="3clFbS" id="7k6A8Wfp7KZ" role="2VODD2" />
26883+
</node>
26884+
<node concept="13i0hz" id="7k6A8Wfp8Fb" role="13h7CS">
26885+
<property role="TrG5h" value="canBeSorted" />
26886+
<ref role="13i0hy" node="7k6A8Wfp3IU" resolve="canBeSorted" />
26887+
<node concept="3Tm1VV" id="7k6A8Wfp8Fc" role="1B3o_S" />
26888+
<node concept="3clFbS" id="7k6A8Wfp8Fh" role="3clF47">
26889+
<node concept="3clFbF" id="7k6A8Wfp8K$" role="3cqZAp">
26890+
<node concept="3clFbT" id="7k6A8Wfp8Kz" role="3clFbG">
2687826891
<property role="3clFbU" value="true" />
2687926892
</node>
2688026893
</node>
2688126894
</node>
26882-
</node>
26883-
<node concept="13hLZK" id="3sWKo0FtLz8" role="13h7CW">
26884-
<node concept="3clFbS" id="3sWKo0FtLz9" role="2VODD2" />
26895+
<node concept="10P_77" id="7k6A8Wfp8Fi" role="3clF45" />
2688526896
</node>
2688626897
</node>
2688726898
</model>

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,6 @@
120120
<property role="EcuMT" value="7425695345928515123" />
121121
<property role="R4oN_" value="a base concept for primitive types" />
122122
<ref role="1TJDcQ" node="6sdnDbSlaok" resolve="Type" />
123-
<node concept="PrWs8" id="3sWKo0FlPLy" role="PzmwI">
124-
<ref role="PrY4T" node="3sWKo0FlPLx" resolve="ITypeCanBeSorted" />
125-
</node>
126123
</node>
127124
<node concept="1TIwiD" id="4rZeNQ6MpKl">
128125
<property role="TrG5h" value="BinaryExpression" />
@@ -2192,9 +2189,5 @@
21922189
<property role="EcuMT" value="7520958096812440715" />
21932190
<property role="TrG5h" value="IComplexTypeSupportsEquals" />
21942191
</node>
2195-
<node concept="PlHQZ" id="3sWKo0FlPLx">
2196-
<property role="EcuMT" value="3980268926915796065" />
2197-
<property role="TrG5h" value="ITypeCanBeSorted" />
2198-
</node>
21992192
</model>
22002193

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/constraints.mps‎

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,7 @@
181181
<concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
182182
<child id="1207343664468" name="conceptArgument" index="ri$Ld" />
183183
</concept>
184-
<concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
185-
<property id="1238684351431" name="asCast" index="1BlNFB" />
186-
</concept>
184+
<concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI" />
187185
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
188186
<concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
189187
<reference id="1138056395725" name="property" index="3TsBF5" />
@@ -504,27 +502,21 @@
504502
<node concept="3clFbS" id="4ptnK4j$WvD" role="3clFbx">
505503
<node concept="3cpWs6" id="6vUyz1yKO4n" role="3cqZAp">
506504
<node concept="2OqwBi" id="3sWKo0FtNXu" role="3cqZAk">
507-
<node concept="1PxgMI" id="3sWKo0FtNeC" role="2Oq$k0">
508-
<property role="1BlNFB" value="true" />
509-
<node concept="chp4Y" id="3sWKo0FtNra" role="3oSUPX">
510-
<ref role="cht4Q" to="hm2y:3sWKo0FlPLx" resolve="ITypeCanBeSorted" />
511-
</node>
512-
<node concept="2OqwBi" id="4ptnK4j_0S4" role="1m5AlR">
513-
<node concept="1PxgMI" id="4ptnK4j_0S5" role="2Oq$k0">
514-
<node concept="chp4Y" id="4ptnK4j_0S6" role="3oSUPX">
515-
<ref role="cht4Q" to="700h:6zmBjqUily5" resolve="CollectionType" />
516-
</node>
517-
<node concept="37vLTw" id="4ptnK4j_0S7" role="1m5AlR">
518-
<ref role="3cqZAo" node="6b_jefnKxOk" resolve="ct" />
519-
</node>
505+
<node concept="2OqwBi" id="4ptnK4j_0S4" role="2Oq$k0">
506+
<node concept="1PxgMI" id="4ptnK4j_0S5" role="2Oq$k0">
507+
<node concept="chp4Y" id="4ptnK4j_0S6" role="3oSUPX">
508+
<ref role="cht4Q" to="700h:6zmBjqUily5" resolve="CollectionType" />
520509
</node>
521-
<node concept="3TrEf2" id="4ptnK4j_0S8" role="2OqNvi">
522-
<ref role="3Tt5mk" to="700h:6zmBjqUily6" resolve="baseType" />
510+
<node concept="37vLTw" id="4ptnK4j_0S7" role="1m5AlR">
511+
<ref role="3cqZAo" node="6b_jefnKxOk" resolve="ct" />
523512
</node>
524513
</node>
514+
<node concept="3TrEf2" id="4ptnK4j_0S8" role="2OqNvi">
515+
<ref role="3Tt5mk" to="700h:6zmBjqUily6" resolve="baseType" />
516+
</node>
525517
</node>
526518
<node concept="2qgKlT" id="3sWKo0FtOlb" role="2OqNvi">
527-
<ref role="37wK5l" to="pbu6:3sWKo0FtLzi" resolve="isSortingSupported" />
519+
<ref role="37wK5l" to="pbu6:7k6A8Wfp3IU" resolve="canBeSorted" />
528520
</node>
529521
</node>
530522
</node>

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

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,19 @@
763763
<node concept="13hLZK" id="3nGzaxURzmU" role="13h7CW">
764764
<node concept="3clFbS" id="3nGzaxURzmV" role="2VODD2" />
765765
</node>
766+
<node concept="13i0hz" id="7k6A8WfqMZP" role="13h7CS">
767+
<property role="TrG5h" value="canBeSorted" />
768+
<ref role="13i0hy" to="pbu6:7k6A8Wfp3IU" resolve="canBeSorted" />
769+
<node concept="3Tm1VV" id="7k6A8WfqMZQ" role="1B3o_S" />
770+
<node concept="3clFbS" id="7k6A8WfqMZV" role="3clF47">
771+
<node concept="3clFbF" id="7k6A8WfqN5e" role="3cqZAp">
772+
<node concept="3clFbT" id="7k6A8WfqN5d" role="3clFbG">
773+
<property role="3clFbU" value="true" />
774+
</node>
775+
</node>
776+
</node>
777+
<node concept="10P_77" id="7k6A8WfqMZW" role="3clF45" />
778+
</node>
766779
</node>
767780
<node concept="13h7C7" id="3nGzaxUXNjl">
768781
<property role="3GE5qa" value="range.literals" />
@@ -1204,6 +1217,19 @@
12041217
<ref role="ehGHo" to="hm2y:6sdnDbSla17" resolve="Expression" />
12051218
</node>
12061219
</node>
1220+
<node concept="13i0hz" id="7k6A8WfqVB$" role="13h7CS">
1221+
<property role="TrG5h" value="canBeSorted" />
1222+
<ref role="13i0hy" to="pbu6:7k6A8Wfp3IU" resolve="canBeSorted" />
1223+
<node concept="3Tm1VV" id="7k6A8WfqVB_" role="1B3o_S" />
1224+
<node concept="3clFbS" id="7k6A8WfqVBE" role="3clF47">
1225+
<node concept="3clFbF" id="7k6A8WfqVHa" role="3cqZAp">
1226+
<node concept="3clFbT" id="7k6A8WfqVH9" role="3clFbG">
1227+
<property role="3clFbU" value="true" />
1228+
</node>
1229+
</node>
1230+
</node>
1231+
<node concept="10P_77" id="7k6A8WfqVBF" role="3clF45" />
1232+
</node>
12071233
</node>
12081234
<node concept="13h7C7" id="7zAZa_vg8oQ">
12091235
<property role="3GE5qa" value="range" />
@@ -1654,5 +1680,25 @@
16541680
<node concept="17QB3L" id="3HiHZeyrUvY" role="3clF45" />
16551681
</node>
16561682
</node>
1683+
<node concept="13h7C7" id="7k6A8WfqVL8">
1684+
<property role="3GE5qa" value="time" />
1685+
<ref role="13h7C2" to="mi3w:3HiHZey87Wz" resolve="TimeType" />
1686+
<node concept="13hLZK" id="7k6A8WfqVL9" role="13h7CW">
1687+
<node concept="3clFbS" id="7k6A8WfqVLa" role="2VODD2" />
1688+
</node>
1689+
<node concept="13i0hz" id="7k6A8WfqVLj" role="13h7CS">
1690+
<property role="TrG5h" value="canBeSorted" />
1691+
<ref role="13i0hy" to="pbu6:7k6A8Wfp3IU" resolve="canBeSorted" />
1692+
<node concept="3Tm1VV" id="7k6A8WfqVLk" role="1B3o_S" />
1693+
<node concept="3clFbS" id="7k6A8WfqVLp" role="3clF47">
1694+
<node concept="3clFbF" id="7k6A8WfqVQG" role="3cqZAp">
1695+
<node concept="3clFbT" id="7k6A8WfqVQF" role="3clFbG">
1696+
<property role="3clFbU" value="true" />
1697+
</node>
1698+
</node>
1699+
</node>
1700+
<node concept="10P_77" id="7k6A8WfqVLq" role="3clF45" />
1701+
</node>
1702+
</node>
16571703
</model>
16581704

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,6 @@
9292
<property role="3GE5qa" value="date" />
9393
<property role="R4oN_" value="a base type for dates" />
9494
<ref role="1TJDcQ" to="hm2y:6sdnDbSlaok" resolve="Type" />
95-
<node concept="PrWs8" id="3sWKo0FskoE" role="PzmwI">
96-
<ref role="PrY4T" to="hm2y:3sWKo0FlPLx" resolve="ITypeCanBeSorted" />
97-
</node>
9895
</node>
9996
<node concept="1TIwiD" id="3nGzaxUXsfN">
10097
<property role="EcuMT" value="3885635233759216627" />
@@ -535,9 +532,6 @@
535532
<node concept="PrWs8" id="7zAZa_vg5yL" role="PzmwI">
536533
<ref role="PrY4T" to="hm2y:60Qa1k_nI2f" resolve="ITypeSupportsDefaultValue" />
537534
</node>
538-
<node concept="PrWs8" id="3sWKo0FqQ2R" role="PzmwI">
539-
<ref role="PrY4T" to="hm2y:3sWKo0FlPLx" resolve="ITypeCanBeSorted" />
540-
</node>
541535
</node>
542536
<node concept="1TIwiD" id="7khFtBHJt9t">
543537
<property role="EcuMT" value="8435714728549798493" />
@@ -666,7 +660,7 @@
666660
<property role="TrG5h" value="TimeType" />
667661
<property role="34LRSv" value="time" />
668662
<property role="3GE5qa" value="time" />
669-
<property role="R4oN_" value="hours and minutes" />
663+
<property role="R4oN_" value="hours, minutes and seconds" />
670664
<ref role="1TJDcQ" to="hm2y:6sdnDbSlaok" resolve="Type" />
671665
</node>
672666
<node concept="1TIwiD" id="3HiHZey9lU5">

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,19 @@
262262
<ref role="ehGHo" to="hm2y:6sdnDbSlaok" resolve="Type" />
263263
</node>
264264
</node>
265+
<node concept="13i0hz" id="7k6A8Wfr4F0" role="13h7CS">
266+
<property role="TrG5h" value="canBeSorted" />
267+
<ref role="13i0hy" to="pbu6:7k6A8Wfp3IU" resolve="canBeSorted" />
268+
<node concept="3Tm1VV" id="7k6A8Wfr4F1" role="1B3o_S" />
269+
<node concept="3clFbS" id="7k6A8Wfr4F6" role="3clF47">
270+
<node concept="3clFbF" id="7k6A8Wfr4SX" role="3cqZAp">
271+
<node concept="3clFbT" id="7k6A8Wfr4SW" role="3clFbG">
272+
<property role="3clFbU" value="true" />
273+
</node>
274+
</node>
275+
</node>
276+
<node concept="10P_77" id="7k6A8Wfr4F7" role="3clF45" />
277+
</node>
265278
</node>
266279
<node concept="13h7C7" id="50smQ1VdacN">
267280
<ref role="13h7C2" to="l462:50smQ1Vcw3K" resolve="AbstractTemporalOp" />

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,6 @@
9292
<property role="20lbJX" value="fLJekj4/_1" />
9393
<ref role="20lvS9" to="hm2y:6sdnDbSlaok" resolve="Type" />
9494
</node>
95-
<node concept="PrWs8" id="FLl_um4YlE" role="PzmwI">
96-
<ref role="PrY4T" to="hm2y:3sWKo0FlPLx" resolve="ITypeCanBeSorted" />
97-
</node>
9895
</node>
9996
<node concept="1TIwiD" id="50smQ1V8QEe">
10097
<property role="EcuMT" value="5772589292323039886" />

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4055,6 +4055,19 @@
40554055
</node>
40564056
<node concept="10P_77" id="6xvNSEj85ld" role="3clF45" />
40574057
</node>
4058+
<node concept="13i0hz" id="7k6A8WfrczS" role="13h7CS">
4059+
<property role="TrG5h" value="canBeSorted" />
4060+
<ref role="13i0hy" to="pbu6:7k6A8Wfp3IU" resolve="canBeSorted" />
4061+
<node concept="3Tm1VV" id="7k6A8WfrczT" role="1B3o_S" />
4062+
<node concept="3clFbS" id="7k6A8WfrczY" role="3clF47">
4063+
<node concept="3clFbF" id="7k6A8WfrdvE" role="3cqZAp">
4064+
<node concept="3clFbT" id="7k6A8WfrdvD" role="3clFbG">
4065+
<property role="3clFbU" value="true" />
4066+
</node>
4067+
</node>
4068+
</node>
4069+
<node concept="10P_77" id="7k6A8WfrczZ" role="3clF45" />
4070+
</node>
40584071
</node>
40594072
<node concept="13h7C7" id="7D7uZV2iYHF">
40604073
<property role="3GE5qa" value="record" />

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -374,9 +374,6 @@
374374
<node concept="PrWs8" id="5FZDsYwdPtf" role="PzmwI">
375375
<ref role="PrY4T" to="hm2y:60Qa1k_nI2f" resolve="ITypeSupportsDefaultValue" />
376376
</node>
377-
<node concept="PrWs8" id="3sWKo0Ft5e9" role="PzmwI">
378-
<ref role="PrY4T" to="hm2y:3sWKo0FlPLx" resolve="ITypeCanBeSorted" />
379-
</node>
380377
<node concept="1TJgyj" id="7D7uZV2dYz3" role="1TKVEi">
381378
<property role="20kJfa" value="record" />
382379
<property role="20lbJX" value="fLJekj4/_1" />

0 commit comments

Comments
 (0)