Skip to content

Commit d6dbca2

Browse files
alexanderpannalexanderpann
authored
Merge branch 'master' into bugfix/tupleSuperTypes
2 parents a136a10 + 1b6c487 commit d6dbca2

File tree

6 files changed

+739
-189
lines changed

6 files changed

+739
-189
lines changed

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/behavior.mps‎

Lines changed: 85 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,14 @@
5757
<import index="xfg9" ref="r:ac28053f-2041-47f6-806b-ecfaca05a64a(org.iets3.core.expr.base.runtime.runtime)" />
5858
<import index="pq1l" ref="r:93cd1fe8-b296-405c-a6e6-040c940ccfa1(org.iets3.core.expr.toplevel.plugin)" />
5959
<import index="i8bi" ref="r:c3548bac-30eb-4a2a-937c-0111d5697309(jetbrains.mps.lang.smodel.generator.smodelAdapter)" />
60-
<import index="4k19" ref="49808fad-9d41-4b96-83fa-9231640f6b2b/java:org.hamcrest(JUnit/)" />
60+
<import index="exr9" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor(MPS.Editor/)" />
61+
<import index="kpve" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.message(MPS.Editor/)" />
62+
<import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
6163
<import index="kvq8" ref="r:2e938759-cfd0-47cd-9046-896d85204f59(de.slisson.mps.hacks.editor)" />
6264
<import index="f4zo" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.cells(MPS.Editor/)" />
6365
<import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
64-
<import index="kpve" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.message(MPS.Editor/)" />
65-
<import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
66-
<import index="exr9" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor(MPS.Editor/)" />
66+
<import index="4k19" ref="49808fad-9d41-4b96-83fa-9231640f6b2b/java:org.hamcrest(JUnit/)" />
67+
<import index="jpm3" ref="r:e3e5593b-dfcd-4a2e-b10f-f1ed4a43f093(org.iets3.core.expr.plugin.plugin)" />
6768
<import index="1ctc" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.stream(JDK/)" implicit="true" />
6869
</imports>
6970
<registry>
@@ -486,12 +487,6 @@
486487
<child id="2535923850359271783" name="elements" index="1PaTwD" />
487488
</concept>
488489
</language>
489-
<language id="c3bfea76-7bba-4f0e-b5a2-ff4e7a8d7cf1" name="com.mbeddr.mpsutil.spreferences">
490-
<concept id="5615086488402953540" name="com.mbeddr.mpsutil.spreferences.structure.PreferencesRootExpression" flags="ng" index="9H$SH">
491-
<reference id="5615086488402976569" name="preferencePage" index="9Hxhg" />
492-
<child id="5615086488402986988" name="module" index="9HWM5" />
493-
</concept>
494-
</language>
495490
<language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
496491
<concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
497492
<child id="1204796294226" name="closure" index="23t8la" />
@@ -2411,52 +2406,45 @@
24112406
</node>
24122407
</node>
24132408
<node concept="3clFbH" id="57VdFqPiDih" role="3cqZAp" />
2414-
<node concept="3clFbH" id="57VdFqPiDhq" role="3cqZAp" />
2415-
<node concept="3cpWs8" id="6VjyfUYekA1" role="3cqZAp">
2416-
<node concept="3cpWsn" id="6VjyfUYekA2" role="3cpWs9">
2417-
<property role="TrG5h" value="tec" />
2418-
<node concept="3Tqbb2" id="6VjyfUYek_Z" role="1tU5fm">
2419-
<ref role="ehGHo" to="6yn5:3SkjTN1LMyJ" resolve="TestExecutionConfig" />
2420-
</node>
2421-
<node concept="9H$SH" id="6VjyfUYekA3" role="33vP2m">
2422-
<ref role="9Hxhg" to="w474:3SkjTN1M1kS" resolve="TestExecutionPreferences" />
2423-
<node concept="2OqwBi" id="57VdFqPlqll" role="9HWM5">
2424-
<node concept="liA8E" id="57VdFqPlqzy" role="2OqNvi">
2409+
<node concept="3cpWs8" id="5rUl2R7PPvf" role="3cqZAp">
2410+
<node concept="3cpWsn" id="5rUl2R7PPvg" role="3cpWs9">
2411+
<property role="TrG5h" value="mode" />
2412+
<node concept="3uibUv" id="5rUl2R7PPpe" role="1tU5fm">
2413+
<ref role="3uigEE" to="jpm3:5rUl2R7KDH5" resolve="ExecutionModePreference" />
2414+
</node>
2415+
<node concept="2YIFZM" id="5rUl2R7PPvh" role="33vP2m">
2416+
<ref role="37wK5l" to="jpm3:5rUl2R7POK$" resolve="getExecutionModePreference" />
2417+
<ref role="1Pybhc" to="jpm3:5rUl2R7OncF" resolve="TestExecutionSettings" />
2418+
<node concept="2OqwBi" id="5rUl2R7PPvi" role="37wK5m">
2419+
<node concept="liA8E" id="5rUl2R7PPvj" role="2OqNvi">
24252420
<ref role="37wK5l" to="mhbf:~SModel.getModule()" resolve="getModule" />
24262421
</node>
2427-
<node concept="2JrnkZ" id="57VdFqPlqlq" role="2Oq$k0">
2428-
<node concept="37vLTw" id="57VdFqPkSll" role="2JrQYb">
2422+
<node concept="2JrnkZ" id="5rUl2R7PPvk" role="2Oq$k0">
2423+
<node concept="37vLTw" id="5rUl2R7PPvl" role="2JrQYb">
24292424
<ref role="3cqZAo" node="57VdFqPiDib" resolve="m" />
24302425
</node>
24312426
</node>
24322427
</node>
24332428
</node>
24342429
</node>
24352430
</node>
2436-
<node concept="3clFbH" id="UYp_yFoiq2" role="3cqZAp" />
2437-
<node concept="3clFbJ" id="6VjyfUYehd4" role="3cqZAp">
2438-
<node concept="2OqwBi" id="6VjyfUYelqw" role="3clFbw">
2439-
<node concept="2OqwBi" id="6VjyfUYekMg" role="2Oq$k0">
2440-
<node concept="37vLTw" id="6VjyfUYekBO" role="2Oq$k0">
2441-
<ref role="3cqZAo" node="6VjyfUYekA2" resolve="tec" />
2442-
</node>
2443-
<node concept="3TrEf2" id="6VjyfUYel5T" role="2OqNvi">
2444-
<ref role="3Tt5mk" to="6yn5:3SkjTN1LTtQ" resolve="executionMode" />
2445-
</node>
2446-
</node>
2447-
<node concept="1mIQ4w" id="6VjyfUYelHv" role="2OqNvi">
2448-
<node concept="chp4Y" id="6VjyfUYelJJ" role="cj9EA">
2449-
<ref role="cht4Q" to="6yn5:3SkjTN1LTuE" resolve="GeneratorExecutionMode" />
2450-
</node>
2451-
</node>
2452-
</node>
2453-
<node concept="3clFbS" id="6VjyfUYehd6" role="3clFbx">
2431+
<node concept="3clFbJ" id="5rUl2R7PPVT" role="3cqZAp">
2432+
<node concept="3clFbS" id="5rUl2R7PPVV" role="3clFbx">
24542433
<node concept="3cpWs6" id="6VjyfUYelNW" role="3cqZAp">
24552434
<node concept="BsUDl" id="6VjyfUYelOs" role="3cqZAk">
24562435
<ref role="37wK5l" node="6VjyfUYe5Ll" resolve="getSimpleClassNameForGenerator" />
24572436
</node>
24582437
</node>
24592438
</node>
2439+
<node concept="17R0WA" id="5rUl2R7PRxG" role="3clFbw">
2440+
<node concept="Rm8GO" id="5rUl2R7PRDG" role="3uHU7w">
2441+
<ref role="Rm8GQ" to="jpm3:5rUl2R7KE3p" resolve="GENERATOR" />
2442+
<ref role="1Px2BO" to="jpm3:5rUl2R7KDH5" resolve="ExecutionModePreference" />
2443+
</node>
2444+
<node concept="37vLTw" id="5rUl2R7PPZ4" role="3uHU7B">
2445+
<ref role="3cqZAo" node="5rUl2R7PPvg" resolve="mode" />
2446+
</node>
2447+
</node>
24602448
</node>
24612449
<node concept="3cpWs6" id="6VjyfUYeqjT" role="3cqZAp">
24622450
<node concept="BsUDl" id="2HxWS56XtaN" role="3cqZAk">
@@ -2578,100 +2566,86 @@
25782566
</node>
25792567
</node>
25802568
</node>
2581-
<node concept="3clFbH" id="57VdFqPkLxS" role="3cqZAp" />
2582-
<node concept="3cpWs8" id="ljKHDcIbRS" role="3cqZAp">
2583-
<node concept="3cpWsn" id="ljKHDcIbRT" role="3cpWs9">
2584-
<property role="TrG5h" value="tec" />
2585-
<node concept="3Tqbb2" id="ljKHDcIbRU" role="1tU5fm">
2586-
<ref role="ehGHo" to="6yn5:3SkjTN1LMyJ" resolve="TestExecutionConfig" />
2587-
</node>
2588-
<node concept="9H$SH" id="ljKHDcIbRV" role="33vP2m">
2589-
<ref role="9Hxhg" to="w474:3SkjTN1M1kS" resolve="TestExecutionPreferences" />
2590-
<node concept="2OqwBi" id="57VdFqPlujP" role="9HWM5">
2591-
<node concept="liA8E" id="57VdFqPlx1b" role="2OqNvi">
2569+
<node concept="3clFbH" id="5rUl2R7PSuh" role="3cqZAp" />
2570+
<node concept="3cpWs8" id="5rUl2R7PSh1" role="3cqZAp">
2571+
<node concept="3cpWsn" id="5rUl2R7PSh2" role="3cpWs9">
2572+
<property role="TrG5h" value="mode" />
2573+
<node concept="3uibUv" id="5rUl2R7PSh3" role="1tU5fm">
2574+
<ref role="3uigEE" to="jpm3:5rUl2R7KDH5" resolve="ExecutionModePreference" />
2575+
</node>
2576+
<node concept="2YIFZM" id="5rUl2R7PSh4" role="33vP2m">
2577+
<ref role="1Pybhc" to="jpm3:5rUl2R7OncF" resolve="TestExecutionSettings" />
2578+
<ref role="37wK5l" to="jpm3:5rUl2R7POK$" resolve="getExecutionModePreference" />
2579+
<node concept="2OqwBi" id="5rUl2R7PSh5" role="37wK5m">
2580+
<node concept="liA8E" id="5rUl2R7PSh6" role="2OqNvi">
25922581
<ref role="37wK5l" to="mhbf:~SModel.getModule()" resolve="getModule" />
25932582
</node>
2594-
<node concept="2JrnkZ" id="57VdFqPlujU" role="2Oq$k0">
2595-
<node concept="37vLTw" id="57VdFqPkPAU" role="2JrQYb">
2583+
<node concept="2JrnkZ" id="5rUl2R7PSh7" role="2Oq$k0">
2584+
<node concept="37vLTw" id="5rUl2R7PSh8" role="2JrQYb">
25962585
<ref role="3cqZAo" node="57VdFqPfgDL" resolve="m" />
25972586
</node>
25982587
</node>
25992588
</node>
26002589
</node>
26012590
</node>
26022591
</node>
2603-
<node concept="3clFbJ" id="ljKHDcIbRX" role="3cqZAp">
2604-
<node concept="3clFbS" id="ljKHDcIbRY" role="3clFbx">
2605-
<node concept="3clFbJ" id="ljKHDcIbRZ" role="3cqZAp">
2606-
<node concept="2OqwBi" id="ljKHDcIbS0" role="3clFbw">
2607-
<node concept="2OqwBi" id="ljKHDcIbS1" role="2Oq$k0">
2608-
<node concept="37vLTw" id="ljKHDcIbS2" role="2Oq$k0">
2609-
<ref role="3cqZAo" node="ljKHDcIbRT" resolve="tec" />
2610-
</node>
2611-
<node concept="3TrEf2" id="ljKHDcIbS3" role="2OqNvi">
2612-
<ref role="3Tt5mk" to="6yn5:3SkjTN1LTtQ" resolve="executionMode" />
2592+
<node concept="3clFbH" id="57VdFqPkLxS" role="3cqZAp" />
2593+
<node concept="3clFbJ" id="ljKHDcIbRZ" role="3cqZAp">
2594+
<node concept="3clFbS" id="ljKHDcIbS6" role="3clFbx">
2595+
<node concept="3clFbJ" id="ljKHDcIfN6" role="3cqZAp">
2596+
<node concept="3clFbS" id="ljKHDcIfN7" role="3clFbx">
2597+
<node concept="3cpWs6" id="ljKHDcIfN8" role="3cqZAp">
2598+
<node concept="3cpWs3" id="ljKHDcIfN9" role="3cqZAk">
2599+
<node concept="BsUDl" id="ljKHDcIh4e" role="3uHU7w">
2600+
<ref role="37wK5l" node="6VjyfUYe5Ll" resolve="getSimpleClassNameForGenerator" />
2601+
</node>
2602+
<node concept="Xl_RD" id="ljKHDcIfNb" role="3uHU7B">
2603+
<property role="Xl_RC" value="[null model ]" />
2604+
</node>
26132605
</node>
26142606
</node>
2615-
<node concept="1mIQ4w" id="ljKHDcIbS4" role="2OqNvi">
2616-
<node concept="chp4Y" id="ljKHDcIbS5" role="cj9EA">
2617-
<ref role="cht4Q" to="6yn5:3SkjTN1LTuE" resolve="GeneratorExecutionMode" />
2618-
</node>
2607+
</node>
2608+
<node concept="3clFbC" id="ljKHDcIfNc" role="3clFbw">
2609+
<node concept="10Nm6u" id="ljKHDcIfNd" role="3uHU7w" />
2610+
<node concept="37vLTw" id="ljKHDcIfNe" role="3uHU7B">
2611+
<ref role="3cqZAo" node="2_tP28kjNF9" resolve="mo" />
26192612
</node>
26202613
</node>
2621-
<node concept="3clFbS" id="ljKHDcIbS6" role="3clFbx">
2622-
<node concept="3clFbJ" id="ljKHDcIfN6" role="3cqZAp">
2623-
<node concept="3clFbS" id="ljKHDcIfN7" role="3clFbx">
2624-
<node concept="3cpWs6" id="ljKHDcIfN8" role="3cqZAp">
2625-
<node concept="3cpWs3" id="ljKHDcIfN9" role="3cqZAk">
2626-
<node concept="BsUDl" id="ljKHDcIh4e" role="3uHU7w">
2627-
<ref role="37wK5l" node="6VjyfUYe5Ll" resolve="getSimpleClassNameForGenerator" />
2628-
</node>
2629-
<node concept="Xl_RD" id="ljKHDcIfNb" role="3uHU7B">
2630-
<property role="Xl_RC" value="[null model ]" />
2631-
</node>
2632-
</node>
2633-
</node>
2634-
</node>
2635-
<node concept="3clFbC" id="ljKHDcIfNc" role="3clFbw">
2636-
<node concept="10Nm6u" id="ljKHDcIfNd" role="3uHU7w" />
2637-
<node concept="37vLTw" id="ljKHDcIfNe" role="3uHU7B">
2638-
<ref role="3cqZAo" node="2_tP28kjNF9" resolve="mo" />
2639-
</node>
2614+
</node>
2615+
<node concept="3cpWs6" id="ljKHDcIgfm" role="3cqZAp">
2616+
<node concept="3cpWs3" id="ljKHDcIgfo" role="3cqZAk">
2617+
<node concept="3cpWs3" id="ljKHDcIgfp" role="3uHU7B">
2618+
<node concept="Xl_RD" id="ljKHDcIgfq" role="3uHU7w">
2619+
<property role="Xl_RC" value="." />
26402620
</node>
2641-
</node>
2642-
<node concept="3cpWs6" id="ljKHDcIgfm" role="3cqZAp">
2643-
<node concept="3cpWs3" id="ljKHDcIgfo" role="3cqZAk">
2644-
<node concept="3cpWs3" id="ljKHDcIgfp" role="3uHU7B">
2645-
<node concept="Xl_RD" id="ljKHDcIgfq" role="3uHU7w">
2646-
<property role="Xl_RC" value="." />
2621+
<node concept="2OqwBi" id="ljKHDcIgfr" role="3uHU7B">
2622+
<node concept="2OqwBi" id="ljKHDcIgfs" role="2Oq$k0">
2623+
<node concept="37vLTw" id="ljKHDcIgft" role="2Oq$k0">
2624+
<ref role="3cqZAo" node="2_tP28kjNF9" resolve="mo" />
26472625
</node>
2648-
<node concept="2OqwBi" id="ljKHDcIgfr" role="3uHU7B">
2649-
<node concept="2OqwBi" id="ljKHDcIgfs" role="2Oq$k0">
2650-
<node concept="37vLTw" id="ljKHDcIgft" role="2Oq$k0">
2651-
<ref role="3cqZAo" node="2_tP28kjNF9" resolve="mo" />
2652-
</node>
2653-
<node concept="liA8E" id="ljKHDcIgfu" role="2OqNvi">
2654-
<ref role="37wK5l" to="mhbf:~SModel.getName()" resolve="getName" />
2655-
</node>
2656-
</node>
2657-
<node concept="liA8E" id="ljKHDcIgfv" role="2OqNvi">
2658-
<ref role="37wK5l" to="mhbf:~SModelName.getLongName()" resolve="getLongName" />
2659-
</node>
2626+
<node concept="liA8E" id="ljKHDcIgfu" role="2OqNvi">
2627+
<ref role="37wK5l" to="mhbf:~SModel.getName()" resolve="getName" />
26602628
</node>
26612629
</node>
2662-
<node concept="BsUDl" id="ljKHDcIhkR" role="3uHU7w">
2663-
<ref role="37wK5l" node="6VjyfUYe5Ll" resolve="getSimpleClassNameForGenerator" />
2630+
<node concept="liA8E" id="ljKHDcIgfv" role="2OqNvi">
2631+
<ref role="37wK5l" to="mhbf:~SModelName.getLongName()" resolve="getLongName" />
26642632
</node>
26652633
</node>
26662634
</node>
2635+
<node concept="BsUDl" id="ljKHDcIhkR" role="3uHU7w">
2636+
<ref role="37wK5l" node="6VjyfUYe5Ll" resolve="getSimpleClassNameForGenerator" />
2637+
</node>
26672638
</node>
26682639
</node>
26692640
</node>
2670-
<node concept="2OqwBi" id="ljKHDcIbSx" role="3clFbw">
2671-
<node concept="37vLTw" id="ljKHDcIbSy" role="2Oq$k0">
2672-
<ref role="3cqZAo" node="ljKHDcIbRT" resolve="tec" />
2641+
<node concept="17R0WA" id="5rUl2R7PUwA" role="3clFbw">
2642+
<node concept="Rm8GO" id="5rUl2R7PUWI" role="3uHU7w">
2643+
<ref role="Rm8GQ" to="jpm3:5rUl2R7KE3p" resolve="GENERATOR" />
2644+
<ref role="1Px2BO" to="jpm3:5rUl2R7KDH5" resolve="ExecutionModePreference" />
2645+
</node>
2646+
<node concept="37vLTw" id="5rUl2R7PTiF" role="3uHU7B">
2647+
<ref role="3cqZAo" node="5rUl2R7PSh2" resolve="mode" />
26732648
</node>
2674-
<node concept="3x8VRR" id="ljKHDcIbSz" role="2OqNvi" />
26752649
</node>
26762650
</node>
26772651
<node concept="3clFbJ" id="2_tP28kjNSM" role="3cqZAp">

0 commit comments

Comments
 (0)