Skip to content

Commit 142cfb3

Browse files
mgronovermgronover
committed
lazy initialisation for values of an enum #779 
1 parent 4c2bdaf commit 142cfb3

File tree

1 file changed

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

1 file changed

+95
-114
lines changed

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

Lines changed: 95 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -1817,47 +1817,6 @@
18171817
</node>
18181818
<node concept="3clFbJ" id="4$j2$kkgeKR" role="3cqZAp">
18191819
<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>
18611820
<node concept="3clFbF" id="4$j2$kkgO4l" role="3cqZAp">
18621821
<node concept="37vLTI" id="4$j2$kkgOFH" role="3clFbG">
18631822
<node concept="37vLTw" id="4$j2$kkgO4j" role="37vLTJ">
@@ -1878,9 +1837,7 @@
18781837
<node concept="37vLTw" id="4$j2$kkgs1M" role="37wK5m">
18791838
<ref role="3cqZAo" node="4$j2$kkg46R" resolve="literal" />
18801839
</node>
1881-
<node concept="37vLTw" id="4$j2$kkgs1N" role="37wK5m">
1882-
<ref role="3cqZAo" node="4$j2$kkg8Ih" resolve="literalValue" />
1883-
</node>
1840+
<node concept="10Nm6u" id="4C0i8jd_x1B" role="37wK5m" />
18841841
</node>
18851842
</node>
18861843
</node>
@@ -2013,38 +1970,6 @@
20131970
</node>
20141971
<node concept="3clFbJ" id="1yE6u6GpNJ1" role="3cqZAp">
20151972
<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>
20481973
<node concept="3clFbF" id="1yE6u6GpNJi" role="3cqZAp">
20491974
<node concept="37vLTI" id="1yE6u6GpNJj" role="3clFbG">
20501975
<node concept="37vLTw" id="1yE6u6GpNJk" role="37vLTJ">
@@ -2065,9 +1990,7 @@
20651990
<node concept="37vLTw" id="1yE6u6GpNJq" role="37wK5m">
20661991
<ref role="3cqZAo" node="1yE6u6GpNJN" resolve="literal" />
20671992
</node>
2068-
<node concept="37vLTw" id="1yE6u6GpNJr" role="37wK5m">
2069-
<ref role="3cqZAo" node="1yE6u6GpNJ4" resolve="literalValue" />
2070-
</node>
1993+
<node concept="10Nm6u" id="4C0i8jd_yUq" role="37wK5m" />
20711994
</node>
20721995
</node>
20731996
</node>
@@ -2163,35 +2086,6 @@
21632086
</node>
21642087
</node>
21652088
</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>
21952089
<node concept="3clFbF" id="365yA_OObLP" role="3cqZAp">
21962090
<node concept="37vLTI" id="365yA_OOcco" role="3clFbG">
21972091
<node concept="37vLTw" id="365yA_OOcel" role="37vLTx">
@@ -2268,6 +2162,88 @@
22682162
<node concept="3clFb_" id="4$j2$kkaWid" role="jymVt">
22692163
<property role="TrG5h" value="getValue" />
22702164
<node concept="3clFbS" id="4$j2$kkaWie" role="3clF47">
2165+
<node concept="3clFbJ" id="1ghRTGwx9Jc" role="3cqZAp">
2166+
<node concept="3clFbS" id="1ghRTGwx9Je" role="3clFbx">
2167+
<node concept="3SKdUt" id="7v7GtskRUET" role="3cqZAp">
2168+
<node concept="1PaTwC" id="7v7GtskRUEU" role="1aUNEU">
2169+
<node concept="3oM_SD" id="7v7GtskRVHt" role="1PaTwD">
2170+
<property role="3oM_SC" value="lazy" />
2171+
</node>
2172+
<node concept="3oM_SD" id="7v7GtskRVHv" role="1PaTwD">
2173+
<property role="3oM_SC" value="initialisation" />
2174+
</node>
2175+
<node concept="3oM_SD" id="7v7GtskRVHy" role="1PaTwD">
2176+
<property role="3oM_SC" value="is" />
2177+
</node>
2178+
<node concept="3oM_SD" id="7v7GtskRVHA" role="1PaTwD">
2179+
<property role="3oM_SC" value="done" />
2180+
</node>
2181+
<node concept="3oM_SD" id="7v7GtskRVHF" role="1PaTwD">
2182+
<property role="3oM_SC" value="without" />
2183+
</node>
2184+
<node concept="3oM_SD" id="7v7GtskRVHL" role="1PaTwD">
2185+
<property role="3oM_SC" value="trace" />
2186+
</node>
2187+
<node concept="3oM_SD" id="7v7GtskRVHS" role="1PaTwD">
2188+
<property role="3oM_SC" value="and" />
2189+
</node>
2190+
<node concept="3oM_SD" id="7v7GtskRVI0" role="1PaTwD">
2191+
<property role="3oM_SC" value="converage:" />
2192+
</node>
2193+
</node>
2194+
</node>
2195+
<node concept="3clFbF" id="1ghRTGwxOxY" role="3cqZAp">
2196+
<node concept="37vLTI" id="1ghRTGwxQhf" role="3clFbG">
2197+
<node concept="37vLTw" id="1ghRTGwxOxX" role="37vLTJ">
2198+
<ref role="3cqZAo" node="365yA_OSqXk" resolve="literalValue" />
2199+
</node>
2200+
<node concept="2OqwBi" id="1ghRTGwx$um" role="37vLTx">
2201+
<node concept="2OqwBi" id="1ghRTGwx$un" role="2Oq$k0">
2202+
<node concept="37vLTw" id="1ghRTGwx$uo" role="2Oq$k0">
2203+
<ref role="3cqZAo" node="1yE6u6Gpw5X" resolve="context" />
2204+
</node>
2205+
<node concept="liA8E" id="1ghRTGwx$up" role="2OqNvi">
2206+
<ref role="37wK5l" to="2ahs:2ALJBcrni7v" resolve="getRootInterpreter" />
2207+
</node>
2208+
</node>
2209+
<node concept="liA8E" id="1ghRTGwx$uq" role="2OqNvi">
2210+
<ref role="37wK5l" to="2ahs:41ZT0VcTXY$" resolve="evaluate" />
2211+
<node concept="2OqwBi" id="1ghRTGwx$ur" role="37wK5m">
2212+
<node concept="37vLTw" id="1ghRTGwx$us" role="2Oq$k0">
2213+
<ref role="3cqZAo" node="365yA_OOfZ6" resolve="literal" />
2214+
</node>
2215+
<node concept="3TrEf2" id="1ghRTGwx$ut" role="2OqNvi">
2216+
<ref role="3Tt5mk" to="yv47:3Y6fbK15FM4" resolve="value" />
2217+
</node>
2218+
</node>
2219+
<node concept="37vLTw" id="1ghRTGwxCS6" role="37wK5m">
2220+
<ref role="3cqZAo" node="1yE6u6Gpw5X" resolve="context" />
2221+
</node>
2222+
</node>
2223+
</node>
2224+
</node>
2225+
</node>
2226+
</node>
2227+
<node concept="1Wc70l" id="1ghRTGwxqZm" role="3clFbw">
2228+
<node concept="2OqwBi" id="1ghRTGwxxyk" role="3uHU7w">
2229+
<node concept="2OqwBi" id="1ghRTGwxtTg" role="2Oq$k0">
2230+
<node concept="37vLTw" id="1ghRTGwxsC9" role="2Oq$k0">
2231+
<ref role="3cqZAo" node="365yA_OOfZ6" resolve="literal" />
2232+
</node>
2233+
<node concept="3TrEf2" id="1ghRTGwxvLa" role="2OqNvi">
2234+
<ref role="3Tt5mk" to="yv47:3Y6fbK15FM4" resolve="value" />
2235+
</node>
2236+
</node>
2237+
<node concept="3x8VRR" id="1ghRTGwxzfX" role="2OqNvi" />
2238+
</node>
2239+
<node concept="3clFbC" id="1ghRTGwxor0" role="3uHU7B">
2240+
<node concept="37vLTw" id="1ghRTGwxmOZ" role="3uHU7B">
2241+
<ref role="3cqZAo" node="365yA_OSqXk" resolve="literalValue" />
2242+
</node>
2243+
<node concept="10Nm6u" id="1ghRTGwxq1j" role="3uHU7w" />
2244+
</node>
2245+
</node>
2246+
</node>
22712247
<node concept="3cpWs6" id="4$j2$kkaWif" role="3cqZAp">
22722248
<node concept="37vLTw" id="4$j2$kkaWig" role="3cqZAk">
22732249
<ref role="3cqZAo" node="365yA_OSqXk" resolve="literalValue" />
@@ -2639,13 +2615,18 @@
26392615
</node>
26402616
</node>
26412617
</node>
2618+
<node concept="3clFbF" id="1ghRTGwy6E1" role="3cqZAp">
2619+
<node concept="1rXfSq" id="1ghRTGwxSNj" role="3clFbG">
2620+
<ref role="37wK5l" node="365yA_OYolb" resolve="getLiteral" />
2621+
</node>
2622+
</node>
26422623
<node concept="1gVbGN" id="4UpGdVgpwfL" role="3cqZAp">
26432624
<node concept="2ZW3vV" id="4UpGdVgp_vM" role="1gVkn0">
26442625
<node concept="3uibUv" id="4UpGdVgpBUN" role="2ZW6by">
26452626
<ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
26462627
</node>
2647-
<node concept="37vLTw" id="4UpGdVgpxyA" role="2ZW6bz">
2648-
<ref role="3cqZAo" node="365yA_OSqXk" resolve="literalValue" />
2628+
<node concept="1rXfSq" id="1ghRTGwydwu" role="2ZW6bz">
2629+
<ref role="37wK5l" node="4$j2$kkaWid" resolve="getValue" />
26492630
</node>
26502631
</node>
26512632
</node>
@@ -2655,8 +2636,8 @@
26552636
<node concept="3uibUv" id="4UpGdVgpnZn" role="0kSFW">
26562637
<ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
26572638
</node>
2658-
<node concept="37vLTw" id="wlV$3kuax9" role="0kSFX">
2659-
<ref role="3cqZAo" node="365yA_OSqXk" resolve="literalValue" />
2639+
<node concept="1rXfSq" id="7v7GtskRYJ0" role="0kSFX">
2640+
<ref role="37wK5l" node="4$j2$kkaWid" resolve="getValue" />
26602641
</node>
26612642
</node>
26622643
<node concept="liA8E" id="wlV$3kuaxa" role="2OqNvi">
@@ -2669,8 +2650,8 @@
26692650
<node concept="37vLTw" id="wlV$3kuaxe" role="2Oq$k0">
26702651
<ref role="3cqZAo" node="365yA_OO6AO" resolve="enumLiteral" />
26712652
</node>
2672-
<node concept="2OwXpG" id="wlV$3kuaxf" role="2OqNvi">
2673-
<ref role="2Oxat5" node="365yA_OSqXk" resolve="literalValue" />
2653+
<node concept="liA8E" id="1ghRTGwxWWv" role="2OqNvi">
2654+
<ref role="37wK5l" node="4$j2$kkaWid" resolve="getValue" />
26742655
</node>
26752656
</node>
26762657
</node>

0 commit comments

Comments
 (0)