Skip to content

Commit a503352

Browse files
arimerarimer
authored
expr.temporal: improved exception handling in check (#752)
* expr.temporal: improved exception handling in check
1 parent 7b406f7 commit a503352

File tree

2 files changed

+70
-10
lines changed

2 files changed

+70
-10
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ The project does _not_ follow Semantic Versioning and the changes are documented
1111

1212
- The PCollections library was updated to version 4.0.1.
1313

14+
### Fixed
15+
- Uncatched `DateTimeException` during check DateLiteral
16+
1417
## December 2023
1518

1619
### Fixed

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

Lines changed: 67 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@
4242
</concept>
4343
<concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
4444
<concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
45+
<concept id="8118189177080264853" name="jetbrains.mps.baseLanguage.structure.AlternativeType" flags="ig" index="nSUau">
46+
<child id="8118189177080264854" name="alternative" index="nSUat" />
47+
</concept>
4548
<concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
4649
<concept id="1076505808687" name="jetbrains.mps.baseLanguage.structure.WhileStatement" flags="nn" index="2$JKZl">
4750
<child id="1076505808688" name="condition" index="2$JKZa" />
@@ -68,6 +71,7 @@
6871
<concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
6972
<property id="1070475926801" name="value" index="Xl_RC" />
7073
</concept>
74+
<concept id="4952749571008284462" name="jetbrains.mps.baseLanguage.structure.CatchVariable" flags="ng" index="XOnhg" />
7175
<concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
7276
<concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
7377
<reference id="1144433194310" name="classConcept" index="1Pybhc" />
@@ -146,10 +150,18 @@
146150
<child id="1081773367579" name="rightExpression" index="3uHU7w" />
147151
<child id="1081773367580" name="leftExpression" index="3uHU7B" />
148152
</concept>
153+
<concept id="3093926081414150598" name="jetbrains.mps.baseLanguage.structure.MultipleCatchClause" flags="ng" index="3uVAMA">
154+
<child id="8276990574895933173" name="catchBody" index="1zc67A" />
155+
<child id="8276990574895933172" name="throwable" index="1zc67B" />
156+
</concept>
149157
<concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
150158
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
151159
<child id="1178549979242" name="visibility" index="1B3o_S" />
152160
</concept>
161+
<concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
162+
<child id="8276990574886367510" name="catchClause" index="1zxBo5" />
163+
<child id="8276990574886367508" name="body" index="1zxBo7" />
164+
</concept>
153165
<concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
154166
<child id="1163668914799" name="condition" index="3K4Cdx" />
155167
<child id="1163668922816" name="ifTrue" index="3K4E3e" />
@@ -284,6 +296,12 @@
284296
<concept id="1174663118805" name="jetbrains.mps.lang.typesystem.structure.CreateLessThanInequationStatement" flags="nn" index="1ZobV4" />
285297
<concept id="1174663239020" name="jetbrains.mps.lang.typesystem.structure.CreateGreaterThanInequationStatement" flags="nn" index="1ZoDhX" />
286298
</language>
299+
<language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
300+
<concept id="2034914114981261497" name="jetbrains.mps.baseLanguage.logging.structure.LogLowLevelStatement" flags="ng" index="RRSsy">
301+
<property id="2034914114981261751" name="severity" index="RRSoG" />
302+
<child id="2034914114981261753" name="message" index="RRSoy" />
303+
</concept>
304+
</language>
287305
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
288306
<concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
289307
<reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
@@ -398,6 +416,7 @@
398416
<concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
399417
<concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
400418
<concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
419+
<concept id="31378964227347002" name="jetbrains.mps.baseLanguage.collections.structure.SelectNotNullOperation" flags="ng" index="1KnU$U" />
401420
</language>
402421
</registry>
403422
<node concept="2sgARr" id="50smQ1V8pHj">
@@ -963,21 +982,59 @@
963982
</node>
964983
</node>
965984
<node concept="2OqwBi" id="1MJboh4NXrW" role="3clFbw">
966-
<node concept="37vLTw" id="1MJboh4NW0c" role="2Oq$k0">
967-
<ref role="3cqZAo" node="1MJboh4Ntv7" resolve="dates" />
985+
<node concept="2OqwBi" id="4vJmyIT5Pn5" role="2Oq$k0">
986+
<node concept="37vLTw" id="1MJboh4NW0c" role="2Oq$k0">
987+
<ref role="3cqZAo" node="1MJboh4Ntv7" resolve="dates" />
988+
</node>
989+
<node concept="1KnU$U" id="4vJmyIThUq$" role="2OqNvi" />
968990
</node>
969991
<node concept="2HwmR7" id="1MJboh4O57$" role="2OqNvi">
970992
<node concept="1bVj0M" id="1MJboh4O57A" role="23t8la">
971993
<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" />
994+
<node concept="3J1_TO" id="4vJmyITi0OC" role="3cqZAp">
995+
<node concept="3uVAMA" id="4vJmyITi11d" role="1zxBo5">
996+
<node concept="XOnhg" id="4vJmyITi11e" role="1zc67B">
997+
<property role="TrG5h" value="ex" />
998+
<node concept="nSUau" id="4vJmyITi11f" role="1tU5fm">
999+
<node concept="3uibUv" id="4vJmyITi2nS" role="nSUat">
1000+
<ref role="3uigEE" to="wyt6:~RuntimeException" resolve="RuntimeException" />
1001+
</node>
1002+
</node>
1003+
</node>
1004+
<node concept="3clFbS" id="4vJmyITi11g" role="1zc67A">
1005+
<node concept="RRSsy" id="4vJmyITi5ZX" role="3cqZAp">
1006+
<property role="RRSoG" value="gZ5fh_4/error" />
1007+
<node concept="3cpWs3" id="4vJmyITiW3E" role="RRSoy">
1008+
<node concept="Xl_RD" id="4vJmyITiWrz" role="3uHU7B">
1009+
<property role="Xl_RC" value="Failed to compare date literals. " />
1010+
</node>
1011+
<node concept="2OqwBi" id="4vJmyITibzb" role="3uHU7w">
1012+
<node concept="37vLTw" id="4vJmyITiaBE" role="2Oq$k0">
1013+
<ref role="3cqZAo" node="4vJmyITi11e" resolve="ex" />
1014+
</node>
1015+
<node concept="liA8E" id="4vJmyITibWH" role="2OqNvi">
1016+
<ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
1017+
</node>
1018+
</node>
1019+
</node>
1020+
</node>
1021+
<node concept="3cpWs6" id="JblrdgIUTz" role="3cqZAp">
1022+
<node concept="3clFbT" id="JblrdgIUTX" role="3cqZAk" />
1023+
</node>
9761024
</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" />
1025+
</node>
1026+
<node concept="3clFbS" id="4vJmyITi0OE" role="1zxBo7">
1027+
<node concept="3cpWs6" id="JblrdgIKOg" role="3cqZAp">
1028+
<node concept="2OqwBi" id="JblrdgIKOi" role="3cqZAk">
1029+
<node concept="37vLTw" id="JblrdgIKOj" role="2Oq$k0">
1030+
<ref role="3cqZAo" node="1MJboh4O57C" resolve="it" />
1031+
</node>
1032+
<node concept="2qgKlT" id="JblrdgIKOk" role="2OqNvi">
1033+
<ref role="37wK5l" to="pbu6:7GwCuf2r4g6" resolve="isSameAs" />
1034+
<node concept="37vLTw" id="JblrdgIKOl" role="37wK5m">
1035+
<ref role="3cqZAo" node="5oaaToWY2tT" resolve="date" />
1036+
</node>
1037+
</node>
9811038
</node>
9821039
</node>
9831040
</node>

0 commit comments

Comments
 (0)