Skip to content

Commit d30cf58

Browse files
markusvoeltermarkusvoelter
authored
Merge pull request #485 from IETS3/feature/dectreeImprovements
Feature/dectree improvements
2 parents f5a079d + 0d00ebf commit d30cf58

File tree

6 files changed

+576
-344
lines changed

6 files changed

+576
-344
lines changed

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/editor.mps‎

Lines changed: 426 additions & 344 deletions
Large diffs are not rendered by default.

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/models/intentions.mps‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<import index="kt01" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.datatransfer(JDK/)" />
1919
<import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
2020
<import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
21+
<import index="xfg9" ref="r:ac28053f-2041-47f6-806b-ecfaca05a64a(org.iets3.core.expr.base.runtime.runtime)" />
2122
<import index="wthy" ref="r:a4614e23-a6b5-4dbe-9bc5-9ff1ecfd0a3a(org.iets3.core.expr.util.behavior)" implicit="true" />
2223
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
2324
<import index="5qo5" ref="r:6d93ddb1-b0b0-4eee-8079-51303666672a(org.iets3.core.expr.simpleTypes.structure)" implicit="true" />
@@ -259,6 +260,7 @@
259260
<concept id="1145567426890" name="jetbrains.mps.lang.smodel.structure.SNodeListCreator" flags="nn" index="2T8Vx0">
260261
<child id="1145567471833" name="createdType" index="2T96Bj" />
261262
</concept>
263+
<concept id="1139184414036" name="jetbrains.mps.lang.smodel.structure.LinkList_AddNewChildOperation" flags="nn" index="WFELt" />
262264
<concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
263265
<concept id="3562215692195599741" name="jetbrains.mps.lang.smodel.structure.SLinkImplicitSelect" flags="nn" index="13MTOL">
264266
<reference id="3562215692195600259" name="link" index="13MTZf" />
@@ -420,6 +422,9 @@
420422
</node>
421423
</node>
422424
</node>
425+
<node concept="1SWQZ3" id="7RxIimvw1Yu" role="lGtFl">
426+
<property role="1SWRpm" value="TREE" />
427+
</node>
423428
</node>
424429
<node concept="2S6QgY" id="3HmE5WaZXXK">
425430
<property role="3GE5qa" value="dectree" />
@@ -4381,5 +4386,37 @@
43814386
</node>
43824387
</node>
43834388
</node>
4389+
<node concept="2S6QgY" id="7RxIimvtOIO">
4390+
<property role="3GE5qa" value="dectree" />
4391+
<property role="TrG5h" value="addChildren" />
4392+
<ref role="2ZfgGC" to="kfo3:22hm_0$b7cw" resolve="DecTreeNode" />
4393+
<node concept="2S6ZIM" id="7RxIimvtOIP" role="2ZfVej">
4394+
<node concept="3clFbS" id="7RxIimvtOIQ" role="2VODD2">
4395+
<node concept="3clFbF" id="7RxIimvtOZ_" role="3cqZAp">
4396+
<node concept="Xl_RD" id="7RxIimvtOZ$" role="3clFbG">
4397+
<property role="Xl_RC" value="Add Child" />
4398+
</node>
4399+
</node>
4400+
</node>
4401+
</node>
4402+
<node concept="2Sbjvc" id="7RxIimvtOIR" role="2ZfgGD">
4403+
<node concept="3clFbS" id="7RxIimvtOIS" role="2VODD2">
4404+
<node concept="3clFbF" id="7RxIimvtRyU" role="3cqZAp">
4405+
<node concept="2OqwBi" id="7RxIimvtT_Q" role="3clFbG">
4406+
<node concept="2OqwBi" id="7RxIimvtRES" role="2Oq$k0">
4407+
<node concept="2Sf5sV" id="7RxIimvtRyT" role="2Oq$k0" />
4408+
<node concept="3Tsc0h" id="7RxIimvtRPX" role="2OqNvi">
4409+
<ref role="3TtcxE" to="kfo3:22hm_0$b7pP" resolve="children" />
4410+
</node>
4411+
</node>
4412+
<node concept="WFELt" id="7RxIimvtV7R" role="2OqNvi" />
4413+
</node>
4414+
</node>
4415+
</node>
4416+
</node>
4417+
<node concept="1SWQZ3" id="7RxIimvtPhP" role="lGtFl">
4418+
<property role="1SWRpm" value="TREE" />
4419+
</node>
4420+
</node>
43844421
</model>
43854422

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/org.iets3.core.expr.util.mpl‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@
3030
<dependency reexport="false">dbe08fb5-334d-4b64-86a0-622406fa0e87(org.iets3.core.expr.base.runtime)</dependency>
3131
<dependency reexport="false">20c6e580-bdc5-4067-8049-d7e3265a86de(jetbrains.mps.typesystemEngine)</dependency>
3232
<dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
33+
<dependency reexport="false">b33d119e-196d-4497-977c-5c167b21fe33(com.mbeddr.mpsutil.framecell)</dependency>
3334
</dependencies>
3435
<languageVersions>
3536
<language slang="l:f47b95d4-5e73-4c04-9204-18076950153b:com.mbeddr.mpsutil.compare" version="0" />
3637
<language slang="l:120e1c9d-4e27-4478-b2af-b2c3bd3850b0:com.mbeddr.mpsutil.editor.querylist" version="0" />
38+
<language slang="l:b33d119e-196d-4497-977c-5c167b21fe33:com.mbeddr.mpsutil.framecell" version="0" />
3739
<language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="1" />
3840
<language slang="l:b4f35ed8-45af-4efa-abe4-00ac26956e69:com.mbeddr.mpsutil.grammarcells.runtimelang" version="0" />
3941
<language slang="l:b92f861d-0184-446d-b88b-6dcf0e070241:com.mbeddr.mpsutil.intentions" version="0" />
@@ -96,6 +98,7 @@
9698
<module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
9799
<module reference="120e1c9d-4e27-4478-b2af-b2c3bd3850b0(com.mbeddr.mpsutil.editor.querylist)" version="0" />
98100
<module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
101+
<module reference="b33d119e-196d-4497-977c-5c167b21fe33(com.mbeddr.mpsutil.framecell)" version="0" />
99102
<module reference="47f075a6-558e-4640-a606-7ce0236c8023(com.mbeddr.mpsutil.interpreter)" version="0" />
100103
<module reference="735f86bc-17fb-4d1c-a664-82c2b8e8a34e(com.mbeddr.mpsutil.interpreter.rt)" version="0" />
101104
<module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />

