Skip to content

Commit

Permalink
Merge pull request #781 from IETS3/bugfix/779-lazy-initialization-for…
Browse files Browse the repository at this point in the history 
…-enum-values

Bugfix/779 lazy initialization for enum values
  • Loading branch information
@arimer
arimer authored Feb 22, 2024
2 parents 4c2bdaf + fcc475c commit 851c953
Show file tree
Hide file tree
Showing 2 changed files with 100 additions and 114 deletions.
1 change: 1 addition & 0 deletions ...e/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/behavior.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6670,6 +6670,7 @@
</node>
<node concept="13i0hz" id="VFjlN5t4Q7" role="13h7CS">
<property role="TrG5h" value="getDefaultLiteral" />
<property role="13i0it" value="true" />
<node concept="3Tm1VV" id="VFjlN5t4Q8" role="1B3o_S" />
<node concept="3Tqbb2" id="VFjlN5t51N" role="3clF45">
<ref role="ehGHo" to="yv47:67Y8mp$DMVh" resolve="EnumLiteral" />
Expand Down
213 changes: 99 additions & 114 deletions ...rce/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/plugin.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<import index="dj6k" ref="r:59d52af6-663b-49dc-8980-30d79b8dffa1(org.iets3.core.expr.simpleTypes.runtime)" />
<import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" />
<import index="2ahs" ref="r:ea6cf71d-29d2-478d-8027-a9f4a4de53c4(com.mbeddr.mpsutil.interpreter.rt)" />
<import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
<import index="nu60" ref="r:cfd59c48-ecc8-4b0c-8ae8-6d876c46ebbb(org.iets3.core.expr.toplevel.behavior)" implicit="true" />
<import index="lmd" ref="r:a6074908-e483-4c8e-80b5-5dbf8b24df4c(org.iets3.core.expr.path.structure)" implicit="true" />
Expand Down Expand Up @@ -1817,47 +1818,6 @@
</node>
<node concept="3clFbJ" id="4$j2$kkgeKR" role="3cqZAp">
<node concept="3clFbS" id="4$j2$kkgeKT" role="3clFbx">
<node concept="3cpWs8" id="4$j2$kkg8Ig" role="3cqZAp">
<node concept="3cpWsn" id="4$j2$kkg8Ih" role="3cpWs9">
<property role="TrG5h" value="literalValue" />
<node concept="3uibUv" id="4$j2$kkg8Bb" role="1tU5fm">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
<node concept="2OqwBi" id="4$j2$kkg8Ii" role="33vP2m">
<node concept="2OqwBi" id="4$j2$kkg8Ij" role="2Oq$k0">
<node concept="37vLTw" id="4$j2$kkg8Ik" role="2Oq$k0">
<ref role="3cqZAo" node="4$j2$kkg2Qn" resolve="ctx" />
</node>
<node concept="liA8E" id="4$j2$kkg8Il" role="2OqNvi">
<ref role="37wK5l" to="2ahs:2ALJBcrni7v" resolve="getRootInterpreter" />
</node>
</node>
<node concept="liA8E" id="4$j2$kkg8Im" role="2OqNvi">
<ref role="37wK5l" to="2ahs:2X4$XGmegKw" resolve="evaluate" />
<node concept="2OqwBi" id="4$j2$kkg8In" role="37wK5m">
<node concept="37vLTw" id="4$j2$kkg8Io" role="2Oq$k0">
<ref role="3cqZAo" node="4$j2$kkg46R" resolve="literal" />
</node>
<node concept="3TrEf2" id="4$j2$kkg8Ip" role="2OqNvi">
<ref role="3Tt5mk" to="yv47:3Y6fbK15FM4" resolve="value" />
</node>
</node>
<node concept="37vLTw" id="4$j2$kkg8Iq" role="37wK5m">
<ref role="3cqZAo" node="4$j2$kkg2Qn" resolve="ctx" />
</node>
<node concept="37vLTw" id="4$j2$kkg8Ir" role="37wK5m">
<ref role="3cqZAo" node="4$j2$kkg4DY" resolve="coverage" />
</node>
<node concept="37vLTw" id="4$j2$kkg8Is" role="37wK5m">
<ref role="3cqZAo" node="4$j2$kkg6Eb" resolve="ct" />
</node>
<node concept="3clFbT" id="4$j2$kkg8It" role="37wK5m">
<property role="3clFbU" value="false" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="4$j2$kkgO4l" role="3cqZAp">
<node concept="37vLTI" id="4$j2$kkgOFH" role="3clFbG">
<node concept="37vLTw" id="4$j2$kkgO4j" role="37vLTJ">
Expand All @@ -1878,9 +1838,7 @@
<node concept="37vLTw" id="4$j2$kkgs1M" role="37wK5m">
<ref role="3cqZAo" node="4$j2$kkg46R" resolve="literal" />
</node>
<node concept="37vLTw" id="4$j2$kkgs1N" role="37wK5m">
<ref role="3cqZAo" node="4$j2$kkg8Ih" resolve="literalValue" />
</node>
<node concept="10Nm6u" id="4C0i8jd_x1B" role="37wK5m" />
</node>
</node>
</node>
Expand Down Expand Up @@ -2013,38 +1971,6 @@
</node>
<node concept="3clFbJ" id="1yE6u6GpNJ1" role="3cqZAp">
<node concept="3clFbS" id="1yE6u6GpNJ2" role="3clFbx">
<node concept="3cpWs8" id="1yE6u6GpNJ3" role="3cqZAp">
<node concept="3cpWsn" id="1yE6u6GpNJ4" role="3cpWs9">
<property role="TrG5h" value="literalValue" />
<node concept="3uibUv" id="1yE6u6GpNJ5" role="1tU5fm">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
<node concept="2OqwBi" id="1yE6u6GpNJ6" role="33vP2m">
<node concept="2OqwBi" id="1yE6u6GpNJ7" role="2Oq$k0">
<node concept="37vLTw" id="1yE6u6GpNJ8" role="2Oq$k0">
<ref role="3cqZAo" node="1yE6u6GpNJP" resolve="ctx" />
</node>
<node concept="liA8E" id="1yE6u6GpNJ9" role="2OqNvi">
<ref role="37wK5l" to="2ahs:2ALJBcrni7v" resolve="getRootInterpreter" />
</node>
</node>
<node concept="liA8E" id="1yE6u6GpNJa" role="2OqNvi">
<ref role="37wK5l" to="2ahs:41ZT0VcTXY$" resolve="evaluate" />
<node concept="2OqwBi" id="1yE6u6GpNJb" role="37wK5m">
<node concept="37vLTw" id="1yE6u6GpNJc" role="2Oq$k0">
<ref role="3cqZAo" node="1yE6u6GpNJN" resolve="literal" />
</node>
<node concept="3TrEf2" id="1yE6u6GpNJd" role="2OqNvi">
<ref role="3Tt5mk" to="yv47:3Y6fbK15FM4" resolve="value" />
</node>
</node>
<node concept="37vLTw" id="1yE6u6GpNJe" role="37wK5m">
<ref role="3cqZAo" node="1yE6u6GpNJP" resolve="ctx" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="1yE6u6GpNJi" role="3cqZAp">
<node concept="37vLTI" id="1yE6u6GpNJj" role="3clFbG">
<node concept="37vLTw" id="1yE6u6GpNJk" role="37vLTJ">
Expand All @@ -2065,9 +1991,7 @@
<node concept="37vLTw" id="1yE6u6GpNJq" role="37wK5m">
<ref role="3cqZAo" node="1yE6u6GpNJN" resolve="literal" />
</node>
<node concept="37vLTw" id="1yE6u6GpNJr" role="37wK5m">
<ref role="3cqZAo" node="1yE6u6GpNJ4" resolve="literalValue" />
</node>
<node concept="10Nm6u" id="4C0i8jd_yUq" role="37wK5m" />
</node>
</node>
</node>
Expand Down Expand Up @@ -2163,35 +2087,6 @@
</node>
</node>
</node>
<node concept="1gVbGN" id="4$j2$kk7CKb" role="3cqZAp">
<node concept="22lmx$" id="4$j2$kk7J8v" role="1gVkn0">
<node concept="2ZW3vV" id="4$j2$kk7JOK" role="3uHU7w">
<node concept="3uibUv" id="4$j2$kk7VA4" role="2ZW6by">
<ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
</node>
<node concept="37vLTw" id="4$j2$kk7Js2" role="2ZW6bz">
<ref role="3cqZAo" node="365yA_OSrzY" resolve="literalValue" />
</node>
</node>
<node concept="3fqX7Q" id="wlV$3ktBO5" role="3uHU7B">
<node concept="2OqwBi" id="wlV$3ktBO7" role="3fr31v">
<node concept="2OqwBi" id="wlV$3ktBO8" role="2Oq$k0">
<node concept="37vLTw" id="wlV$3ktBO9" role="2Oq$k0">
<ref role="3cqZAo" node="365yA_OObvo" resolve="nodeEnumDeclaration" />
</node>
<node concept="3TrEf2" id="wlV$3ktBOa" role="2OqNvi">
<ref role="3Tt5mk" to="yv47:6PMVc5H_jOd" resolve="order" />
</node>
</node>
<node concept="1mIQ4w" id="wlV$3ktBOb" role="2OqNvi">
<node concept="chp4Y" id="wlV$3ktBOc" role="cj9EA">
<ref role="cht4Q" to="yv47:6PMVc5H_jO2" resolve="EnumSortByValue" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="365yA_OObLP" role="3cqZAp">
<node concept="37vLTI" id="365yA_OOcco" role="3clFbG">
<node concept="37vLTw" id="365yA_OOcel" role="37vLTx">
Expand Down Expand Up @@ -2247,6 +2142,9 @@
<node concept="3uibUv" id="365yA_OSrVM" role="1tU5fm">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
<node concept="2AHcQZ" id="3F_jmpTzh2K" role="2AJF6D">
<ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
</node>
</node>
</node>
<node concept="2tJIrI" id="365yA_OOciT" role="jymVt" />
Expand All @@ -2268,6 +2166,88 @@
<node concept="3clFb_" id="4$j2$kkaWid" role="jymVt">
<property role="TrG5h" value="getValue" />
<node concept="3clFbS" id="4$j2$kkaWie" role="3clF47">
<node concept="3clFbJ" id="1ghRTGwx9Jc" role="3cqZAp">
<node concept="3clFbS" id="1ghRTGwx9Je" role="3clFbx">
<node concept="3SKdUt" id="7v7GtskRUET" role="3cqZAp">
<node concept="1PaTwC" id="7v7GtskRUEU" role="1aUNEU">
<node concept="3oM_SD" id="7v7GtskRVHt" role="1PaTwD">
<property role="3oM_SC" value="lazy" />
</node>
<node concept="3oM_SD" id="7v7GtskRVHv" role="1PaTwD">
<property role="3oM_SC" value="initialisation" />
</node>
<node concept="3oM_SD" id="7v7GtskRVHy" role="1PaTwD">
<property role="3oM_SC" value="is" />
</node>
<node concept="3oM_SD" id="7v7GtskRVHA" role="1PaTwD">
<property role="3oM_SC" value="done" />
</node>
<node concept="3oM_SD" id="7v7GtskRVHF" role="1PaTwD">
<property role="3oM_SC" value="without" />
</node>
<node concept="3oM_SD" id="7v7GtskRVHL" role="1PaTwD">
<property role="3oM_SC" value="trace" />
</node>
<node concept="3oM_SD" id="7v7GtskRVHS" role="1PaTwD">
<property role="3oM_SC" value="and" />
</node>
<node concept="3oM_SD" id="7v7GtskRVI0" role="1PaTwD">
<property role="3oM_SC" value="converage:" />
</node>
</node>
</node>
<node concept="3clFbF" id="1ghRTGwxOxY" role="3cqZAp">
<node concept="37vLTI" id="1ghRTGwxQhf" role="3clFbG">
<node concept="37vLTw" id="1ghRTGwxOxX" role="37vLTJ">
<ref role="3cqZAo" node="365yA_OSqXk" resolve="literalValue" />
</node>
<node concept="2OqwBi" id="1ghRTGwx$um" role="37vLTx">
<node concept="2OqwBi" id="1ghRTGwx$un" role="2Oq$k0">
<node concept="37vLTw" id="1ghRTGwx$uo" role="2Oq$k0">
<ref role="3cqZAo" node="1yE6u6Gpw5X" resolve="context" />
</node>
<node concept="liA8E" id="1ghRTGwx$up" role="2OqNvi">
<ref role="37wK5l" to="2ahs:2ALJBcrni7v" resolve="getRootInterpreter" />
</node>
</node>
<node concept="liA8E" id="1ghRTGwx$uq" role="2OqNvi">
<ref role="37wK5l" to="2ahs:41ZT0VcTXY$" resolve="evaluate" />
<node concept="2OqwBi" id="1ghRTGwx$ur" role="37wK5m">
<node concept="37vLTw" id="1ghRTGwx$us" role="2Oq$k0">
<ref role="3cqZAo" node="365yA_OOfZ6" resolve="literal" />
</node>
<node concept="3TrEf2" id="1ghRTGwx$ut" role="2OqNvi">
<ref role="3Tt5mk" to="yv47:3Y6fbK15FM4" resolve="value" />
</node>
</node>
<node concept="37vLTw" id="1ghRTGwxCS6" role="37wK5m">
<ref role="3cqZAo" node="1yE6u6Gpw5X" resolve="context" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1Wc70l" id="1ghRTGwxqZm" role="3clFbw">
<node concept="2OqwBi" id="1ghRTGwxxyk" role="3uHU7w">
<node concept="2OqwBi" id="1ghRTGwxtTg" role="2Oq$k0">
<node concept="37vLTw" id="1ghRTGwxsC9" role="2Oq$k0">
<ref role="3cqZAo" node="365yA_OOfZ6" resolve="literal" />
</node>
<node concept="3TrEf2" id="1ghRTGwxvLa" role="2OqNvi">
<ref role="3Tt5mk" to="yv47:3Y6fbK15FM4" resolve="value" />
</node>
</node>
<node concept="3x8VRR" id="1ghRTGwxzfX" role="2OqNvi" />
</node>
<node concept="3clFbC" id="1ghRTGwxor0" role="3uHU7B">
<node concept="37vLTw" id="1ghRTGwxmOZ" role="3uHU7B">
<ref role="3cqZAo" node="365yA_OSqXk" resolve="literalValue" />
</node>
<node concept="10Nm6u" id="1ghRTGwxq1j" role="3uHU7w" />
</node>
</node>
</node>
<node concept="3cpWs6" id="4$j2$kkaWif" role="3cqZAp">
<node concept="37vLTw" id="4$j2$kkaWig" role="3cqZAk">
<ref role="3cqZAo" node="365yA_OSqXk" resolve="literalValue" />
Expand Down Expand Up @@ -2639,13 +2619,18 @@
</node>
</node>
</node>
<node concept="3clFbF" id="1ghRTGwy6E1" role="3cqZAp">
<node concept="1rXfSq" id="1ghRTGwxSNj" role="3clFbG">
<ref role="37wK5l" node="365yA_OYolb" resolve="getLiteral" />
</node>
</node>
<node concept="1gVbGN" id="4UpGdVgpwfL" role="3cqZAp">
<node concept="2ZW3vV" id="4UpGdVgp_vM" role="1gVkn0">
<node concept="3uibUv" id="4UpGdVgpBUN" role="2ZW6by">
<ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
</node>
<node concept="37vLTw" id="4UpGdVgpxyA" role="2ZW6bz">
<ref role="3cqZAo" node="365yA_OSqXk" resolve="literalValue" />
<node concept="1rXfSq" id="1ghRTGwydwu" role="2ZW6bz">
<ref role="37wK5l" node="4$j2$kkaWid" resolve="getValue" />
</node>
</node>
</node>
Expand All @@ -2655,8 +2640,8 @@
<node concept="3uibUv" id="4UpGdVgpnZn" role="0kSFW">
<ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
</node>
<node concept="37vLTw" id="wlV$3kuax9" role="0kSFX">
<ref role="3cqZAo" node="365yA_OSqXk" resolve="literalValue" />
<node concept="1rXfSq" id="7v7GtskRYJ0" role="0kSFX">
<ref role="37wK5l" node="4$j2$kkaWid" resolve="getValue" />
</node>
</node>
<node concept="liA8E" id="wlV$3kuaxa" role="2OqNvi">
Expand All @@ -2669,8 +2654,8 @@
<node concept="37vLTw" id="wlV$3kuaxe" role="2Oq$k0">
<ref role="3cqZAo" node="365yA_OO6AO" resolve="enumLiteral" />
</node>
<node concept="2OwXpG" id="wlV$3kuaxf" role="2OqNvi">
<ref role="2Oxat5" node="365yA_OSqXk" resolve="literalValue" />
<node concept="liA8E" id="1ghRTGwxWWv" role="2OqNvi">
<ref role="37wK5l" node="4$j2$kkaWid" resolve="getValue" />
</node>
</node>
</node>
Expand Down

0 comments on commit 851c953

Please sign in to comment.