Skip to content

Commit 7b94c89

Browse files
mgronovermgronover
committed
added enum order tests for types that can be sorted as a value of an enum #750 
1 parent ccfe81d commit 7b94c89

File tree

3 files changed

+613
-64
lines changed
  • code/languages/org.iets3.opensource

3 files changed

+613
-64
lines changed

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

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -10929,6 +10929,67 @@
1092910929
<property role="TrG5h" value="OuterClass" />
1093010930
<node concept="Qs71p" id="1li4vsEDum2" role="jymVt">
1093110931
<property role="TrG5h" value="EnumDeclName" />
10932+
<node concept="3Tm1VV" id="1li4vsEDu66" role="1B3o_S" />
10933+
<node concept="raruj" id="1li4vsEDuH8" role="lGtFl">
10934+
<ref role="2sdACS" node="4Qs0nZjcNso" resolve="EnumClass" />
10935+
</node>
10936+
<node concept="QsSxf" id="1li4vsEDuIF" role="Qtgdg">
10937+
<property role="TrG5h" value="literal" />
10938+
<ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
10939+
<node concept="2b32R4" id="1li4vsEDuN3" role="lGtFl">
10940+
<node concept="3JmXsc" id="1li4vsEDuN4" role="2P8S$">
10941+
<node concept="3clFbS" id="1li4vsEDuN5" role="2VODD2">
10942+
<node concept="3clFbF" id="1li4vsEDuRs" role="3cqZAp">
10943+
<node concept="2OqwBi" id="1li4vsEDvg5" role="3clFbG">
10944+
<node concept="30H73N" id="1li4vsEDuRr" role="2Oq$k0" />
10945+
<node concept="3Tsc0h" id="1li4vsEDwpX" role="2OqNvi">
10946+
<ref role="3TtcxE" to="yv47:67Y8mp$DMVO" resolve="literals" />
10947+
</node>
10948+
</node>
10949+
</node>
10950+
</node>
10951+
</node>
10952+
</node>
10953+
</node>
10954+
<node concept="17Uvod" id="1li4vsEEmY0" role="lGtFl">
10955+
<property role="2qtEX9" value="name" />
10956+
<property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
10957+
<node concept="3zFVjK" id="1li4vsEEmY1" role="3zH0cK">
10958+
<node concept="3clFbS" id="1li4vsEEmY2" role="2VODD2">
10959+
<node concept="3clFbF" id="1li4vsEEnnJ" role="3cqZAp">
10960+
<node concept="2OqwBi" id="1li4vsEEnIz" role="3clFbG">
10961+
<node concept="30H73N" id="1li4vsEEnnI" role="2Oq$k0" />
10962+
<node concept="3TrcHB" id="1li4vsEEp2Q" role="2OqNvi">
10963+
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
10964+
</node>
10965+
</node>
10966+
</node>
10967+
</node>
10968+
</node>
10969+
</node>
10970+
<node concept="3uibUv" id="2FUenxLwJZ5" role="EKbjA">
10971+
<ref role="3uigEE" to="33ny:~Comparator" resolve="Comparator" />
10972+
<node concept="3uibUv" id="2FUenxLwUgw" role="11_B2D">
10973+
<ref role="3uigEE" node="1li4vsEDum2" resolve="EnumDeclName" />
10974+
<node concept="1ZhdrF" id="2FUenxLwUGg" role="lGtFl">
10975+
<property role="2qtEX8" value="classifier" />
10976+
<property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107535904670/1107535924139" />
10977+
<node concept="3$xsQk" id="2FUenxLwUGh" role="3$ytzL">
10978+
<node concept="3clFbS" id="2FUenxLwUGi" role="2VODD2">
10979+
<node concept="3clFbF" id="2FUenxLwUJb" role="3cqZAp">
10980+
<node concept="2OqwBi" id="2FUenxLwUYE" role="3clFbG">
10981+
<node concept="1iwH7S" id="2FUenxLwUJa" role="2Oq$k0" />
10982+
<node concept="1iwH70" id="2FUenxLwVag" role="2OqNvi">
10983+
<ref role="1iwH77" node="4Qs0nZjcNso" resolve="EnumClass" />
10984+
<node concept="30H73N" id="2FUenxLwVoA" role="1iwH7V" />
10985+
</node>
10986+
</node>
10987+
</node>
10988+
</node>
10989+
</node>
10990+
</node>
10991+
</node>
10992+
</node>
1093210993
<node concept="3clFb_" id="1sKh73rdYSW" role="jymVt">
1093310994
<property role="TrG5h" value="compare" />
1093410995
<node concept="3clFbS" id="1sKh73rdYSY" role="3clF47">
@@ -11234,67 +11295,6 @@
1123411295
<node concept="3Tm1VV" id="1yE6u6GvBeA" role="1B3o_S" />
1123511296
<node concept="10Oyi0" id="1yE6u6GvCg9" role="3clF45" />
1123611297
</node>
11237-
<node concept="3Tm1VV" id="1li4vsEDu66" role="1B3o_S" />
11238-
<node concept="raruj" id="1li4vsEDuH8" role="lGtFl">
11239-
<ref role="2sdACS" node="4Qs0nZjcNso" resolve="EnumClass" />
11240-
</node>
11241-
<node concept="QsSxf" id="1li4vsEDuIF" role="Qtgdg">
11242-
<property role="TrG5h" value="literal" />
11243-
<ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
11244-
<node concept="2b32R4" id="1li4vsEDuN3" role="lGtFl">
11245-
<node concept="3JmXsc" id="1li4vsEDuN4" role="2P8S$">
11246-
<node concept="3clFbS" id="1li4vsEDuN5" role="2VODD2">
11247-
<node concept="3clFbF" id="1li4vsEDuRs" role="3cqZAp">
11248-
<node concept="2OqwBi" id="1li4vsEDvg5" role="3clFbG">
11249-
<node concept="30H73N" id="1li4vsEDuRr" role="2Oq$k0" />
11250-
<node concept="3Tsc0h" id="1li4vsEDwpX" role="2OqNvi">
11251-
<ref role="3TtcxE" to="yv47:67Y8mp$DMVO" resolve="literals" />
11252-
</node>
11253-
</node>
11254-
</node>
11255-
</node>
11256-
</node>
11257-
</node>
11258-
</node>
11259-
<node concept="17Uvod" id="1li4vsEEmY0" role="lGtFl">
11260-
<property role="2qtEX9" value="name" />
11261-
<property role="P4ACc" value="ceab5195-25ea-4f22-9b92-103b95ca8c0c/1169194658468/1169194664001" />
11262-
<node concept="3zFVjK" id="1li4vsEEmY1" role="3zH0cK">
11263-
<node concept="3clFbS" id="1li4vsEEmY2" role="2VODD2">
11264-
<node concept="3clFbF" id="1li4vsEEnnJ" role="3cqZAp">
11265-
<node concept="2OqwBi" id="1li4vsEEnIz" role="3clFbG">
11266-
<node concept="30H73N" id="1li4vsEEnnI" role="2Oq$k0" />
11267-
<node concept="3TrcHB" id="1li4vsEEp2Q" role="2OqNvi">
11268-
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
11269-
</node>
11270-
</node>
11271-
</node>
11272-
</node>
11273-
</node>
11274-
</node>
11275-
<node concept="3uibUv" id="2FUenxLwJZ5" role="EKbjA">
11276-
<ref role="3uigEE" to="33ny:~Comparator" resolve="Comparator" />
11277-
<node concept="3uibUv" id="2FUenxLwUgw" role="11_B2D">
11278-
<ref role="3uigEE" node="1li4vsEDum2" resolve="EnumDeclName" />
11279-
<node concept="1ZhdrF" id="2FUenxLwUGg" role="lGtFl">
11280-
<property role="2qtEX8" value="classifier" />
11281-
<property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107535904670/1107535924139" />
11282-
<node concept="3$xsQk" id="2FUenxLwUGh" role="3$ytzL">
11283-
<node concept="3clFbS" id="2FUenxLwUGi" role="2VODD2">
11284-
<node concept="3clFbF" id="2FUenxLwUJb" role="3cqZAp">
11285-
<node concept="2OqwBi" id="2FUenxLwUYE" role="3clFbG">
11286-
<node concept="1iwH7S" id="2FUenxLwUJa" role="2Oq$k0" />
11287-
<node concept="1iwH70" id="2FUenxLwVag" role="2OqNvi">
11288-
<ref role="1iwH77" node="4Qs0nZjcNso" resolve="EnumClass" />
11289-
<node concept="30H73N" id="2FUenxLwVoA" role="1iwH7V" />
11290-
</node>
11291-
</node>
11292-
</node>
11293-
</node>
11294-
</node>
11295-
</node>
11296-
</node>
11297-
</node>
1129811298
</node>
1129911299
<node concept="2tJIrI" id="6ww1tctf529" role="jymVt" />
1130011300
<node concept="2tJIrI" id="1li4vsEDusH" role="jymVt" />

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/plugin.mps‎