‎code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -863,6 +863,11 @@
863863
<ref role="3bR37D" node="4C_RnzfEE1P" resolve="org.iets3.core.expr.base.runtime" />
864864
</node>
865865
</node>
866+
<node concept="1SiIV0" id="3xnKElD$FeU" role="3bR37C">
867+
<node concept="3bR9La" id="3xnKElD$FeV" role="1SiIV1">
868+
<ref role="3bR37D" to="al5i:5WYUu8HaT_t" resolve="com.mbeddr.mpsutil.framecell" />
869+
</node>
870+
</node>
866871
</node>
867872
<node concept="1E1JtA" id="4lBotkP9WfS" role="2G$12L">
868873
<property role="BnDLt" value="true" />
@@ -10373,6 +10378,15 @@
1037310378
<node concept="3LEDTM" id="3qKzW8QJ_Qf" role="3LEDUa">
1037410379
<ref role="3LEDTN" node="3qKzW8QxJyw" resolve="org.iets3.core.expr.base.shared.runtime" />
1037510380
</node>
10381+
<node concept="3LEDTy" id="3xnKElD$Fzs" role="3LEDUa">
10382+
<ref role="3LEDTV" to="ffeo:ymnOULAU0j" resolve="jetbrains.mps.baseLanguage.unitTest" />
10383+
</node>
10384+
<node concept="3LEDTy" id="3xnKElD$Fzt" role="3LEDUa">
10385+
<ref role="3LEDTV" to="ffeo:7Kfy9QB6L0h" resolve="jetbrains.mps.baseLanguage.collections" />
10386+
</node>
10387+
<node concept="3LEDTy" id="3xnKElD$Fzu" role="3LEDUa">
10388+
<ref role="3LEDTV" to="ffeo:7Kfy9QB6KZG" resolve="jetbrains.mps.baseLanguage.closures" />
10389+
</node>
1037610390
</node>
1037710391
<node concept="3LEwk6" id="2zpAVpC$OJa" role="2G$12L">
1037810392
<property role="BnDLt" value="true" />

