Skip to content

Commit 7d7399a

Browse files
alexanderpannalexanderpann
authored
Merge pull request #513 from IETS3/bugfix/untilOpReverseArgs#261
Return EmptyDateRange when dates are reversed in until operation
2 parents 58c7a13 + 2ab7ee1 commit 7d7399a

File tree

4 files changed

+87
-52
lines changed

4 files changed

+87
-52
lines changed

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.datetime/generator/template/[email protected]‎

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -4209,50 +4209,49 @@
42094209
<property role="36QftV" value="true" />
42104210
<ref role="30HIoZ" to="hm2y:7NJy08a3O99" resolve="DotExpression" />
42114211
<node concept="gft3U" id="7fmv$FCbIcf" role="1lVwrX">
4212-
<node concept="2ShNRf" id="7fmv$FCbPhI" role="gfFT$">
4213-
<node concept="1pGfFk" id="7fmv$FCbP$n" role="2ShVmc">
4214-
<ref role="37wK5l" to="2j0k:7khFtBHHXIt" resolve="ArbitraryDateRangeValue" />
4215-
<node concept="10M0yZ" id="7fmv$FCbPGl" role="37wK5m">
4216-
<ref role="1PxDUh" to="28m1:~LocalDate" resolve="LocalDate" />
4217-
<ref role="3cqZAo" to="28m1:~LocalDate.MIN" resolve="MIN" />
4218-
<node concept="29HgVG" id="7fmv$FCbPGm" role="lGtFl">
4219-
<node concept="3NFfHV" id="7fmv$FCbPGn" role="3NFExx">
4220-
<node concept="3clFbS" id="7fmv$FCbPGo" role="2VODD2">
4221-
<node concept="3clFbF" id="7fmv$FCbPGp" role="3cqZAp">
4222-
<node concept="2OqwBi" id="7fmv$FCbPGq" role="3clFbG">
4223-
<node concept="30H73N" id="7fmv$FCbPGr" role="2Oq$k0" />
4224-
<node concept="3TrEf2" id="7fmv$FCbPGs" role="2OqNvi">
4225-
<ref role="3Tt5mk" to="hm2y:4rZeNQ6NgXF" resolve="expr" />
4226-
</node>
4212+
<node concept="2YIFZM" id="71iF5Nc$yEP" role="gfFT$">
4213+
<ref role="37wK5l" to="2j0k:7fmv$FC7j0i" resolve="make" />
4214+
<ref role="1Pybhc" to="2j0k:7khFtBHHXIi" resolve="ArbitraryDateRangeValue" />
4215+
<node concept="10M0yZ" id="71iF5Nc$z5Q" role="37wK5m">
4216+
<ref role="3cqZAo" to="28m1:~LocalDate.MIN" resolve="MIN" />
4217+
<ref role="1PxDUh" to="28m1:~LocalDate" resolve="LocalDate" />
4218+
<node concept="29HgVG" id="71iF5Nc$zdQ" role="lGtFl">
4219+
<node concept="3NFfHV" id="71iF5Nc$zdR" role="3NFExx">
4220+
<node concept="3clFbS" id="71iF5Nc$zdS" role="2VODD2">
4221+
<node concept="3clFbF" id="71iF5Nc$zdY" role="3cqZAp">
4222+
<node concept="2OqwBi" id="71iF5Nc$zdT" role="3clFbG">
4223+
<node concept="3TrEf2" id="71iF5Nc$zdW" role="2OqNvi">
4224+
<ref role="3Tt5mk" to="hm2y:4rZeNQ6NgXF" resolve="expr" />
42274225
</node>
4226+
<node concept="30H73N" id="71iF5Nc$zdX" role="2Oq$k0" />
42284227
</node>
42294228
</node>
42304229
</node>
42314230
</node>
42324231
</node>
4233-
<node concept="10M0yZ" id="7fmv$FCbRkt" role="37wK5m">
4234-
<ref role="1PxDUh" to="28m1:~LocalDate" resolve="LocalDate" />
4235-
<ref role="3cqZAo" to="28m1:~LocalDate.MAX" resolve="MAX" />
4236-
<node concept="29HgVG" id="7fmv$FCbRku" role="lGtFl">
4237-
<node concept="3NFfHV" id="7fmv$FCbRkv" role="3NFExx">
4238-
<node concept="3clFbS" id="7fmv$FCbRkw" role="2VODD2">
4239-
<node concept="3clFbF" id="7fmv$FCbRkx" role="3cqZAp">
4240-
<node concept="2OqwBi" id="7fmv$FCbRky" role="3clFbG">
4241-
<node concept="1PxgMI" id="7fmv$FCbRkz" role="2Oq$k0">
4242-
<node concept="chp4Y" id="7fmv$FCbRk$" role="3oSUPX">
4243-
<ref role="cht4Q" to="mi3w:7khFtBH_CX$" resolve="UntilOp" />
4244-
</node>
4245-
<node concept="2OqwBi" id="7fmv$FCbRk_" role="1m5AlR">
4246-
<node concept="3TrEf2" id="7fmv$FCbRkA" role="2OqNvi">
4247-
<ref role="3Tt5mk" to="hm2y:7NJy08a3O9b" resolve="target" />
4248-
</node>
4249-
<node concept="30H73N" id="7fmv$FCbRkB" role="2Oq$k0" />
4250-
</node>
4232+
</node>
4233+
<node concept="10M0yZ" id="71iF5Nc$$gq" role="37wK5m">
4234+
<ref role="3cqZAo" to="28m1:~LocalDate.MAX" resolve="MAX" />
4235+
<ref role="1PxDUh" to="28m1:~LocalDate" resolve="LocalDate" />
4236+
<node concept="29HgVG" id="71iF5Nc$$pe" role="lGtFl">
4237+
<node concept="3NFfHV" id="71iF5Nc$$pf" role="3NFExx">
4238+
<node concept="3clFbS" id="71iF5Nc$$pg" role="2VODD2">
4239+
<node concept="3clFbF" id="71iF5Nc$$pm" role="3cqZAp">
4240+
<node concept="2OqwBi" id="7fmv$FCbRky" role="3clFbG">
4241+
<node concept="1PxgMI" id="7fmv$FCbRkz" role="2Oq$k0">
4242+
<node concept="chp4Y" id="7fmv$FCbRk$" role="3oSUPX">
4243+
<ref role="cht4Q" to="mi3w:7khFtBH_CX$" resolve="UntilOp" />
42514244
</node>
4252-
<node concept="3TrEf2" id="7fmv$FCbRkC" role="2OqNvi">
4253-
<ref role="3Tt5mk" to="mi3w:7khFtBH_CX_" resolve="endDate" />
4245+
<node concept="2OqwBi" id="7fmv$FCbRk_" role="1m5AlR">
4246+
<node concept="3TrEf2" id="7fmv$FCbRkA" role="2OqNvi">
4247+
<ref role="3Tt5mk" to="hm2y:7NJy08a3O9b" resolve="target" />
4248+
</node>
4249+
<node concept="30H73N" id="7fmv$FCbRkB" role="2Oq$k0" />
42544250
</node>
42554251
</node>
4252+
<node concept="3TrEf2" id="7fmv$FCbRkC" role="2OqNvi">
4253+
<ref role="3Tt5mk" to="mi3w:7khFtBH_CX_" resolve="endDate" />
4254+
</node>
42564255
</node>
42574256
</node>
42584257
</node>