Lines changed: 105 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,9 @@
210210
<child id="1163668922816" name="ifTrue" index="3K4E3e" />
211211
<child id="1163668934364" name="ifFalse" index="3K4GZi" />
212212
</concept>
213+
<concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
214+
<child id="8356039341262087992" name="line" index="1aUNEU" />
215+
</concept>
213216
<concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
214217
<concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
215218
<concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
@@ -321,6 +324,14 @@
321324
<child id="8009069486207463329" name="condition" index="3_Xg7y" />
322325
</concept>
323326
</language>
327+
<language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
328+
<concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="nn" index="3oM_SD">
329+
<property id="155656958578482949" name="value" index="3oM_SC" />
330+
</concept>
331+
<concept id="2535923850359271782" name="jetbrains.mps.lang.text.structure.Line" flags="nn" index="1PaTwC">
332+
<child id="2535923850359271783" name="elements" index="1PaTwD" />
333+
</concept>
334+
</language>
324335
<language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
325336
<concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
326337
<child id="1204796294226" name="closure" index="23t8la" />
@@ -2546,10 +2557,102 @@
25462557
<ref role="3gnhBz" to="yv47:6PMVc5H_jO2" resolve="EnumSortByValue" />
25472558
</node>
25482559
<node concept="3clFbS" id="wlV$3ku991" role="1pnPq1">
2560+
<node concept="3SKdUt" id="4UpGdVgpHH8" role="3cqZAp">
2561+
<node concept="1PaTwC" id="4UpGdVgpHH9" role="1aUNEU">
2562+
<node concept="3oM_SD" id="4UpGdVgpIXZ" role="1PaTwD">
2563+
<property role="3oM_SC" value="normally" />
2564+
</node>
2565+
<node concept="3oM_SD" id="4UpGdVgpIY1" role="1PaTwD">
2566+
<property role="3oM_SC" value="it" />
2567+
</node>
2568+
<node concept="3oM_SD" id="4UpGdVgpIY4" role="1PaTwD">
2569+
<property role="3oM_SC" value="is" />
2570+
</node>
2571+
<node concept="3oM_SD" id="4UpGdVgpIY8" role="1PaTwD">
2572+
<property role="3oM_SC" value="ensured" />
2573+
</node>
2574+
<node concept="3oM_SD" id="4UpGdVgpIYd" role="1PaTwD">
2575+
<property role="3oM_SC" value="that" />
2576+
</node>
2577+
<node concept="3oM_SD" id="4UpGdVgpIYj" role="1PaTwD">
2578+
<property role="3oM_SC" value="this" />
2579+
</node>
2580+
<node concept="3oM_SD" id="4UpGdVgpIYq" role="1PaTwD">
2581+
<property role="3oM_SC" value="order" />
2582+
</node>
2583+
<node concept="3oM_SD" id="4UpGdVgpIYy" role="1PaTwD">
2584+
<property role="3oM_SC" value="can" />
2585+
</node>
2586+
<node concept="3oM_SD" id="4UpGdVgpIYF" role="1PaTwD">
2587+
<property role="3oM_SC" value="only" />
2588+
</node>
2589+
<node concept="3oM_SD" id="4UpGdVgpIYP" role="1PaTwD">
2590+
<property role="3oM_SC" value="be" />
2591+
</node>
2592+
<node concept="3oM_SD" id="4UpGdVgpIZ0" role="1PaTwD">
2593+
<property role="3oM_SC" value="assigned" />
2594+
</node>
2595+
<node concept="3oM_SD" id="4UpGdVgpIZc" role="1PaTwD">
2596+
<property role="3oM_SC" value="when" />
2597+
</node>
2598+
<node concept="3oM_SD" id="4UpGdVgpIZp" role="1PaTwD">
2599+
<property role="3oM_SC" value="the" />
2600+
</node>
2601+
<node concept="3oM_SD" id="4UpGdVgpIZB" role="1PaTwD">
2602+
<property role="3oM_SC" value="value" />
2603+
</node>
2604+
<node concept="3oM_SD" id="4UpGdVgpIZQ" role="1PaTwD">
2605+
<property role="3oM_SC" value="is" />
2606+
</node>
2607+
<node concept="3oM_SD" id="4UpGdVgpJ06" role="1PaTwD">
2608+
<property role="3oM_SC" value="an" />
2609+
</node>
2610+
<node concept="3oM_SD" id="4UpGdVgpJ0n" role="1PaTwD">
2611+
<property role="3oM_SC" value="instance" />
2612+
</node>
2613+
<node concept="3oM_SD" id="4UpGdVgpJ0D" role="1PaTwD">
2614+
<property role="3oM_SC" value="of" />
2615+
</node>
2616+
<node concept="3oM_SD" id="4UpGdVgpJ0W" role="1PaTwD">
2617+
<property role="3oM_SC" value="Comparable" />
2618+
</node>
2619+
<node concept="3oM_SD" id="4UpGdVgpJ1g" role="1PaTwD">
2620+
<property role="3oM_SC" value="so" />
2621+
</node>
2622+
<node concept="3oM_SD" id="4UpGdVgpJ1_" role="1PaTwD">
2623+
<property role="3oM_SC" value="this" />
2624+
</node>
2625+
<node concept="3oM_SD" id="4UpGdVgpJ1V" role="1PaTwD">
2626+
<property role="3oM_SC" value="is" />
2627+
</node>
2628+
<node concept="3oM_SD" id="4UpGdVgpJ2i" role="1PaTwD">
2629+
<property role="3oM_SC" value="only" />
2630+
</node>
2631+
<node concept="3oM_SD" id="4UpGdVgpJ2E" role="1PaTwD">
2632+
<property role="3oM_SC" value="to" />
2633+
</node>
2634+
<node concept="3oM_SD" id="4UpGdVgpJ33" role="1PaTwD">
2635+
<property role="3oM_SC" value="feel" />
2636+
</node>
2637+
<node concept="3oM_SD" id="4UpGdVgpJ3t" role="1PaTwD">
2638+
<property role="3oM_SC" value="save" />
2639+
</node>
2640+
</node>
2641+
</node>
2642+
<node concept="1gVbGN" id="4UpGdVgpwfL" role="3cqZAp">
2643+
<node concept="2ZW3vV" id="4UpGdVgp_vM" role="1gVkn0">
2644+
<node concept="3uibUv" id="4UpGdVgpBUN" role="2ZW6by">
2645+
<ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
2646+
</node>
2647+
<node concept="37vLTw" id="4UpGdVgpxyA" role="2ZW6bz">
2648+
<ref role="3cqZAo" node="365yA_OSqXk" resolve="literalValue" />
2649+
</node>
2650+
</node>
2651+
</node>
25492652
<node concept="3cpWs6" id="wlV$3kuax5" role="3cqZAp">
25502653
<node concept="2OqwBi" id="wlV$3kuax6" role="3cqZAk">
2551-
<node concept="0kSF2" id="wlV$3kuax7" role="2Oq$k0">
2552-
<node concept="3uibUv" id="wlV$3kuax8" role="0kSFW">
2654+
<node concept="0kSF2" id="4UpGdVgpnZl" role="2Oq$k0">
2655+
<node concept="3uibUv" id="4UpGdVgpnZn" role="0kSFW">
25532656
<ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
25542657
</node>
25552658
<node concept="37vLTw" id="wlV$3kuax9" role="0kSFX">

0 commit comments

Comments
 (0)