Skip to content

Added ordering of native groups #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Added ordering of native groups #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
18aae0d
Allowed ordering of native groups
Feb 16, 2024
51dceb4
Merge branch 'native-group-ordering' into develop
Jul 8, 2024
1ccf5c8
Merge remote-tracking branch 'source/develop' into develop
Jul 10, 2024
840189c
Merge remote-tracking branch 'source/develop' into develop
Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
201 changes: 201 additions & 0 deletions languages/DclareMPS/generator/template/main@generator.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1700,6 +1700,207 @@
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="3r$WgutrdGk" role="jymVt" />
<node concept="312cEg" id="3r$WgutqGgQ" role="jymVt">
<property role="TrG5h" value="dependencies" />
<node concept="3Tm6S6" id="3r$WgutqGgR" role="1B3o_S" />
<node concept="3uibUv" id="3r$WgutqGgS" role="1tU5fm">
<ref role="3uigEE" to="33ny:~List" resolve="List" />
<node concept="3uibUv" id="3r$WgutqGgT" role="11_B2D">
<ref role="3uigEE" to="t4tl:~INativeGroup" resolve="INativeGroup" />
</node>
</node>
<node concept="10Nm6u" id="3r$WgutqGgU" role="33vP2m" />
</node>
<node concept="312cEg" id="3r$WgutqGgV" role="jymVt">
<property role="TrG5h" value="dependents" />
<node concept="3Tm6S6" id="3r$WgutqGgW" role="1B3o_S" />
<node concept="3uibUv" id="3r$WgutqGgX" role="1tU5fm">
<ref role="3uigEE" to="33ny:~List" resolve="List" />
<node concept="3uibUv" id="3r$WgutqGgY" role="11_B2D">
<ref role="3uigEE" to="t4tl:~INativeGroup" resolve="INativeGroup" />
</node>
</node>
<node concept="10Nm6u" id="3r$WgutqGgZ" role="33vP2m" />
</node>
<node concept="2tJIrI" id="3r$WgutqK5v" role="jymVt" />
<node concept="3clFb_" id="3r$WgutqMA8" role="jymVt">
<property role="TrG5h" value="getDependencies" />
<node concept="3Tm1VV" id="3r$WgutqMA9" role="1B3o_S" />
<node concept="3uibUv" id="3r$WgutqMAa" role="3clF45">
<ref role="3uigEE" to="33ny:~List" resolve="List" />
<node concept="3uibUv" id="3r$WgutqMAb" role="11_B2D">
<ref role="3uigEE" to="t4tl:~INativeGroup" resolve="INativeGroup" />
</node>
</node>
<node concept="3clFbS" id="3r$WgutqMAc" role="3clF47">
<node concept="3clFbJ" id="3r$WgutqMAd" role="3cqZAp">
<node concept="3clFbS" id="3r$WgutqMAe" role="3clFbx">
<node concept="3clFbF" id="3r$WgutqMAf" role="3cqZAp">
<node concept="37vLTI" id="3r$WgutqMAg" role="3clFbG">
<node concept="2ShNRf" id="3r$WgutqMAh" role="37vLTx">
<node concept="1pGfFk" id="3r$WgutqMAi" role="2ShVmc">
<ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;()" resolve="ArrayList" />
<node concept="3uibUv" id="3r$WgutqMAj" role="1pMfVU">
<ref role="3uigEE" to="t4tl:~INativeGroup" resolve="INativeGroup" />
</node>
</node>
</node>
<node concept="37vLTw" id="3r$WgutqMAk" role="37vLTJ">
<ref role="3cqZAo" node="3r$WgutqGgQ" resolve="runsBefore" />
</node>
</node>
</node>
<node concept="3clFbF" id="3r$WgutqMAl" role="3cqZAp">
<node concept="2OqwBi" id="3r$WgutqMAm" role="3clFbG">
<node concept="37vLTw" id="3r$WgutqMAn" role="2Oq$k0">
<ref role="3cqZAo" node="3r$WgutqGgQ" resolve="runsBefore" />
</node>
<node concept="liA8E" id="3r$WgutqMAo" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
<node concept="37vLTw" id="3r$WgutsgT9" role="37wK5m">
<ref role="3cqZAo" node="4ONkEkNhKuU" resolve="NATIVE_GROUP" />
<node concept="5jKBG" id="3r$WgutsgTj" role="lGtFl">
<ref role="v9R2y" node="3$gBO$Dp_IT" resolve="getNativeGroup" />
<node concept="30H73N" id="3r$WgutsgTk" role="v9R3O" />
<node concept="3NFfHV" id="3r$WgutsgTl" role="5jGum">
<node concept="3clFbS" id="3r$WgutsgTm" role="2VODD2">
<node concept="3clFbF" id="3r$WgutsgTn" role="3cqZAp">
<node concept="2OqwBi" id="3r$WgutsgTo" role="3clFbG">
<node concept="30H73N" id="3r$WgutsgTp" role="2Oq$k0" />
<node concept="3TrEf2" id="3r$WgutsgTq" role="2OqNvi">
<ref role="3Tt5mk" to="7ggn:3r$WgusVMSp" resolve="nativeGroup" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1WS0z7" id="3r$WgutqMAy" role="lGtFl">
<node concept="3JmXsc" id="3r$WgutqMAz" role="3Jn$fo">
<node concept="3clFbS" id="3r$WgutqMA$" role="2VODD2">
<node concept="3clFbF" id="3r$WgutqMA_" role="3cqZAp">
<node concept="2OqwBi" id="3r$WgutqMAA" role="3clFbG">
<node concept="30H73N" id="3r$WgutqMAB" role="2Oq$k0" />
<node concept="3Tsc0h" id="3r$WgutqMAC" role="2OqNvi">
<ref role="3TtcxE" to="7ggn:3r$WgusVMSD" resolve="dependencies" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbC" id="3r$WgutqMAD" role="3clFbw">
<node concept="10Nm6u" id="3r$WgutqMAE" role="3uHU7w" />
<node concept="37vLTw" id="3r$WgutqMAF" role="3uHU7B">
<ref role="3cqZAo" node="3r$WgutqGgQ" resolve="runsBefore" />
</node>
</node>
</node>
<node concept="3cpWs6" id="3r$WgutqMAG" role="3cqZAp">
<node concept="37vLTw" id="3r$WgutqMAH" role="3cqZAk">
<ref role="3cqZAo" node="3r$WgutqGgQ" resolve="runsBefore" />
</node>
</node>
</node>
<node concept="2AHcQZ" id="3r$WgutqMAI" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="3r$WgutqMAJ" role="jymVt" />
<node concept="3clFb_" id="3r$WgutqMAK" role="jymVt">
<property role="TrG5h" value="getDependents" />
<node concept="3Tm1VV" id="3r$WgutqMAL" role="1B3o_S" />
<node concept="3uibUv" id="3r$WgutqMAM" role="3clF45">
<ref role="3uigEE" to="33ny:~List" resolve="List" />
<node concept="3uibUv" id="3r$WgutqMAN" role="11_B2D">
<ref role="3uigEE" to="t4tl:~INativeGroup" resolve="INativeGroup" />
</node>
</node>
<node concept="3clFbS" id="3r$WgutqMAO" role="3clF47">
<node concept="3clFbJ" id="3r$WgutqMAP" role="3cqZAp">
<node concept="3clFbS" id="3r$WgutqMAQ" role="3clFbx">
<node concept="3clFbF" id="3r$WgutqMAR" role="3cqZAp">
<node concept="37vLTI" id="3r$WgutqMAS" role="3clFbG">
<node concept="2ShNRf" id="3r$WgutqMAT" role="37vLTx">
<node concept="1pGfFk" id="3r$WgutqMAU" role="2ShVmc">
<ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;()" resolve="ArrayList" />
<node concept="3uibUv" id="3r$WgutqMAV" role="1pMfVU">
<ref role="3uigEE" to="t4tl:~INativeGroup" resolve="INativeGroup" />
</node>
</node>
</node>
<node concept="37vLTw" id="3r$WgutqMAW" role="37vLTJ">
<ref role="3cqZAo" node="3r$WgutqGgV" resolve="runsAfter" />
</node>
</node>
</node>
<node concept="3clFbF" id="3r$WgutqMAX" role="3cqZAp">
<node concept="2OqwBi" id="3r$WgutqMAY" role="3clFbG">
<node concept="37vLTw" id="3r$WgutqMAZ" role="2Oq$k0">
<ref role="3cqZAo" node="3r$WgutqGgV" resolve="runsAfter" />
</node>
<node concept="liA8E" id="3r$WgutqMB0" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
<node concept="37vLTw" id="3r$Wgutsjsx" role="37wK5m">
<ref role="3cqZAo" node="4ONkEkNhKuU" resolve="NATIVE_GROUP" />
<node concept="5jKBG" id="3r$WgutsjsF" role="lGtFl">
<ref role="v9R2y" node="3$gBO$Dp_IT" resolve="getNativeGroup" />
<node concept="30H73N" id="3r$WgutsjsG" role="v9R3O" />
<node concept="3NFfHV" id="3r$WgutsjsH" role="5jGum">
<node concept="3clFbS" id="3r$WgutsjsI" role="2VODD2">
<node concept="3clFbF" id="3r$WgutsjsJ" role="3cqZAp">
<node concept="2OqwBi" id="3r$WgutsjsK" role="3clFbG">
<node concept="30H73N" id="3r$WgutsjsL" role="2Oq$k0" />
<node concept="3TrEf2" id="3r$WgutsjsM" role="2OqNvi">
<ref role="3Tt5mk" to="7ggn:3r$WgusVMSp" resolve="nativeGroup" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1WS0z7" id="3r$WgutqMBa" role="lGtFl">
<node concept="3JmXsc" id="3r$WgutqMBb" role="3Jn$fo">
<node concept="3clFbS" id="3r$WgutqMBc" role="2VODD2">
<node concept="3clFbF" id="3r$WgutqMBd" role="3cqZAp">
<node concept="2OqwBi" id="3r$WgutqMBe" role="3clFbG">
<node concept="30H73N" id="3r$WgutqMBf" role="2Oq$k0" />
<node concept="3Tsc0h" id="3r$WgutqMBg" role="2OqNvi">
<ref role="3TtcxE" to="7ggn:3r$WgusVMSI" resolve="dependents" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbC" id="3r$WgutqMBh" role="3clFbw">
<node concept="10Nm6u" id="3r$WgutqMBi" role="3uHU7w" />
<node concept="37vLTw" id="3r$WgutqMBj" role="3uHU7B">
<ref role="3cqZAo" node="3r$WgutqGgV" resolve="runsAfter" />
</node>
</node>
</node>
<node concept="3cpWs6" id="3r$WgutqMBk" role="3cqZAp">
<node concept="37vLTw" id="3r$WgutqMBl" role="3cqZAk">
<ref role="3cqZAo" node="3r$WgutqGgV" resolve="runsAfter" />
</node>
</node>
</node>
<node concept="2AHcQZ" id="3r$WgutqMBm" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
</node>
</node>
</node>
Expand Down
8 changes: 8 additions & 0 deletions languages/DclareMPS/models/constraints.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5772,5 +5772,13 @@
</node>
</node>
</node>
<node concept="1M2fIO" id="3r$Wgut0I8j">
<property role="3GE5qa" value="native" />
<ref role="1M2myG" to="7ggn:4ONkEkNg$Za" resolve="NativeGroup" />
</node>
<node concept="1M2fIO" id="3r$Wgut0IbY">
<property role="3GE5qa" value="native" />
<ref role="1M2myG" to="7ggn:3r$WgusVMSo" resolve="NativeGroupReference" />
</node>
</model>