‎code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.datetime.interpreter/models/plugin.mps‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -672,16 +672,15 @@
672672
</node>
673673
</node>
674674
</node>
675-
<node concept="3cpWs6" id="7fmv$FC7LFr" role="3cqZAp">
676-
<node concept="2ShNRf" id="7fmv$FCbGlF" role="3cqZAk">
677-
<node concept="1pGfFk" id="7fmv$FCbG$9" role="2ShVmc">
678-
<ref role="37wK5l" to="2j0k:7khFtBHHXIt" resolve="ArbitraryDateRangeValue" />
679-
<node concept="37vLTw" id="7fmv$FCbGAU" role="37wK5m">
680-
<ref role="3cqZAo" node="7khFtBHAtsQ" resolve="ctx" />
681-
</node>
682-
<node concept="37vLTw" id="7fmv$FCbGDP" role="37wK5m">
683-
<ref role="3cqZAo" node="7khFtBHAtAr" resolve="end" />
684-
</node>
675+
<node concept="3cpWs6" id="71iF5NczoC_" role="3cqZAp">
676+
<node concept="2YIFZM" id="71iF5NczoFg" role="3cqZAk">
677+
<ref role="37wK5l" to="2j0k:7fmv$FC7j0i" resolve="make" />
678+
<ref role="1Pybhc" to="2j0k:7khFtBHHXIi" resolve="ArbitraryDateRangeValue" />
679+
<node concept="37vLTw" id="71iF5NczoFv" role="37wK5m">
680+
<ref role="3cqZAo" node="7khFtBHAtsQ" resolve="ctx" />
681+
</node>
682+
<node concept="37vLTw" id="71iF5NczoGb" role="37wK5m">
683+
<ref role="3cqZAo" node="7khFtBHAtAr" resolve="end" />
685684
</node>
686685
</node>
687686
</node>

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

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
</concept>
5959
<concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA" />
6060
<concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
61+
<concept id="1070475587102" name="jetbrains.mps.baseLanguage.structure.SuperConstructorInvocation" flags="nn" index="XkiVB" />
6162
<concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
6263
<property id="1070475926801" name="value" index="Xl_RC" />
6364
</concept>
@@ -2829,8 +2830,8 @@
28292830
<ref role="3uigEE" to="28m1:~LocalDate" resolve="LocalDate" />
28302831
</node>
28312832
</node>
2832-
<node concept="3uibUv" id="7fmv$FC7mf0" role="3clF45">
2833-
<ref role="3uigEE" node="7khFtBHIbg6" resolve="AbstractDateRangeValue" />
2833+
<node concept="3uibUv" id="71iF5NcAUe9" role="3clF45">
2834+
<ref role="3uigEE" node="7khFtBHHXIi" resolve="ArbitraryDateRangeValue" />
28342835
</node>
28352836
<node concept="3Tm1VV" id="7fmv$FC7j0l" role="1B3o_S" />
28362837
<node concept="3clFbS" id="7fmv$FC7j0m" role="3clF47">
@@ -2849,8 +2850,8 @@
28492850
<node concept="3clFbS" id="7fmv$FC7jR4" role="3clFbx">
28502851
<node concept="3cpWs6" id="7fmv$FC7kt5" role="3cqZAp">
28512852
<node concept="2ShNRf" id="7fmv$FC7kw6" role="3cqZAk">
2852-
<node concept="HV5vD" id="7fmv$FC7kP3" role="2ShVmc">
2853-
<ref role="HV5vE" node="4O9rw8aCYPg" resolve="EmptyDateRangeValue" />
2853+
<node concept="1pGfFk" id="71iF5NcAU6o" role="2ShVmc">
2854+
<ref role="37wK5l" node="71iF5NcALUq" resolve="EmptyDateRangeValue" />
28542855
</node>
28552856
</node>
28562857
</node>
@@ -4241,11 +4242,22 @@
42414242
<node concept="312cEu" id="4O9rw8aCYPg">
42424243
<property role="TrG5h" value="EmptyDateRangeValue" />
42434244
<node concept="2tJIrI" id="4O9rw8aF3DE" role="jymVt" />
4244-
<node concept="2tJIrI" id="4O9rw8aF3JI" role="jymVt" />
42454245
<node concept="3Tm1VV" id="4O9rw8aCYPh" role="1B3o_S" />
4246-
<node concept="3uibUv" id="4O9rw8aCZ39" role="1zkMxy">
4247-
<ref role="3uigEE" node="7khFtBHIbg6" resolve="AbstractDateRangeValue" />
4246+
<node concept="3uibUv" id="71iF5NcAJ9l" role="1zkMxy">
4247+
<ref role="3uigEE" node="7khFtBHHXIi" resolve="ArbitraryDateRangeValue" />
4248+
</node>
4249+
<node concept="3clFbW" id="71iF5NcALUq" role="jymVt">
4250+
<node concept="3cqZAl" id="71iF5NcALUr" role="3clF45" />
4251+
<node concept="3Tm1VV" id="71iF5NcALUs" role="1B3o_S" />
4252+
<node concept="3clFbS" id="71iF5NcALUI" role="3clF47">
4253+
<node concept="XkiVB" id="71iF5NcALUJ" role="3cqZAp">
4254+
<ref role="37wK5l" node="7khFtBHHXIt" resolve="ArbitraryDateRangeValue" />
4255+
<node concept="10Nm6u" id="71iF5NcANRB" role="37wK5m" />
4256+
<node concept="10Nm6u" id="71iF5NcAPtq" role="37wK5m" />
4257+
</node>
4258+
</node>
42484259
</node>
4260+
<node concept="2tJIrI" id="71iF5NcAMCw" role="jymVt" />
42494261
<node concept="3clFb_" id="4O9rw8aCZ67" role="jymVt">
42504262
<property role="TrG5h" value="begin" />
42514263
<node concept="3uibUv" id="4O9rw8aCZ68" role="3clF45">

