Skip to content

Commit 7e2e0ba

Browse files
arimerarimer
authored
Merge pull request #1328 from IETS3/merge/mps20241
Merge maintenance/mps20241 into master
2 parents 8a71d53 + 64c6d98 commit 7e2e0ba

File tree

9 files changed

+1768
-309
lines changed

9 files changed

+1768
-309
lines changed

‎code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/behavior.mps‎

Lines changed: 44 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,9 @@
239239
<concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
240240
<child id="8970989240999019149" name="part" index="1dT_Ay" />
241241
</concept>
242+
<concept id="8465538089690331492" name="jetbrains.mps.baseLanguage.javadoc.structure.DeprecatedBlockDocTag" flags="ng" index="TZ5HI">
243+
<child id="2667874559098216723" name="text" index="3HnX3l" />
244+
</concept>
242245
<concept id="2217234381367530212" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocReference" flags="ng" index="VXe08">
243246
<reference id="2217234381367530213" name="classifier" index="VXe09" />
244247
</concept>
@@ -338,11 +341,31 @@
338341
<property role="3GE5qa" value="adapter" />
339342
<ref role="13h7C2" to="l80j:4pkidg67Lfn" resolve="ISolvable" />
340343
<node concept="13i0hz" id="4pkidg67Lgb" role="13h7CS">
341-
<property role="13i0iv" value="true" />
342344
<property role="13i0it" value="true" />
343345
<property role="TrG5h" value="createSolverTask" />
344346
<node concept="3Tm1VV" id="4pkidg67Lgc" role="1B3o_S" />
345-
<node concept="3clFbS" id="4pkidg67Lgd" role="3clF47" />
347+
<node concept="3clFbS" id="4pkidg67Lgd" role="3clF47">
348+
<node concept="3clFbF" id="75lF9T6uCV8" role="3cqZAp">
349+
<node concept="2YIFZM" id="75lF9T6uDgz" role="3clFbG">
350+
<ref role="37wK5l" to="hnhi:7rOSrvnISxp" resolve="createSolverTask" />
351+
<ref role="1Pybhc" to="hnhi:7rOSrvnISp9" resolve="STF" />
352+
<node concept="13iPFW" id="75lF9T6uDwb" role="37wK5m" />
353+
<node concept="2OqwBi" id="75lF9T6uIwD" role="37wK5m">
354+
<node concept="2OqwBi" id="75lF9T6uG5Y" role="2Oq$k0">
355+
<node concept="2JrnkZ" id="75lF9T6uFzN" role="2Oq$k0">
356+
<node concept="13iPFW" id="75lF9T6uDPb" role="2JrQYb" />
357+
</node>
358+
<node concept="liA8E" id="75lF9T6uGnD" role="2OqNvi">
359+
<ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
360+
</node>
361+
</node>
362+
<node concept="liA8E" id="75lF9T6uKtt" role="2OqNvi">
363+
<ref role="37wK5l" to="wyt6:~Class.toString()" resolve="toString" />
364+
</node>
365+
</node>
366+
</node>
367+
</node>
368+
</node>
346369
<node concept="3Tqbb2" id="4pkidg67Lgj" role="3clF45">
347370
<ref role="ehGHo" to="l80j:7rOSrvnFUQX" resolve="AbstractSolverTask" />
348371
</node>
@@ -680,21 +703,21 @@
680703
<property role="TrG5h" value="runManuallyAsync" />
681704
<node concept="3Tm1VV" id="7QODtLvTFn$" role="1B3o_S" />
682705
<node concept="3clFbS" id="7QODtLvTFnA" role="3clF47">
683-
<node concept="3clFbF" id="7QODtLvTGsE" role="3cqZAp">
684-
<node concept="2YIFZM" id="7QODtLvTGNW" role="3clFbG">
685-
<ref role="1Pybhc" to="hnhi:2f_Mi5mAhjh" resolve="AsyncSolverTaskExecutor" />
706+
<node concept="3clFbF" id="75Ean$HroIU" role="3cqZAp">
707+
<node concept="2YIFZM" id="4aAsKjbunKK" role="3clFbG">
686708
<ref role="37wK5l" to="hnhi:3hn7H_$lmns" resolve="submitISolvable" />
687-
<node concept="13iPFW" id="7QODtLvTGNX" role="37wK5m" />
688-
<node concept="2OqwBi" id="5BRQP3RmK2b" role="37wK5m">
689-
<node concept="Rm8GO" id="5BRQP3RmJB5" role="2Oq$k0">
709+
<ref role="1Pybhc" to="hnhi:2f_Mi5mAhjh" resolve="AsyncSolverTaskExecutor" />
710+
<node concept="13iPFW" id="4aAsKjbunKL" role="37wK5m" />
711+
<node concept="2OqwBi" id="4aAsKjbunKM" role="37wK5m">
712+
<node concept="Rm8GO" id="4aAsKjbunKN" role="2Oq$k0">
690713
<ref role="Rm8GQ" to="dzyv:~ChronoUnit.FOREVER" resolve="FOREVER" />
691714
<ref role="1Px2BO" to="dzyv:~ChronoUnit" resolve="ChronoUnit" />
692715
</node>
693-
<node concept="liA8E" id="5BRQP3RmKNp" role="2OqNvi">
716+
<node concept="liA8E" id="4aAsKjbunKO" role="2OqNvi">
694717
<ref role="37wK5l" to="dzyv:~ChronoUnit.getDuration()" resolve="getDuration" />
695718
</node>
696719
</node>
697-
<node concept="3clFbT" id="cwnBfE0FNP" role="37wK5m">
720+
<node concept="3clFbT" id="4aAsKjbunKP" role="37wK5m">
698721
<property role="3clFbU" value="true" />
699722
</node>
700723
</node>
@@ -1384,22 +1407,11 @@
13841407
<property role="13i0it" value="true" />
13851408
<node concept="3Tm1VV" id="3NwcubmnBQ6" role="1B3o_S" />
13861409
<node concept="3clFbS" id="3NwcubmnBQ8" role="3clF47">
1387-
<node concept="3clFbF" id="3NwcubmnCHl" role="3cqZAp">
1388-
<node concept="2YIFZM" id="_TaQix4Zs1" role="3clFbG">
1389-
<ref role="37wK5l" to="hnhi:3hn7H_$lmns" resolve="submitISolvable" />
1390-
<ref role="1Pybhc" to="hnhi:2f_Mi5mAhjh" resolve="AsyncSolverTaskExecutor" />
1391-
<node concept="13iPFW" id="_TaQix4Zs2" role="37wK5m" />
1392-
<node concept="2OqwBi" id="_TaQix4Zs3" role="37wK5m">
1393-
<node concept="Rm8GO" id="_TaQix4Zs4" role="2Oq$k0">
1394-
<ref role="Rm8GQ" to="dzyv:~ChronoUnit.FOREVER" resolve="FOREVER" />
1395-
<ref role="1Px2BO" to="dzyv:~ChronoUnit" resolve="ChronoUnit" />
1396-
</node>
1397-
<node concept="liA8E" id="_TaQix4Zs5" role="2OqNvi">
1398-
<ref role="37wK5l" to="dzyv:~ChronoUnit.getDuration()" resolve="getDuration" />
1399-
</node>
1400-
</node>
1401-
<node concept="3clFbT" id="_TaQix4Zs6" role="37wK5m">
1402-
<property role="3clFbU" value="true" />
1410+
<node concept="3clFbF" id="4aAsKjbuonM" role="3cqZAp">
1411+
<node concept="2OqwBi" id="4aAsKjbuoLt" role="3clFbG">
1412+
<node concept="13iPFW" id="4aAsKjbuonL" role="2Oq$k0" />
1413+
<node concept="2qgKlT" id="4aAsKjbuqOi" role="2OqNvi">
1414+
<ref role="37wK5l" node="7QODtLvTFnz" resolve="runManuallyAsync" />
14031415
</node>
14041416
</node>
14051417
</node>
@@ -1410,6 +1422,9 @@
14101422
<property role="1dT_AB" value="Runs the solver asynchronously. Error messages are automatically propagated after the run to the ISolvable." />
14111423
</node>
14121424
</node>
1425+
<node concept="TZ5HI" id="4aAsKjbuqXB" role="3nqlJM">
1426+
<node concept="TZ5HA" id="4aAsKjbuqXC" role="3HnX3l" />
1427+
</node>
14131428
</node>
14141429
<node concept="3uibUv" id="3NwcubmnCWl" role="3clF45">
14151430
<ref role="3uigEE" to="5zyv:~CompletableFuture" resolve="CompletableFuture" />
@@ -1420,6 +1435,9 @@
14201435
</node>
14211436
</node>
14221437
</node>
1438+
<node concept="2AHcQZ" id="4aAsKjbuqXD" role="2AJF6D">
1439+
<ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
1440+
</node>
14231441
</node>
14241442
<node concept="13i0hz" id="6pPfAzJBwWe" role="13h7CS">
14251443
<property role="TrG5h" value="makeExecEnv" />

0 commit comments

Comments
 (0)