89 changes: 89 additions & 0 deletions languages/DclareMPS/models/editor.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9674,16 +9674,92 @@
<node concept="3F0A7n" id="6_fOQ$ATO2A" role="3EZMnx">
<ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
</node>
<node concept="3F0ifn" id="1$ON$8sNdlC" role="3EZMnx">
<property role="3F0ifm" value=" depends on" />
</node>
<node concept="3F2HdR" id="1$ON$8sNftH" role="3EZMnx">
<property role="2czwfO" value="," />
<ref role="1NtTu8" to="7ggn:3r$WgusVMSD" resolve="dependencies" />
<node concept="l2Vlx" id="1$ON$8sNftJ" role="2czzBx" />
<node concept="3F0ifn" id="1$ON$8sNfvy" role="2czzBI">
<property role="3F0ifm" value="..." />
</node>
<node concept="tppnM" id="1$ON$8sNfvD" role="sWeuL">
<node concept="11L4FC" id="1$ON$8sNfvG" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
</node>
<node concept="3F0ifn" id="1$ON$8sNfzA" role="3EZMnx">
<property role="3F0ifm" value=" dependent of" />
</node>
<node concept="3F2HdR" id="1$ON$8sNfBv" role="3EZMnx">
<property role="2czwfO" value="," />
<ref role="1NtTu8" to="7ggn:3r$WgusVMSI" resolve="dependents" />
<node concept="l2Vlx" id="1$ON$8sNfBx" role="2czzBx" />
<node concept="3F0ifn" id="1$ON$8sNfDw" role="2czzBI">
<property role="3F0ifm" value="..." />
</node>
<node concept="tppnM" id="1$ON$8sNfDB" role="sWeuL">
<node concept="11L4FC" id="1$ON$8sNfDE" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
</node>
<node concept="3F0ifn" id="6_fOQ$ATOeu" role="3EZMnx">
<property role="3F0ifm" value="{" />
<ref role="1k5W1q" to="tpen:hFD5onb" resolve="LeftBrace" />
<node concept="ljvvj" id="6_fOQ$ATRxI" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
<node concept="3F0ifn" id="3r$WgusVMVn" role="3EZMnx">
<property role="3F0ifm" value="run" />
<node concept="lj46D" id="3r$WgusVN3E" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
<node concept="3F0ifn" id="3r$WgusVMXa" role="3EZMnx">
<property role="3F0ifm" value="before:" />
</node>
<node concept="3F0ifn" id="3r$WgusVMYo" role="3EZMnx">
<property role="3F0ifm" value="[" />
</node>
<node concept="3F2HdR" id="3r$WgusVN0h" role="3EZMnx">
<ref role="1NtTu8" to="7ggn:3r$WgusVMSD" resolve="dependencies" />
<node concept="l2Vlx" id="3r$WgusVN0j" role="2czzBx" />
</node>
<node concept="3F0ifn" id="3r$WgusVN1A" role="3EZMnx">
<property role="3F0ifm" value="]" />
</node>
<node concept="3F0ifn" id="3r$WgusVN2W" role="3EZMnx">
<property role="3F0ifm" value="run" />
<node concept="lj46D" id="3r$WgusVN3J" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="pVoyu" id="3r$WgusVN3C" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
<node concept="3F0ifn" id="3r$WgusVN4y" role="3EZMnx">
<property role="3F0ifm" value="after:" />
</node>
<node concept="3F0ifn" id="3r$WgusVN62" role="3EZMnx">
<property role="3F0ifm" value="[" />
</node>
<node concept="3F2HdR" id="3r$WgusVN8m" role="3EZMnx">
<ref role="1NtTu8" to="7ggn:3r$WgusVMSI" resolve="dependents" />
<node concept="l2Vlx" id="3r$WgusVN8o" role="2czzBx" />
</node>
<node concept="3F0ifn" id="3r$WgusVN9X" role="3EZMnx">
<property role="3F0ifm" value="]" />
</node>
<node concept="3F0ifn" id="6_fOQ$ATOeP" role="3EZMnx">
<property role="3F0ifm" value="schedule" />
<ref role="1k5W1q" to="tpen:hFD2Y0y" resolve="MethodName" />
<node concept="pVoyu" id="3r$WgusVMUE" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="lj46D" id="6_fOQ$ATOeQ" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
Expand Down Expand Up @@ -9970,6 +10046,19 @@
</node>
</node>
</node>
<node concept="24kQdi" id="1$ON$8s_4Cn">
<property role="3GE5qa" value="native" />
<ref role="1XX52x" to="7ggn:3r$WgusVMSo" resolve="NativeGroupReference" />
<node concept="1iCGBv" id="1$ON$8s_4Cp" role="2wV5jI">
<ref role="1NtTu8" to="7ggn:3r$WgusVMSp" resolve="nativeGroup" />
<node concept="1sVBvm" id="1$ON$8s_4Cr" role="1sWHZn">
<node concept="3F0A7n" id="1$ON$8s_4C_" role="2wV5jI">
<property role="1Intyy" value="true" />
<ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
</node>
</node>
<node concept="24kQdi" id="6lcsnaOnoLH">
<property role="3GE5qa" value="models.builder" />
<ref role="1XX52x" to="7ggn:6lcsnaOnoLC" resolve="ModelBuilderInitFeature" />
Expand Down
Loading