‎code/languages/org.iets3.opensource/tests/test.in.expr.os/models/[email protected]‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4832,6 +4832,31 @@
48324832
</node>
48334833
</node>
48344834
</node>
4835+
<node concept="_ixoA" id="71iF5Ncz7jn" role="_iOnB" />
4836+
<node concept="_fkuM" id="71iF5Ncz8eO" role="_iOnB">
4837+
<property role="TrG5h" value="UntilReverseDates" />
4838+
<node concept="_fkuZ" id="71iF5Ncz8GB" role="_fkp5">
4839+
<node concept="_fku$" id="71iF5Ncz8GC" role="_fkur" />
4840+
<node concept="1QScDb" id="71iF5Nczbba" role="_fkuY">
4841+
<node concept="17FQp2" id="71iF5NczbbX" role="1QScD9" />
4842+
<node concept="1QScDb" id="71iF5Ncz8HB" role="30czhm">
4843+
<node concept="2oxMaX" id="71iF5Ncz8I9" role="1QScD9">
4844+
<node concept="1fc2QT" id="71iF5Ncz8J9" role="2oxMaW">
4845+
<property role="1fc2QW" value="13" />
4846+
<property role="1fc2QX" value="09" />
4847+
<property role="1fc2QY" value="2021" />
4848+
</node>
4849+
</node>
4850+
<node concept="1fc2QT" id="71iF5Ncz8Hb" role="30czhm">
4851+
<property role="1fc2QW" value="14" />
4852+
<property role="1fc2QX" value="09" />
4853+
<property role="1fc2QY" value="2021" />
4854+
</node>
4855+
</node>
4856+
</node>
4857+
<node concept="2vmpnb" id="71iF5Ncz8H2" role="_fkuS" />
4858+
</node>
4859+
</node>
48354860
<node concept="_ixoA" id="4V0FBnKJhrk" role="_iOnB" />
48364861
<node concept="_ixoA" id="4V0FBnKJi0T" role="_iOnB" />
48374862
<node concept="_ixoA" id="j5CxBK7y2D" role="_iOnB" />

0 commit comments

Comments
 (0)