Skip to content

Commit 851c953

Browse files
arimerarimer
authored
Merge pull request #781 from IETS3/bugfix/779-lazy-initialization-for-enum-values
Bugfix/779 lazy initialization for enum values
2 parents 4c2bdaf + fcc475c commit 851c953

File tree

2 files changed

+100
-114
lines changed
  • code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel

2 files changed

+100
-114
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6670,6 +6670,7 @@
66706670
</node>
66716671
<node concept="13i0hz" id="VFjlN5t4Q7" role="13h7CS">
66726672
<property role="TrG5h" value="getDefaultLiteral" />
6673+
<property role="13i0it" value="true" />
66736674
<node concept="3Tm1VV" id="VFjlN5t4Q8" role="1B3o_S" />
66746675
<node concept="3Tqbb2" id="VFjlN5t51N" role="3clF45">
66756676
<ref role="ehGHo" to="yv47:67Y8mp$DMVh" resolve="EnumLiteral" />

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

Lines changed: 99 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<import index="dj6k" ref="r:59d52af6-663b-49dc-8980-30d79b8dffa1(org.iets3.core.expr.simpleTypes.runtime)" />
2525
<import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" />
2626
<import index="2ahs" ref="r:ea6cf71d-29d2-478d-8027-a9f4a4de53c4(com.mbeddr.mpsutil.interpreter.rt)" />
27+
<import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
2728
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
2829
<import index="nu60" ref="r:cfd59c48-ecc8-4b0c-8ae8-6d876c46ebbb(org.iets3.core.expr.toplevel.behavior)" implicit="true" />
2930
<import index="lmd" ref="r:a6074908-e483-4c8e-80b5-5dbf8b24df4c(org.iets3.core.expr.path.structure)" implicit="true" />
@@ -1817,47 +1818,6 @@
18171818
</node>
18181819
<node concept="3clFbJ" id="4$j2$kkgeKR" role="3cqZAp">
18191820
<node concept="3clFbS" id="4$j2$kkgeKT" role="3clFbx">
1820-
<node concept="3cpWs8" id="4$j2$kkg8Ig" role="3cqZAp">
1821-
<node concept="3cpWsn" id="4$j2$kkg8Ih" role="3cpWs9">
1822-
<property role="TrG5h" value="literalValue" />
1823-
<node concept="3uibUv" id="4$j2$kkg8Bb" role="1tU5fm">
1824-
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
1825-
</node>
1826-
<node concept="2OqwBi" id="4$j2$kkg8Ii" role="33vP2m">
1827-
<node concept="2OqwBi" id="4$j2$kkg8Ij" role="2Oq$k0">
1828-
<node concept="37vLTw" id="4$j2$kkg8Ik" role="2Oq$k0">
1829-
<ref role="3cqZAo" node="4$j2$kkg2Qn" resolve="ctx" />
1830-
</node>
1831-
<node concept="liA8E" id="4$j2$kkg8Il" role="2OqNvi">
1832-
<ref role="37wK5l" to="2ahs:2ALJBcrni7v" resolve="getRootInterpreter" />
1833-
</node>
1834-
</node>
1835-
<node concept="liA8E" id="4$j2$kkg8Im" role="2OqNvi">
1836-
<ref role="37wK5l" to="2ahs:2X4$XGmegKw" resolve="evaluate" />
1837-
<node concept="2OqwBi" id="4$j2$kkg8In" role="37wK5m">
1838-
<node concept="37vLTw" id="4$j2$kkg8Io" role="2Oq$k0">
1839-
<ref role="3cqZAo" node="4$j2$kkg46R" resolve="literal" />
1840-
</node>
1841-
<node concept="3TrEf2" id="4$j2$kkg8Ip" role="2OqNvi">
1842-
<ref role="3Tt5mk" to="yv47:3Y6fbK15FM4" resolve="value" />
1843-
</node>
1844-
</node>
1845-
<node concept="37vLTw" id="4$j2$kkg8Iq" role="37wK5m">
1846-
<ref role="3cqZAo" node="4$j2$kkg2Qn" resolve="ctx" />
1847-
</node>
1848-
<node concept="37vLTw" id="4$j2$kkg8Ir" role="37wK5m">
1849-
<ref role="3cqZAo" node="4$j2$kkg4DY" resolve="coverage" />
1850-
</node>
1851-
<node concept="37vLTw" id="4$j2$kkg8Is" role="37wK5m">
1852-
<ref role="3cqZAo" node="4$j2$kkg6Eb" resolve="ct" />
1853-
</node>
1854-
<node concept="3clFbT" id="4$j2$kkg8It" role="37wK5m">
1855-
<property role="3clFbU" value="false" />
1856-
</node>
1857-
</node>
1858-
</node>
1859-
</node>
1860-
</node>
18611821
<node concept="3clFbF" id="4$j2$kkgO4l" role="3cqZAp">
18621822
<node concept="37vLTI" id="4$j2$kkgOFH" role="3clFbG">
18631823
<node concept="37vLTw" id="4$j2$kkgO4j" role="37vLTJ">
@@ -1878,9 +1838,7 @@
18781838
<node concept="37vLTw" id="4$j2$kkgs1M" role="37wK5m">
18791839
<ref role="3cqZAo" node="4$j2$kkg46R" resolve="literal" />
18801840
</node>
1881-
<node concept="37vLTw" id="4$j2$kkgs1N" role="37wK5m">
1882-
<ref role="3cqZAo" node="4$j2$kkg8Ih" resolve="literalValue" />
1883-
</node>
1841+
<node concept="10Nm6u" id="4C0i8jd_x1B" role="37wK5m" />
18841842
</node>
18851843
</node>
18861844
</node>
@@ -2013,38 +1971,6 @@
20131971
</node>
20141972
<node concept="3clFbJ" id="1yE6u6GpNJ1" role="3cqZAp">
20151973
<node concept="3clFbS" id="1yE6u6GpNJ2" role="3clFbx">
2016-
<node concept="3cpWs8" id="1yE6u6GpNJ3" role="3cqZAp">
2017-
<node concept="3cpWsn" id="1yE6u6GpNJ4" role="3cpWs9">
2018-
<property role="TrG5h" value="literalValue" />
2019-
<node concept="3uibUv" id="1yE6u6GpNJ5" role="1tU5fm">
2020-
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
2021-
</node>
2022-
<node concept="2OqwBi" id="1yE6u6GpNJ6" role="33vP2m">
2023-
<node concept="2OqwBi" id="1yE6u6GpNJ7" role="2Oq$k0">
2024-
<node concept="37vLTw" id="1yE6u6GpNJ8" role="2Oq$k0">
2025-
<ref role="3cqZAo" node="1yE6u6GpNJP" resolve="ctx" />
2026-
</node>
2027-
<node concept="liA8E" id="1yE6u6GpNJ9" role="2OqNvi">
2028-
<ref role="37wK5l" to="2ahs:2ALJBcrni7v" resolve="getRootInterpreter" />
2029-
</node>
2030-
</node>
2031-
<node concept="liA8E" id="1yE6u6GpNJa" role="2OqNvi">
2032-
<ref role="37wK5l" to="2ahs:41ZT0VcTXY$" resolve="evaluate" />
2033-
<node concept="2OqwBi" id="1yE6u6GpNJb" role="37wK5m">
2034-
<node concept="37vLTw" id="1yE6u6GpNJc" role="2Oq$k0">
2035-
<ref role="3cqZAo" node="1yE6u6GpNJN" resolve="literal" />
2036-
</node>
2037-
<node concept="3TrEf2" id="1yE6u6GpNJd" role="2OqNvi">
2038-
<ref role="3Tt5mk" to="yv47:3Y6fbK15FM4" resolve="value" />
2039-
</node>
2040-
</node>
2041-
<node concept="37vLTw" id="1yE6u6GpNJe" role="37wK5m">
2042-
<ref role="3cqZAo" node="1yE6u6GpNJP" resolve="ctx" />
2043-
</node>
2044-
</node>
2045-
</node>
2046-
</node>
2047-
</node>
20481974
<node concept="3clFbF" id="1yE6u6GpNJi" role="3cqZAp">
20491975
<node concept="37vLTI" id="1yE6u6GpNJj" role="3clFbG">
20501976
<node concept="37vLTw" id="1yE6u6GpNJk" role="37vLTJ">
@@ -2065,9 +1991,7 @@
20651991
<node concept="37vLTw" id="1yE6u6GpNJq" role="37wK5m">
20661992
<ref role="3cqZAo" node="1yE6u6GpNJN" resolve="literal" />
20671993
</node>
2068-
<node concept="37vLTw" id="1yE6u6GpNJr" role="37wK5m">
2069-
<ref role="3cqZAo" node="1yE6u6GpNJ4" resolve="literalValue" />
2070-
</node>
1994+
<node concept="10Nm6u" id="4C0i8jd_yUq" role="37wK5m" />
20711995
</node>
20721996
</node>
20731997
</node>
@@ -2163,35 +2087,6 @@
21632087
</node>
21642088
</node>
21652089
</node>
2166-
<node concept="1gVbGN" id="4$j2$kk7CKb" role="3cqZAp">
2167-
<node concept="22lmx$" id="4$j2$kk7J8v" role="1gVkn0">
2168-
<node concept="2ZW3vV" id="4$j2$kk7JOK" role="3uHU7w">
2169-
<node concept="3uibUv" id="4$j2$kk7VA4" role="2ZW6by">
2170-
<ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
2171-
</node>
2172-
<node concept="37vLTw" id="4$j2$kk7Js2" role="2ZW6bz">
2173-
<ref role="3cqZAo" node="365yA_OSrzY" resolve="literalValue" />
2174-
</node>
2175-
</node>
2176-
<node concept="3fqX7Q" id="wlV$3ktBO5" role="3uHU7B">
2177-
<node concept="2OqwBi" id="wlV$3ktBO7" role="3fr31v">
2178-
<node concept="2OqwBi" id="wlV$3ktBO8" role="2Oq$k0">
2179-
<node concept="37vLTw" id="wlV$3ktBO9" role="2Oq$k0">
2180-
<ref role="3cqZAo" node="365yA_OObvo" resolve="nodeEnumDeclaration" />
2181-
</node>
2182-
<node concept="3TrEf2" id="wlV$3ktBOa" role="2OqNvi">
2183-
<ref role="3Tt5mk" to="yv47:6PMVc5H_jOd" resolve="order" />
2184-
</node>
2185-
</node>
2186-
<node concept="1mIQ4w" id="wlV$3ktBOb" role="2OqNvi">
2187-
<node concept="chp4Y" id="wlV$3ktBOc" role="cj9EA">
2188-
<ref role="cht4Q" to="yv47:6PMVc5H_jO2" resolve="EnumSortByValue" />
2189-
</node>
2190-
</node>
2191-
</node>
2192-
</node>
2193-
</node>
2194-
</node>
21952090
<node concept="3clFbF" id="365yA_OObLP" role="3cqZAp">
21962091
<node concept="37vLTI" id="365yA_OOcco" role="3clFbG">
21972092
<node concept="37vLTw" id="365yA_OOcel" role="37vLTx">
@@ -2247,6 +2142,9 @@
22472142
<node concept="3uibUv" id="365yA_OSrVM" role="1tU5fm">
22482143
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
22492144
</node>
2145+
<node concept="2AHcQZ" id="3F_jmpTzh2K" role="2AJF6D">
2146+
<ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
2147+
</node>
22502148
</node>
22512149
</node>
22522150
<node concept="2tJIrI" id="365yA_OOciT" role="jymVt" />
@@ -2268,6 +2166,88 @@
22682166
<node concept="3clFb_" id="4$j2$kkaWid" role="jymVt">
22692167
<property role="TrG5h" value="getValue" />
22702168
<node concept="3clFbS" id="4$j2$kkaWie" role="3clF47">
2169+
<node concept="3clFbJ" id="1ghRTGwx9Jc" role="3cqZAp">
2170+
<node concept="3clFbS" id="1ghRTGwx9Je" role="3clFbx">
2171+
<node concept="3SKdUt" id="7v7GtskRUET" role="3cqZAp">
2172+
<node concept="1PaTwC" id="7v7GtskRUEU" role="1aUNEU">
2173+
<node concept="3oM_SD" id="7v7GtskRVHt" role="1PaTwD">
2174+
<property role="3oM_SC" value="lazy" />
2175+
</node>
2176+
<node concept="3oM_SD" id="7v7GtskRVHv" role="1PaTwD">
2177+
<property role="3oM_SC" value="initialisation" />
2178+
</node>
2179+
<node concept="3oM_SD" id="7v7GtskRVHy" role="1PaTwD">
2180+
<property role="3oM_SC" value="is" />
2181+
</node>
2182+
<node concept="3oM_SD" id="7v7GtskRVHA" role="1PaTwD">
2183+
<property role="3oM_SC" value="done" />
2184+
</node>
2185+
<node concept="3oM_SD" id="7v7GtskRVHF" role="1PaTwD">
2186+
<property role="3oM_SC" value="without" />
2187+
</node>
2188+
<node concept="3oM_SD" id="7v7GtskRVHL" role="1PaTwD">
2189+
<property role="3oM_SC" value="trace" />
2190+
</node>
2191+
<node concept="3oM_SD" id="7v7GtskRVHS" role="1PaTwD">
2192+
<property role="3oM_SC" value="and" />
2193+
</node>
2194+
<node concept="3oM_SD" id="7v7GtskRVI0" role="1PaTwD">
2195+
<property role="3oM_SC" value="converage:" />
2196+
</node>
2197+
</node>
2198+
</node>
2199+
<node concept="3clFbF" id="1ghRTGwxOxY" role="3cqZAp">
2200+
<node concept="37vLTI" id="1ghRTGwxQhf" role="3clFbG">
2201+
<node concept="37vLTw" id="1ghRTGwxOxX" role="37vLTJ">
2202+
<ref role="3cqZAo" node="365yA_OSqXk" resolve="literalValue" />
2203+
</node>
2204+
<node concept="2OqwBi" id="1ghRTGwx$um" role="37vLTx">
2205+
<node concept="2OqwBi" id="1ghRTGwx$un" role="2Oq$k0">
2206+
<node concept="37vLTw" id="1ghRTGwx$uo" role="2Oq$k0">
2207+
<ref role="3cqZAo" node="1yE6u6Gpw5X" resolve="context" />
2208+
</node>
2209+
<node concept="liA8E" id="1ghRTGwx$up" role="2OqNvi">
2210+
<ref role="37wK5l" to="2ahs:2ALJBcrni7v" resolve="getRootInterpreter" />
2211+
</node>
2212+
</node>
2213+
<node concept="liA8E" id="1ghRTGwx$uq" role="2OqNvi">
2214+
<ref role="37wK5l" to="2ahs:41ZT0VcTXY$" resolve="evaluate" />
2215+
<node concept="2OqwBi" id="1ghRTGwx$ur" role="37wK5m">
2216+
<node concept="37vLTw" id="1ghRTGwx$us" role="2Oq$k0">
2217+
<ref role="3cqZAo" node="365yA_OOfZ6" resolve="literal" />
2218+
</node>
2219+
<node concept="3TrEf2" id="1ghRTGwx$ut" role="2OqNvi">
2220+
<ref role="3Tt5mk" to="yv47:3Y6fbK15FM4" resolve="value" />
2221+
</node>
2222+
</node>
2223+
<node concept="37vLTw" id="1ghRTGwxCS6" role="37wK5m">
2224+
<ref role="3cqZAo" node="1yE6u6Gpw5X" resolve="context" />
2225+
</node>
2226+
</node>
2227+
</node>
2228+
</node>
2229+
</node>
2230+
</node>
2231+
<node concept="1Wc70l" id="1ghRTGwxqZm" role="3clFbw">
2232+
<node concept="2OqwBi" id="1ghRTGwxxyk" role="3uHU7w">
2233+
<node concept="2OqwBi" id="1ghRTGwxtTg" role="2Oq$k0">
2234+
<node concept="37vLTw" id="1ghRTGwxsC9" role="2Oq$k0">
2235+
<ref role="3cqZAo" node="365yA_OOfZ6" resolve="literal" />
2236+
</node>
2237+
<node concept="3TrEf2" id="1ghRTGwxvLa" role="2OqNvi">
2238+
<ref role="3Tt5mk" to="yv47:3Y6fbK15FM4" resolve="value" />
2239+
</node>
2240+
</node>
2241+
<node concept="3x8VRR" id="1ghRTGwxzfX" role="2OqNvi" />
2242+
</node>
2243+
<node concept="3clFbC" id="1ghRTGwxor0" role="3uHU7B">
2244+
<node concept="37vLTw" id="1ghRTGwxmOZ" role="3uHU7B">
2245+
<ref role="3cqZAo" node="365yA_OSqXk" resolve="literalValue" />
2246+
</node>
2247+
<node concept="10Nm6u" id="1ghRTGwxq1j" role="3uHU7w" />
2248+
</node>
2249+
</node>
2250+
</node>
22712251
<node concept="3cpWs6" id="4$j2$kkaWif" role="3cqZAp">
22722252
<node concept="37vLTw" id="4$j2$kkaWig" role="3cqZAk">
22732253
<ref role="3cqZAo" node="365yA_OSqXk" resolve="literalValue" />
@@ -2639,13 +2619,18 @@
26392619
</node>
26402620
</node>
26412621
</node>
2622+
<node concept="3clFbF" id="1ghRTGwy6E1" role="3cqZAp">
2623+
<node concept="1rXfSq" id="1ghRTGwxSNj" role="3clFbG">
2624+
<ref role="37wK5l" node="365yA_OYolb" resolve="getLiteral" />
2625+
</node>
2626+
</node>
26422627
<node concept="1gVbGN" id="4UpGdVgpwfL" role="3cqZAp">
26432628
<node concept="2ZW3vV" id="4UpGdVgp_vM" role="1gVkn0">
26442629
<node concept="3uibUv" id="4UpGdVgpBUN" role="2ZW6by">
26452630
<ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
26462631
</node>
2647-
<node concept="37vLTw" id="4UpGdVgpxyA" role="2ZW6bz">
2648-
<ref role="3cqZAo" node="365yA_OSqXk" resolve="literalValue" />
2632+
<node concept="1rXfSq" id="1ghRTGwydwu" role="2ZW6bz">
2633+
<ref role="37wK5l" node="4$j2$kkaWid" resolve="getValue" />
26492634
</node>
26502635
</node>
26512636
</node>
@@ -2655,8 +2640,8 @@
26552640
<node concept="3uibUv" id="4UpGdVgpnZn" role="0kSFW">
26562641
<ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
26572642
</node>
2658-
<node concept="37vLTw" id="wlV$3kuax9" role="0kSFX">
2659-
<ref role="3cqZAo" node="365yA_OSqXk" resolve="literalValue" />
2643+
<node concept="1rXfSq" id="7v7GtskRYJ0" role="0kSFX">
2644+
<ref role="37wK5l" node="4$j2$kkaWid" resolve="getValue" />
26602645
</node>
26612646
</node>
26622647
<node concept="liA8E" id="wlV$3kuaxa" role="2OqNvi">
@@ -2669,8 +2654,8 @@
26692654
<node concept="37vLTw" id="wlV$3kuaxe" role="2Oq$k0">
26702655
<ref role="3cqZAo" node="365yA_OO6AO" resolve="enumLiteral" />
26712656
</node>
2672-
<node concept="2OwXpG" id="wlV$3kuaxf" role="2OqNvi">
2673-
<ref role="2Oxat5" node="365yA_OSqXk" resolve="literalValue" />
2657+
<node concept="liA8E" id="1ghRTGwxWWv" role="2OqNvi">
2658+
<ref role="37wK5l" node="4$j2$kkaWid" resolve="getValue" />
26742659
</node>
26752660
</node>
26762661
</node>

0 commit comments

Comments
 (0)