Skip to content

Commit 7b97040

Browse files
arimerarimer
committed
temporal:TemporalLiteral: replaced text comparison in usniqueness check with isSameAs
1 parent df0b580 commit 7b97040

File tree

1 file changed

+45
-38
lines changed
  • code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/models

1 file changed

+45
-38
lines changed

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

Lines changed: 45 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,7 @@
388388
<concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
389389
<reference id="1153944258490" name="variable" index="2Gs0qQ" />
390390
</concept>
391+
<concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
391392
<concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
392393
<child id="1237721435807" name="elementType" index="HW$YZ" />
393394
</concept>
@@ -397,7 +398,6 @@
397398
<concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
398399
<concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
399400
<concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
400-
<concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
401401
</language>
402402
</registry>
403403
<node concept="2sgARr" id="50smQ1V8pHj">
@@ -872,15 +872,19 @@
872872
</node>
873873
</node>
874874
</node>
875-
<node concept="3cpWs8" id="6W4XqNw1$zD" role="3cqZAp">
876-
<node concept="3cpWsn" id="6W4XqNw1$zG" role="3cpWs9">
877-
<property role="TrG5h" value="uniqueDates" />
878-
<node concept="2hMVRd" id="6W4XqNw1$z_" role="1tU5fm">
879-
<node concept="17QB3L" id="5oaaToWXqxh" role="2hN53Y" />
875+
<node concept="3cpWs8" id="1MJboh4Ntv4" role="3cqZAp">
876+
<node concept="3cpWsn" id="1MJboh4Ntv7" role="3cpWs9">
877+
<property role="TrG5h" value="dates" />
878+
<node concept="2hMVRd" id="1MJboh4Ntv0" role="1tU5fm">
879+
<node concept="3Tqbb2" id="1MJboh4Ntxl" role="2hN53Y">
880+
<ref role="ehGHo" to="mi3w:3nGzaxURa4h" resolve="DateLiteral" />
881+
</node>
880882
</node>
881-
<node concept="2ShNRf" id="6W4XqNw1Nth" role="33vP2m">
882-
<node concept="2i4dXS" id="6W4XqNw1P2S" role="2ShVmc">
883-
<node concept="17QB3L" id="5oaaToWXqDw" role="HW$YZ" />
883+
<node concept="2ShNRf" id="1MJboh4Nv8D" role="33vP2m">
884+
<node concept="2i4dXS" id="1MJboh4NwDm" role="2ShVmc">
885+
<node concept="3Tqbb2" id="1MJboh4NwL5" role="HW$YZ">
886+
<ref role="ehGHo" to="mi3w:3nGzaxURa4h" resolve="DateLiteral" />
887+
</node>
884888
</node>
885889
</node>
886890
</node>
@@ -902,7 +906,7 @@
902906
<node concept="3cpWsn" id="5oaaToWY2tT" role="3cpWs9">
903907
<property role="TrG5h" value="date" />
904908
<node concept="3Tqbb2" id="5oaaToWY2jG" role="1tU5fm">
905-
<ref role="ehGHo" to="hm2y:6sdnDbSla17" resolve="Expression" />
909+
<ref role="ehGHo" to="mi3w:3nGzaxURa4h" resolve="DateLiteral" />
906910
</node>
907911
<node concept="2YIFZM" id="6belQKqlgMq" role="33vP2m">
908912
<ref role="37wK5l" node="6belQKqlgtP" resolve="unwrapToDateLiteral" />
@@ -918,7 +922,6 @@
918922
</node>
919923
</node>
920924
</node>
921-
<node concept="3clFbH" id="5oaaToWY2_W" role="3cqZAp" />
922925
<node concept="3clFbJ" id="6belQKqlhIK" role="3cqZAp">
923926
<node concept="3clFbS" id="6belQKqlhIM" role="3clFbx">
924927
<node concept="a7r0C" id="6belQKqlkmr" role="3cqZAp">
@@ -943,20 +946,6 @@
943946
</node>
944947
<node concept="9aQIb" id="7Ndb$5pb7Hl" role="9aQIa">
945948
<node concept="3clFbS" id="7Ndb$5pb7Hm" role="9aQI4">
946-
<node concept="3cpWs8" id="5oaaToWY0BA" role="3cqZAp">
947-
<node concept="3cpWsn" id="5oaaToWY0BB" role="3cpWs9">
948-
<property role="TrG5h" value="readableDate" />
949-
<node concept="17QB3L" id="5oaaToWXWQx" role="1tU5fm" />
950-
<node concept="2OqwBi" id="5oaaToWY0BC" role="33vP2m">
951-
<node concept="37vLTw" id="5oaaToWY2tX" role="2Oq$k0">
952-
<ref role="3cqZAo" node="5oaaToWY2tT" resolve="date" />
953-
</node>
954-
<node concept="2qgKlT" id="5oaaToWY0BG" role="2OqNvi">
955-
<ref role="37wK5l" to="pbu6:4Y0vh0cfqjE" resolve="renderReadable" />
956-
</node>
957-
</node>
958-
</node>
959-
</node>
960949
<node concept="3clFbJ" id="6W4XqNw201R" role="3cqZAp">
961950
<node concept="3clFbS" id="6W4XqNw201T" role="3clFbx">
962951
<node concept="2MkqsV" id="6W4XqNw24fs" role="3cqZAp">
@@ -973,26 +962,44 @@
973962
</node>
974963
</node>
975964
</node>
976-
<node concept="2OqwBi" id="6W4XqNw21G_" role="3clFbw">
977-
<node concept="37vLTw" id="6W4XqNw20C0" role="2Oq$k0">
978-
<ref role="3cqZAo" node="6W4XqNw1$zG" resolve="uniqueDates" />
965+
<node concept="2OqwBi" id="1MJboh4NXrW" role="3clFbw">
966+
<node concept="37vLTw" id="1MJboh4NW0c" role="2Oq$k0">
967+
<ref role="3cqZAo" node="1MJboh4Ntv7" resolve="dates" />
979968
</node>
980-
<node concept="3JPx81" id="6W4XqNw22zO" role="2OqNvi">
981-
<node concept="37vLTw" id="5oaaToWY0BI" role="25WWJ7">
982-
<ref role="3cqZAo" node="5oaaToWY0BB" resolve="readableDate" />
969+
<node concept="2HwmR7" id="1MJboh4O57$" role="2OqNvi">
970+
<node concept="1bVj0M" id="1MJboh4O57A" role="23t8la">
971+
<node concept="3clFbS" id="1MJboh4O57B" role="1bW5cS">
972+
<node concept="3clFbF" id="1MJboh4O5Hy" role="3cqZAp">
973+
<node concept="2OqwBi" id="1MJboh4O6xy" role="3clFbG">
974+
<node concept="37vLTw" id="1MJboh4O5Hx" role="2Oq$k0">
975+
<ref role="3cqZAo" node="1MJboh4O57C" resolve="it" />
976+
</node>
977+
<node concept="2qgKlT" id="1MJboh4O9p7" role="2OqNvi">
978+
<ref role="37wK5l" to="pbu6:7GwCuf2r4g6" resolve="isSameAs" />
979+
<node concept="37vLTw" id="1MJboh4Oacz" role="37wK5m">
980+
<ref role="3cqZAo" node="5oaaToWY2tT" resolve="date" />
981+
</node>
982+
</node>
983+
</node>
984+
</node>
985+
</node>
986+
<node concept="Rh6nW" id="1MJboh4O57C" role="1bW2Oz">
987+
<property role="TrG5h" value="it" />
988+
<node concept="2jxLKc" id="1MJboh4O57D" role="1tU5fm" />
989+
</node>
983990
</node>
984991
</node>
985992
</node>
986993
<node concept="9aQIb" id="6W4XqNw27u3" role="9aQIa">
987994
<node concept="3clFbS" id="6W4XqNw27u4" role="9aQI4">
988-
<node concept="3clFbF" id="6W4XqNw27z7" role="3cqZAp">
989-
<node concept="2OqwBi" id="6W4XqNw28xK" role="3clFbG">
990-
<node concept="37vLTw" id="6W4XqNw27z6" role="2Oq$k0">
991-
<ref role="3cqZAo" node="6W4XqNw1$zG" resolve="uniqueDates" />
995+
<node concept="3clFbF" id="1MJboh4OhMX" role="3cqZAp">
996+
<node concept="2OqwBi" id="1MJboh4OjrM" role="3clFbG">
997+
<node concept="37vLTw" id="1MJboh4OhMV" role="2Oq$k0">
998+
<ref role="3cqZAo" node="1MJboh4Ntv7" resolve="dates" />
992999
</node>
993-
<node concept="TSZUe" id="6W4XqNw29jU" role="2OqNvi">
994-
<node concept="37vLTw" id="5oaaToWY0BJ" role="25WWJ7">
995-
<ref role="3cqZAo" node="5oaaToWY0BB" resolve="readableDate" />
1000+
<node concept="TSZUe" id="1MJboh4OkRF" role="2OqNvi">
1001+
<node concept="37vLTw" id="1MJboh4Ol_V" role="25WWJ7">
1002+
<ref role="3cqZAo" node="5oaaToWY2tT" resolve="date" />
9961003
</node>
9971004
</node>
9981005
</node>

0 commit comments

Comments
 (0)