Skip to content

Commit 899e67d

Browse files
HeikoBeckerHeikoBecker
authored
Merge pull request #660 from IETS3/bugfix/collection_types
Make collectiontype implement IComplexTypeSupportsEquals (#659)
2 parents ecbd30a + 41dea2c commit 899e67d

File tree

3 files changed

+1105
-368
lines changed

3 files changed

+1105
-368
lines changed

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

Lines changed: 189 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
<concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
9191
<concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
9292
<concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
93+
<concept id="1225271283259" name="jetbrains.mps.baseLanguage.structure.NPEEqualsExpression" flags="nn" index="17R0WA" />
9394
<concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
9495
<child id="5680397130376446158" name="type" index="1tU5fm" />
9596
</concept>
@@ -158,6 +159,9 @@
158159
<child id="1163668922816" name="ifTrue" index="3K4E3e" />
159160
<child id="1163668934364" name="ifFalse" index="3K4GZi" />
160161
</concept>
162+
<concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
163+
<child id="8356039341262087992" name="line" index="1aUNEU" />
164+
</concept>
161165
<concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
162166
<concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
163167
</language>
@@ -218,6 +222,9 @@
218222
<concept id="1145567426890" name="jetbrains.mps.lang.smodel.structure.SNodeListCreator" flags="nn" index="2T8Vx0">
219223
<child id="1145567471833" name="createdType" index="2T96Bj" />
220224
</concept>
225+
<concept id="6677504323281689838" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3bZ5Sz">
226+
<reference id="6677504323281689839" name="conceptDeclaraton" index="3bZ5Sy" />
227+
</concept>
221228
<concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
222229
<child id="1177027386292" name="conceptArgument" index="cj9EA" />
223230
</concept>
@@ -255,6 +262,14 @@
255262
<property id="1169194664001" name="name" index="TrG5h" />
256263
</concept>
257264
</language>
265+
<language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
266+
<concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="nn" index="3oM_SD">
267+
<property id="155656958578482949" name="value" index="3oM_SC" />
268+
</concept>
269+
<concept id="2535923850359271782" name="jetbrains.mps.lang.text.structure.Line" flags="nn" index="1PaTwC">
270+
<child id="2535923850359271783" name="elements" index="1PaTwD" />
271+
</concept>
272+
</language>
258273
<language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
259274
<concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
260275
<child id="1204796294226" name="closure" index="23t8la" />
@@ -712,6 +727,180 @@
712727
<ref role="2I9WkF" to="hm2y:6sdnDbSlaok" resolve="Type" />
713728
</node>
714729
</node>
730+
<node concept="13i0hz" id="3Rh3xXbdd33" role="13h7CS">
731+
<property role="TrG5h" value="isComparableTo" />
732+
<ref role="13i0hy" to="pbu6:6xvNSEj6BML" resolve="isComparableTo" />
733+
<node concept="3Tm1VV" id="3Rh3xXbdd34" role="1B3o_S" />
734+
<node concept="3clFbS" id="3Rh3xXbdd3b" role="3clF47">
735+
<node concept="3SKdUt" id="3Rh3xXbfg1R" role="3cqZAp">
736+
<node concept="1PaTwC" id="3Rh3xXbfg1S" role="1aUNEU">
737+
<node concept="3oM_SD" id="3Rh3xXbfg6S" role="1PaTwD">
738+
<property role="3oM_SC" value="This" />
739+
</node>
740+
<node concept="3oM_SD" id="3Rh3xXbfg6U" role="1PaTwD">
741+
<property role="3oM_SC" value="is" />
742+
</node>
743+
<node concept="3oM_SD" id="3Rh3xXbfg76" role="1PaTwD">
744+
<property role="3oM_SC" value="more" />
745+
</node>
746+
<node concept="3oM_SD" id="3Rh3xXbfg7a" role="1PaTwD">
747+
<property role="3oM_SC" value="rigid" />
748+
</node>
749+
<node concept="3oM_SD" id="3Rh3xXbfg7f" role="1PaTwD">
750+
<property role="3oM_SC" value="than" />
751+
</node>
752+
<node concept="3oM_SD" id="3Rh3xXbfg7l" role="1PaTwD">
753+
<property role="3oM_SC" value="using" />
754+
</node>
755+
<node concept="3oM_SD" id="3Rh3xXbfg8j" role="1PaTwD">
756+
<property role="3oM_SC" value="isInstanceOf" />
757+
</node>
758+
</node>
759+
</node>
760+
<node concept="3SKdUt" id="1IiUOyInA9C" role="3cqZAp">
761+
<node concept="1PaTwC" id="1IiUOyInA9D" role="1aUNEU">
762+
<node concept="3oM_SD" id="1IiUOyInAne" role="1PaTwD">
763+
<property role="3oM_SC" value="Two" />
764+
</node>
765+
<node concept="3oM_SD" id="1IiUOyInAng" role="1PaTwD">
766+
<property role="3oM_SC" value="collections" />
767+
</node>
768+
<node concept="3oM_SD" id="1IiUOyInAnj" role="1PaTwD">
769+
<property role="3oM_SC" value="should" />
770+
</node>
771+
<node concept="3oM_SD" id="1IiUOyInAnn" role="1PaTwD">
772+
<property role="3oM_SC" value="be" />
773+
</node>
774+
<node concept="3oM_SD" id="1IiUOyInAns" role="1PaTwD">
775+
<property role="3oM_SC" value="equal" />
776+
</node>
777+
<node concept="3oM_SD" id="1IiUOyInAny" role="1PaTwD">
778+
<property role="3oM_SC" value="if" />
779+
</node>
780+
<node concept="3oM_SD" id="1IiUOyInApi" role="1PaTwD">
781+
<property role="3oM_SC" value="they" />
782+
</node>
783+
<node concept="3oM_SD" id="1IiUOyInApq" role="1PaTwD">
784+
<property role="3oM_SC" value="are" />
785+
</node>
786+
<node concept="3oM_SD" id="1IiUOyInApz" role="1PaTwD">
787+
<property role="3oM_SC" value="the" />
788+
</node>
789+
<node concept="3oM_SD" id="1IiUOyInApH" role="1PaTwD">
790+
<property role="3oM_SC" value="same" />
791+
</node>
792+
<node concept="3oM_SD" id="1IiUOyInApS" role="1PaTwD">
793+
<property role="3oM_SC" value="type" />
794+
</node>
795+
<node concept="3oM_SD" id="1IiUOyInAq4" role="1PaTwD">
796+
<property role="3oM_SC" value="of" />
797+
</node>
798+
<node concept="3oM_SD" id="1IiUOyInAQn" role="1PaTwD">
799+
<property role="3oM_SC" value="collection" />
800+
</node>
801+
<node concept="3oM_SD" id="1IiUOyInAQ_" role="1PaTwD">
802+
<property role="3oM_SC" value="and" />
803+
</node>
804+
<node concept="3oM_SD" id="1IiUOyInAQW" role="1PaTwD">
805+
<property role="3oM_SC" value="their" />
806+
</node>
807+
<node concept="3oM_SD" id="1IiUOyInARk" role="1PaTwD">
808+
<property role="3oM_SC" value="basetypes" />
809+
</node>
810+
<node concept="3oM_SD" id="1IiUOyInAR_" role="1PaTwD">
811+
<property role="3oM_SC" value="are" />
812+
</node>
813+
<node concept="3oM_SD" id="1IiUOyInAV$" role="1PaTwD">
814+
<property role="3oM_SC" value="equal" />
815+
</node>
816+
</node>
817+
</node>
818+
<node concept="3clFbJ" id="4v_weX56Rrb" role="3cqZAp">
819+
<node concept="3clFbS" id="4v_weX56Rrd" role="3clFbx">
820+
<node concept="3cpWs8" id="4v_weX56S4r" role="3cqZAp">
821+
<node concept="3cpWsn" id="4v_weX56S4u" role="3cpWs9">
822+
<property role="TrG5h" value="otherColl" />
823+
<node concept="3Tqbb2" id="4v_weX56S4p" role="1tU5fm">
824+
<ref role="ehGHo" to="700h:6zmBjqUily5" resolve="CollectionType" />
825+
</node>
826+
<node concept="1PxgMI" id="4v_weX56Sux" role="33vP2m">
827+
<node concept="chp4Y" id="4v_weX56Szg" role="3oSUPX">
828+
<ref role="cht4Q" to="700h:6zmBjqUily5" resolve="CollectionType" />
829+
</node>
830+
<node concept="37vLTw" id="4v_weX56Sil" role="1m5AlR">
831+
<ref role="3cqZAo" node="3Rh3xXbdd3c" resolve="other" />
832+
</node>
833+
</node>
834+
</node>
835+
</node>
836+
<node concept="3cpWs8" id="3Rh3xXbejU7" role="3cqZAp">
837+
<node concept="3cpWsn" id="3Rh3xXbejU8" role="3cpWs9">
838+
<property role="TrG5h" value="concept" />
839+
<node concept="3bZ5Sz" id="3Rh3xXbejIe" role="1tU5fm">
840+
<ref role="3bZ5Sy" to="700h:6zmBjqUily5" resolve="CollectionType" />
841+
</node>
842+
<node concept="2OqwBi" id="3Rh3xXbejU9" role="33vP2m">
843+
<node concept="13iPFW" id="3Rh3xXbejUa" role="2Oq$k0" />
844+
<node concept="2yIwOk" id="3Rh3xXbejUb" role="2OqNvi" />
845+
</node>
846+
</node>
847+
</node>
848+
<node concept="3cpWs6" id="4v_weX56Zlz" role="3cqZAp">
849+
<node concept="1Wc70l" id="4v_weX56VBS" role="3cqZAk">
850+
<node concept="2OqwBi" id="4v_weX5dzzp" role="3uHU7w">
851+
<node concept="2OqwBi" id="4v_weX56W0J" role="2Oq$k0">
852+
<node concept="13iPFW" id="4v_weX56VGz" role="2Oq$k0" />
853+
<node concept="3TrEf2" id="4v_weX56WrS" role="2OqNvi">
854+
<ref role="3Tt5mk" to="700h:6zmBjqUily6" resolve="baseType" />
855+
</node>
856+
</node>
857+
<node concept="2qgKlT" id="4v_weX5d$6n" role="2OqNvi">
858+
<ref role="37wK5l" to="pbu6:fIXgjlt4VE" resolve="isSameAs" />
859+
<node concept="2OqwBi" id="4v_weX5d$JR" role="37wK5m">
860+
<node concept="37vLTw" id="4v_weX5d$oQ" role="2Oq$k0">
861+
<ref role="3cqZAo" node="4v_weX56S4u" resolve="otherColl" />
862+
</node>
863+
<node concept="3TrEf2" id="4v_weX5d_op" role="2OqNvi">
864+
<ref role="3Tt5mk" to="700h:6zmBjqUily6" resolve="baseType" />
865+
</node>
866+
</node>
867+
</node>
868+
</node>
869+
<node concept="17R0WA" id="3Rh3xXbekUW" role="3uHU7B">
870+
<node concept="2OqwBi" id="3Rh3xXbdePw" role="3uHU7B">
871+
<node concept="37vLTw" id="3Rh3xXbdeGU" role="2Oq$k0">
872+
<ref role="3cqZAo" node="3Rh3xXbdd3c" resolve="other" />
873+
</node>
874+
<node concept="2yIwOk" id="3Rh3xXbekxN" role="2OqNvi" />
875+
</node>
876+
<node concept="37vLTw" id="3Rh3xXbel63" role="3uHU7w">
877+
<ref role="3cqZAo" node="3Rh3xXbejU8" resolve="concept" />
878+
</node>
879+
</node>
880+
</node>
881+
</node>
882+
</node>
883+
<node concept="2OqwBi" id="4v_weX56RFc" role="3clFbw">
884+
<node concept="37vLTw" id="4v_weX56Rwl" role="2Oq$k0">
885+
<ref role="3cqZAo" node="3Rh3xXbdd3c" resolve="other" />
886+
</node>
887+
<node concept="1mIQ4w" id="4v_weX56RQ7" role="2OqNvi">
888+
<node concept="chp4Y" id="4v_weX56RVO" role="cj9EA">
889+
<ref role="cht4Q" to="700h:6zmBjqUily5" resolve="CollectionType" />
890+
</node>
891+
</node>
892+
</node>
893+
</node>
894+
<node concept="3cpWs6" id="4v_weX56YNq" role="3cqZAp">
895+
<node concept="3clFbT" id="4v_weX56YW1" role="3cqZAk" />
896+
</node>
897+
</node>
898+
<node concept="37vLTG" id="3Rh3xXbdd3c" role="3clF46">
899+
<property role="TrG5h" value="other" />
900+
<node concept="3Tqbb2" id="3Rh3xXbdd3d" role="1tU5fm" />
901+
</node>
902+
<node concept="10P_77" id="3Rh3xXbdd3e" role="3clF45" />
903+
</node>
715904
<node concept="13i0hz" id="3tudP__zlp0" role="13h7CS">
716905
<property role="TrG5h" value="applicableConstraints" />
717906
<property role="13i0it" value="false" />

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@
111111
<node concept="PrWs8" id="60Qa1k_uzVZ" role="PzmwI">
112112
<ref role="PrY4T" to="hm2y:60Qa1k_nI2f" resolve="ITypeSupportsDefaultValue" />
113113
</node>
114+
<node concept="PrWs8" id="3Rh3xXbd9Oc" role="PzmwI">
115+
<ref role="PrY4T" to="hm2y:6xvNSEj6BMb" resolve="IComplexTypeSupportsEquals" />
116+
</node>
114117
</node>
115118
<node concept="1TIwiD" id="6zmBjqUinsw">
116119
<property role="TrG5h" value="ListType" />

0 commit comments

Comments
 (0)