Skip to content

Commit d125359

Browse files
wsafonovwsafonov
authored
Merge pull request #607 from IETS3/bugfix/temporal_literal_type2
[minor] Temporal: Make type constraint in temporal literal optional
2 parents 01ceec1 + 33d2805 commit d125359

File tree

2 files changed

+33
-57
lines changed

2 files changed

+33
-57
lines changed

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

Lines changed: 24 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@
8888
</concept>
8989
</language>
9090
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
91-
<concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
9291
<concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
9392
<child id="1068498886297" name="rValue" index="37vLTx" />
9493
<child id="1068498886295" name="lValue" index="37vLTJ" />
@@ -176,9 +175,6 @@
176175
<concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
177176
<reference id="1138056516764" name="link" index="3Tt5mk" />
178177
</concept>
179-
<concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
180-
<reference id="1138056546658" name="link" index="3TtcxE" />
181-
</concept>
182178
</language>
183179
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
184180
<concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
@@ -188,9 +184,6 @@
188184
<property id="1169194664001" name="name" index="TrG5h" />
189185
</concept>
190186
</language>
191-
<language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
192-
<concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
193-
</language>
194187
</registry>
195188
<node concept="24kQdi" id="50smQ1V8i9n">
196189
<ref role="1XX52x" to="l462:50smQ1V8i89" resolve="TemporalType" />
@@ -252,55 +245,34 @@
252245
<property role="Vbekb" value="g1_k_vY/BOLD" />
253246
</node>
254247
</node>
255-
<node concept="3EZMnI" id="7yDflTqUNIW" role="3EZMnx">
256-
<node concept="3F0ifn" id="7yDflTqUNJ3" role="3EZMnx">
257-
<property role="3F0ifm" value="&lt;" />
258-
<node concept="11L4FC" id="7yDflTqUNLs" role="3F10Kt">
259-
<property role="VOm3f" value="true" />
248+
<node concept="_tjkj" id="2ues9dMV_Tf" role="3EZMnx">
249+
<node concept="3EZMnI" id="7yDflTqUNIW" role="_tjki">
250+
<node concept="3F0ifn" id="7yDflTqUNJ3" role="3EZMnx">
251+
<property role="3F0ifm" value="&lt;" />
252+
<node concept="11L4FC" id="7UPMhn0Rt17" role="3F10Kt">
253+
<property role="VOm3f" value="true" />
254+
</node>
255+
<node concept="11LMrY" id="7yDflTqUNNB" role="3F10Kt">
256+
<property role="VOm3f" value="true" />
257+
</node>
260258
</node>
261-
<node concept="11LMrY" id="7yDflTqUNNB" role="3F10Kt">
262-
<property role="VOm3f" value="true" />
259+
<node concept="3F1sOY" id="7yDflTqUNJ9" role="3EZMnx">
260+
<property role="1$x2rV" value="type" />
261+
<ref role="1NtTu8" to="l462:7SY$c$i5rRe" resolve="typeConstraint" />
263262
</node>
264-
</node>
265-
<node concept="3F1sOY" id="7yDflTqUNJ9" role="3EZMnx">
266-
<property role="1$x2rV" value="type" />
267-
<ref role="1NtTu8" to="l462:7SY$c$i5rRe" resolve="typeConstraint" />
268-
</node>
269-
<node concept="3F0ifn" id="7yDflTqUNJh" role="3EZMnx">
270-
<property role="3F0ifm" value="&gt;" />
271-
<node concept="11L4FC" id="7yDflTqUNPL" role="3F10Kt">
272-
<property role="VOm3f" value="true" />
263+
<node concept="3F0ifn" id="7yDflTqUNJh" role="3EZMnx">
264+
<property role="3F0ifm" value="&gt;" />
265+
<node concept="11L4FC" id="7yDflTqUNPL" role="3F10Kt">
266+
<property role="VOm3f" value="true" />
267+
</node>
273268
</node>
269+
<node concept="2iRfu4" id="7yDflTqUNIZ" role="2iSdaV" />
274270
</node>
275-
<node concept="2iRfu4" id="7yDflTqUNIZ" role="2iSdaV" />
276-
<node concept="11L4FC" id="7yDflTqY$U8" role="3F10Kt">
277-
<property role="VOm3f" value="true" />
278-
</node>
279-
<node concept="11LMrY" id="7yDflTqY$XL" role="3F10Kt">
280-
<property role="VOm3f" value="true" />
281-
</node>
282-
<node concept="pkWqt" id="7SY$c$i5rRh" role="pqm2j">
283-
<node concept="3clFbS" id="7SY$c$i5rRi" role="2VODD2">
284-
<node concept="3clFbF" id="7SY$c$i5rRn" role="3cqZAp">
285-
<node concept="22lmx$" id="2LepRDoQfT$" role="3clFbG">
286-
<node concept="2OqwBi" id="2LepRDoQgWn" role="3uHU7w">
287-
<node concept="2OqwBi" id="2LepRDoQgjT" role="2Oq$k0">
288-
<node concept="pncrf" id="2LepRDoQg1l" role="2Oq$k0" />
289-
<node concept="3TrEf2" id="2LepRDoQgLN" role="2OqNvi">
290-
<ref role="3Tt5mk" to="l462:7SY$c$i5rRe" resolve="typeConstraint" />
291-
</node>
292-
</node>
293-
<node concept="3x8VRR" id="2LepRDoQhh7" role="2OqNvi" />
294-
</node>
295-
<node concept="2OqwBi" id="7SY$c$i5uKt" role="3uHU7B">
296-
<node concept="2OqwBi" id="7SY$c$i5s9D" role="2Oq$k0">
297-
<node concept="pncrf" id="7SY$c$i5rRm" role="2Oq$k0" />
298-
<node concept="3Tsc0h" id="7SY$c$i5t60" role="2OqNvi">
299-
<ref role="3TtcxE" to="l462:50smQ1V8QF$" resolve="slices" />
300-
</node>
301-
</node>
302-
<node concept="1v1jN8" id="7SY$c$i5x75" role="2OqNvi" />
303-
</node>
271+
<node concept="uPpia" id="7UPMhn0TeXM" role="1djCvC">
272+
<node concept="3clFbS" id="7UPMhn0TeXN" role="2VODD2">
273+
<node concept="3clFbF" id="7UPMhn0Tf2n" role="3cqZAp">
274+
<node concept="Xl_RD" id="7UPMhn0Tf2m" role="3clFbG">
275+
<property role="Xl_RC" value="an optional type constraint" />
304276
</node>
305277
</node>
306278
</node>

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -376,16 +376,20 @@
376376
</node>
377377
</node>
378378
</node>
379-
<node concept="2OqwBi" id="7SY$c$idH3I" role="3clFbw">
380-
<node concept="2OqwBi" id="7SY$c$idGMc" role="2Oq$k0">
381-
<node concept="1YBJjd" id="7SY$c$idGGD" role="2Oq$k0">
379+
<node concept="2OqwBi" id="2lDkbojtFxb" role="3clFbw">
380+
<node concept="2OqwBi" id="2lDkbojtExt" role="2Oq$k0">
381+
<node concept="1YBJjd" id="2lDkbojtE3q" role="2Oq$k0">
382382
<ref role="1YBMHb" node="50smQ1V92UJ" resolve="tl" />
383383
</node>
384-
<node concept="3TrEf2" id="7SY$c$idGPU" role="2OqNvi">
384+
<node concept="3TrEf2" id="2lDkbojtEUP" role="2OqNvi">
385385
<ref role="3Tt5mk" to="l462:7SY$c$i5rRe" resolve="typeConstraint" />
386386
</node>
387387
</node>
388-
<node concept="3x8VRR" id="7SY$c$idHhG" role="2OqNvi" />
388+
<node concept="1mIQ4w" id="2lDkbojtFVW" role="2OqNvi">
389+
<node concept="chp4Y" id="2lDkbojtG3j" role="cj9EA">
390+
<ref role="cht4Q" to="hm2y:6sdnDbSlaok" resolve="Type" />
391+
</node>
392+
</node>
389393
</node>
390394
</node>
391395
<node concept="3clFbJ" id="2LepRDoQnfM" role="3cqZAp">

0 commit comments

Comments
 (0)