‎code/languages/org.iets3.opensource/tests/test.in.expr.os/models/[email protected]‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<use id="cfaa4966-b7d5-4b69-b66a-309a6e1a7290" name="org.iets3.core.expr.base" version="-1" />
1515
<use id="d441fba0-f46b-43cd-b723-dad7b65da615" name="org.iets3.core.expr.tests" version="-1" />
1616
<use id="6b277d9a-d52d-416f-a209-1919bd737f50" name="org.iets3.core.expr.simpleTypes" version="-1" />
17+
<use id="8bb1251e-eae5-47ab-9843-33adfae8edaa" name="org.iets3.core.expr.util" version="2" />
1718
</languages>
1819
<imports />
1920
<registry>
@@ -22,6 +23,18 @@
2223
<property id="5097124989038916363" name="projectPath" index="2XOHcw" />
2324
</concept>
2425
</language>
26+
<language id="8bb1251e-eae5-47ab-9843-33adfae8edaa" name="org.iets3.core.expr.util">
27+
<concept id="2346756181087515423" name="org.iets3.core.expr.util.structure.DecTree" flags="ng" index="4Ji_f">
28+
<child id="2346756181087516195" name="root" index="4JiLN" />
29+
</concept>
30+
<concept id="2346756181087515424" name="org.iets3.core.expr.util.structure.DecTreeNode" flags="ng" index="4Ji_K">
31+
<child id="2346756181087515425" name="expression" index="4Ji_L" />
32+
</concept>
33+
<concept id="593359455454520824" name="org.iets3.core.expr.util.structure.AbstractDecTreeNode" flags="ng" index="3Ag6MZ">
34+
<child id="2346756181087516277" name="children" index="4JiK_" />
35+
</concept>
36+
<concept id="593359455454548610" name="org.iets3.core.expr.util.structure.RootTreeNode" flags="ng" index="3AgdJ5" />
37+
</language>
2538
<language id="2f7e2e35-6e74-4c43-9fa5-2465d68f5996" name="org.iets3.core.expr.collections">
2639
<concept id="527291771330968213" name="org.iets3.core.expr.collections.structure.ISetOneArgOp" flags="ng" index="24uAI7">
2740
<child id="527291771330969242" name="arg" index="24uAY8" />
@@ -3826,5 +3839,87 @@
38263839
<node concept="2XOHcx" id="4rZeNQ6M9GV">
38273840
<property role="2XOHcw" value="${iets3.github.opensource.home}/code/languages/org.iets3.opensource" />
38283841
</node>
3842+
<node concept="_iOnU" id="1URbfFFNt7E">
3843+
<property role="TrG5h" value="dectre" />
3844+
<property role="2SXJ1i" value="true" />
3845+
<property role="1XBH2A" value="true" />
3846+
<ref role="2HwdWd" node="1VmWkC0I5UE" resolve="varLib" />
3847+
<node concept="_ixoA" id="1URbfFFNt7F" role="_iOnB" />
3848+
<node concept="2zPypq" id="1URbfFFNteJ" role="_iOnB">
3849+
<property role="TrG5h" value="one" />
3850+
<node concept="30bXRB" id="1URbfFFNtf3" role="2zPyp_">
3851+
<property role="30bXRw" value="1" />
3852+
</node>
3853+
</node>
3854+
<node concept="2zPypq" id="1URbfFFNtfE" role="_iOnB">
3855+
<property role="TrG5h" value="two" />
3856+
<node concept="30bXRB" id="1URbfFFNtg0" role="2zPyp_">
3857+
<property role="30bXRw" value="2" />
3858+
</node>
3859+
</node>
3860+
<node concept="_ixoA" id="1URbfFFNteB" role="_iOnB" />
3861+
<node concept="1aga60" id="1URbfFFNtgQ" role="_iOnB">
3862+
<property role="TrG5h" value="decide" />
3863+
<node concept="4Ji_f" id="1URbfFFNtig" role="1ahQXP">
3864+
<node concept="3AgdJ5" id="1URbfFFNtih" role="4JiLN">
3865+
<node concept="4Ji_K" id="1URbfFFNtii" role="4JiK_">
3866+
<node concept="30d7iD" id="1URbfFFNtjr" role="4Ji_L">
3867+
<node concept="30bXRB" id="1URbfFFNtjy" role="30dEs_">
3868+
<property role="30bXRw" value="0" />
3869+
</node>
3870+
<node concept="_emDc" id="1URbfFFNtj4" role="30dEsF">
3871+
<ref role="_emDf" node="1URbfFFNteJ" resolve="one" />
3872+
</node>
3873+
</node>
3874+
<node concept="4Ji_K" id="1URbfFFNtqP" role="4JiK_">
3875+
<node concept="30d7iD" id="1URbfFFNtue" role="4Ji_L">
3876+
<node concept="30bXRB" id="1URbfFFNtul" role="30dEs_">
3877+
<property role="30bXRw" value="1" />
3878+
</node>
3879+
<node concept="_emDc" id="1URbfFFNttm" role="30dEsF">
3880+
<ref role="_emDf" node="1URbfFFNtfE" resolve="two" />
3881+
</node>
3882+
</node>
3883+
<node concept="4Ji_K" id="1URbfFFQl$n" role="4JiK_">
3884+
<node concept="30bXRB" id="1URbfFFQlCb" role="4Ji_L">
3885+
<property role="30bXRw" value="10" />
3886+
</node>
3887+
</node>
3888+
</node>
3889+
</node>
3890+
<node concept="4Ji_K" id="1URbfFFNtij" role="4JiK_">
3891+
<node concept="30d6GJ" id="1URbfFFNtoq" role="4Ji_L">
3892+
<node concept="30bXRB" id="1URbfFFNtox" role="30dEs_">
3893+
<property role="30bXRw" value="0" />
3894+
</node>
3895+
<node concept="_emDc" id="1URbfFFNtlj" role="30dEsF">
3896+
<ref role="_emDf" node="1URbfFFNteJ" resolve="one" />
3897+
</node>
3898+
</node>
3899+
<node concept="4Ji_K" id="1URbfFFQlIl" role="4JiK_">
3900+
<node concept="30bXRB" id="1URbfFFQlMG" role="4Ji_L">
3901+
<property role="30bXRw" value="22" />
3902+
</node>
3903+
</node>
3904+
</node>
3905+
</node>
3906+
</node>
3907+
</node>
3908+
<node concept="_ixoA" id="1URbfFFNtgD" role="_iOnB" />
3909+
<node concept="_fkuM" id="1URbfFFNt7G" role="_iOnB">
3910+
<property role="TrG5h" value="testLocalVar_i" />
3911+
<node concept="_fkuZ" id="1URbfFFQlNr" role="_fkp5">
3912+
<node concept="_fku$" id="1URbfFFQlNs" role="_fkur" />
3913+
<node concept="1af_rf" id="1URbfFFQlNC" role="_fkuY">
3914+
<ref role="1afhQb" node="1URbfFFNtgQ" resolve="decide" />
3915+
</node>
3916+
<node concept="30bXRB" id="1URbfFFQlNS" role="_fkuS">
3917+
<property role="30bXRw" value="10" />
3918+
</node>
3919+
</node>
3920+
</node>
3921+
<node concept="_ixoA" id="1URbfFFNt7V" role="_iOnB" />
3922+
<node concept="_ixoA" id="1URbfFFNt7W" role="_iOnB" />
3923+
</node>
38293924
</model>
38303925

‎code/languages/org.iets3.opensource/tests/test.in.expr.os/test.in.expr.os.msd‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@
128128
<module reference="b76a0f63-5959-456b-993a-c796cc0d0c13(org.iets3.core.expr.base.collections.stubs)" version="0" />
129129
<module reference="cf90f965-8554-4a16-aa0b-6387f27474ab(org.iets3.core.expr.base.interpreter)" version="0" />
130130
<module reference="dbe08fb5-334d-4b64-86a0-622406fa0e87(org.iets3.core.expr.base.runtime)" version="0" />
131+
<module reference="00ca1323-762b-4f39-ab5a-6a6bd602dc4b(org.iets3.core.expr.base.shared.runtime)" version="0" />
131132
<module reference="2f7e2e35-6e74-4c43-9fa5-2465d68f5996(org.iets3.core.expr.collections)" version="5" />
132133
<module reference="07f696b4-29e7-4878-aefb-39cac5e8c6cc(org.iets3.core.expr.collections.interpreter)" version="0" />
133134
<module reference="3a79aca0-f4b1-40f1-a3e9-259162afa77b(org.iets3.core.expr.dataflow.interpreter)" version="0" />

0 commit comments

Comments
 (0)