Skip to content

Commit 948a73c

Browse files
alexanderpannalexanderpann
authored
Merge pull request #569 from IETS3/bugfix/expressionTemporalOpEditors
2 parents 8e7e453 + 9d8e7e9 commit 948a73c

File tree

5 files changed

+427
-188
lines changed

5 files changed

+427
-188
lines changed

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

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,15 @@
127127
<concept id="1164833692343" name="jetbrains.mps.lang.editor.structure.CellMenuPart_PropertyValues" flags="ng" index="PvTIS">
128128
<child id="1164833692344" name="valuesFunction" index="PvTIR" />
129129
</concept>
130+
<concept id="1078938745671" name="jetbrains.mps.lang.editor.structure.EditorComponentDeclaration" flags="ig" index="PKFIW" />
130131
<concept id="1078939183254" name="jetbrains.mps.lang.editor.structure.CellModel_Component" flags="sg" stub="3162947552742194261" index="PMmxH">
131132
<reference id="1078939183255" name="editorComponent" index="PMmxG" />
132133
</concept>
133134
<concept id="1235728439575" name="jetbrains.mps.lang.editor.structure.BaseLineCell" flags="ln" index="2R9Tw8" />
134135
<concept id="1149850725784" name="jetbrains.mps.lang.editor.structure.CellModel_AttributedNodeCell" flags="ng" index="2SsqMj" />
136+
<concept id="1164914519156" name="jetbrains.mps.lang.editor.structure.CellMenuPart_ReplaceNode_CustomNodeConcept" flags="ng" index="UkePV">
137+
<reference id="1164914727930" name="replacementConcept" index="Ul1FP" />
138+
</concept>
135139
<concept id="1186402211651" name="jetbrains.mps.lang.editor.structure.StyleSheet" flags="ng" index="V5hpn">
136140
<child id="1186402402630" name="styles" index="V601i" />
137141
</concept>
@@ -2659,8 +2663,8 @@
26592663
<ref role="1XX52x" to="hm2y:2U5Q01UkDMQ" resolve="OneOfTarget" />
26602664
<node concept="3EZMnI" id="2U5Q01UkDNw" role="2wV5jI">
26612665
<node concept="2iRfu4" id="2U5Q01UkDNx" role="2iSdaV" />
2662-
<node concept="3F0ifn" id="2U5Q01UkDNs" role="3EZMnx">
2663-
<property role="3F0ifm" value="oneOf" />
2666+
<node concept="PMmxH" id="12bsjhgd0e2" role="3EZMnx">
2667+
<ref role="PMmxG" node="12bsjhgd0dR" resolve="OpAlias" />
26642668
</node>
26652669
<node concept="3F0ifn" id="2U5Q01UkDNJ" role="3EZMnx">
26662670
<property role="3F0ifm" value="[" />
@@ -6576,5 +6580,17 @@
65766580
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
65776581
</node>
65786582
</node>
6583+
<node concept="PKFIW" id="12bsjhgd0dR">
6584+
<property role="TrG5h" value="OpAlias" />
6585+
<ref role="1XX52x" to="hm2y:7NJy08a3O9a" resolve="IDotTarget" />
6586+
<node concept="PMmxH" id="12bsjhgd0dT" role="2wV5jI">
6587+
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
6588+
<node concept="OXEIz" id="12bsjhgd0dW" role="P5bDN">
6589+
<node concept="UkePV" id="12bsjhgd0dZ" role="OY2wv">
6590+
<ref role="Ul1FP" to="hm2y:7NJy08a3O9a" resolve="IDotTarget" />
6591+
</node>
6592+
</node>
6593+
</node>
6594+
</node>
65796595
</model>
65806596

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/actions.mps‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<child id="1068498886297" name="rValue" index="37vLTx" />
2121
<child id="1068498886295" name="lValue" index="37vLTJ" />
2222
</concept>
23+
<concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
2324
<concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
2425
<child id="1197027771414" name="operand" index="2Oq$k0" />
2526
<child id="1197027833540" name="operation" index="2OqNvi" />
@@ -51,10 +52,14 @@
5152
<concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
5253
<child id="1068581517665" name="statement" index="3cqZAp" />
5354
</concept>
55+
<concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6" />
5456
<concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
5557
<child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
5658
</concept>
5759
<concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
60+
<concept id="5497648299878491908" name="jetbrains.mps.baseLanguage.structure.BaseVariableReference" flags="nn" index="1M0zk4">
61+
<reference id="5497648299878491909" name="baseVariableDeclaration" index="1M0zk5" />
62+
</concept>
5863
</language>
5964
<language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
6065
<concept id="5455284157994012186" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitLink" flags="ng" index="2pIpSj">
@@ -97,6 +102,7 @@
97102
<concept id="1158701162220" name="jetbrains.mps.lang.actions.structure.NodeSetupFunction" flags="in" index="37Y9Zx" />
98103
<concept id="5584396657084912703" name="jetbrains.mps.lang.actions.structure.NodeSetupFunction_NewNode" flags="nn" index="1r4Lsj" />
99104
<concept id="5584396657084920670" name="jetbrains.mps.lang.actions.structure.NodeSetupFunction_EnclosingNode" flags="nn" index="1r4N1M" />
105+
<concept id="5584396657084920413" name="jetbrains.mps.lang.actions.structure.NodeSetupFunction_SampleNode" flags="nn" index="1r4N5L" />
100106
</language>
101107
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
102108
<concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
@@ -109,6 +115,14 @@
109115
<child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
110116
<child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
111117
</concept>
118+
<concept id="1883223317721008708" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfStatement" flags="nn" index="Jncv_">
119+
<reference id="1883223317721008712" name="nodeConcept" index="JncvD" />
120+
<child id="1883223317721008709" name="body" index="Jncv$" />
121+
<child id="1883223317721008711" name="variable" index="JncvA" />
122+
<child id="1883223317721008710" name="nodeExpression" index="JncvB" />
123+
</concept>
124+
<concept id="1883223317721008713" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfVariable" flags="ng" index="JncvC" />
125+
<concept id="1883223317721107059" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfVarReference" flags="nn" index="Jnkvi" />
112126
<concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
113127
<child id="1177027386292" name="conceptArgument" index="cj9EA" />
114128
</concept>
@@ -420,6 +434,54 @@
420434
</node>
421435
</node>
422436
</node>
437+
<node concept="37WvkG" id="4l_LUjibjsh" role="37WGs$">
438+
<ref role="37XkoT" to="700h:6zmBjqUjnKs" resolve="OneArgCollectionOp" />
439+
<node concept="37Y9Zx" id="4l_LUjibjsi" role="37ZfLb">
440+
<node concept="3clFbS" id="4l_LUjibjsj" role="2VODD2">
441+
<node concept="3clFbJ" id="4l_LUjibEwm" role="3cqZAp">
442+
<node concept="3clFbS" id="4l_LUjibEwo" role="3clFbx">
443+
<node concept="3cpWs6" id="4l_LUjibELa" role="3cqZAp" />
444+
</node>
445+
<node concept="2OqwBi" id="4l_LUjibEC3" role="3clFbw">
446+
<node concept="1r4Lsj" id="4l_LUjickKD" role="2Oq$k0" />
447+
<node concept="1mIQ4w" id="4l_LUjibEIz" role="2OqNvi">
448+
<node concept="chp4Y" id="4l_LUjibEIV" role="cj9EA">
449+
<ref role="cht4Q" to="700h:oG0sI$GQkF" resolve="TwoArgPredicateCollectionOp" />
450+
</node>
451+
</node>
452+
</node>
453+
</node>
454+
<node concept="Jncv_" id="4l_LUjibjut" role="3cqZAp">
455+
<ref role="JncvD" to="700h:6zmBjqUjnKs" resolve="OneArgCollectionOp" />
456+
<node concept="1r4N5L" id="4l_LUjibjuM" role="JncvB" />
457+
<node concept="3clFbS" id="4l_LUjibjuv" role="Jncv$">
458+
<node concept="3clFbF" id="4l_LUjibjvx" role="3cqZAp">
459+
<node concept="37vLTI" id="4l_LUjibke4" role="3clFbG">
460+
<node concept="2OqwBi" id="4l_LUjibksF" role="37vLTx">
461+
<node concept="Jnkvi" id="4l_LUjibkeC" role="2Oq$k0">
462+
<ref role="1M0zk5" node="4l_LUjibjuw" resolve="oneArgOp" />
463+
</node>
464+
<node concept="3TrEf2" id="4l_LUjibkOP" role="2OqNvi">
465+
<ref role="3Tt5mk" to="700h:6zmBjqUjnKt" resolve="arg" />
466+
</node>
467+
</node>
468+
<node concept="2OqwBi" id="4l_LUjibjFr" role="37vLTJ">
469+
<node concept="1r4Lsj" id="4l_LUjibjvQ" role="2Oq$k0" />
470+
<node concept="3TrEf2" id="4l_LUjibk2J" role="2OqNvi">
471+
<ref role="3Tt5mk" to="700h:6zmBjqUjnKt" resolve="arg" />
472+
</node>
473+
</node>
474+
</node>
475+
</node>
476+
</node>
477+
<node concept="JncvC" id="4l_LUjibjuw" role="JncvA">
478+
<property role="TrG5h" value="oneArgOp" />
479+
<node concept="2jxLKc" id="4l_LUjibjux" role="1tU5fm" />
480+
</node>
481+
</node>
482+
</node>
483+
</node>
484+
</node>
423485
</node>
424486
</model>
425487

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

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<import index="oq0c" ref="r:6c6155f0-4bbe-4af5-8c26-244d570e21e4(org.iets3.core.expr.base.plugin)" />
1414
<import index="700h" ref="r:61b1de80-490d-4fee-8e95-b956503290e9(org.iets3.core.expr.collections.structure)" />
1515
<import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
16+
<import index="buwp" ref="r:8405f486-53b5-4fe6-af3e-7f68358bd631(org.iets3.core.expr.base.editor)" implicit="true" />
1617
<import index="pbu6" ref="r:83e946de-2a7f-4a4c-b3c9-4f671aa7f2db(org.iets3.core.expr.base.behavior)" implicit="true" />
1718
<import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" implicit="true" />
1819
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
@@ -423,11 +424,8 @@
423424
<property role="3GE5qa" value="" />
424425
<ref role="1XX52x" to="700h:6zmBjqUjnKs" resolve="OneArgCollectionOp" />
425426
<node concept="3EZMnI" id="6zmBjqUjnOV" role="2wV5jI">
426-
<node concept="PMmxH" id="6zmBjqUjnOW" role="3EZMnx">
427-
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
428-
<node concept="11LMrY" id="49WTic8ec1k" role="3F10Kt">
429-
<property role="VOm3f" value="true" />
430-
</node>
427+
<node concept="PMmxH" id="4l_LUjie3jr" role="3EZMnx">
428+
<ref role="PMmxG" to="buwp:12bsjhgd0dR" resolve="OpAlias" />
431429
</node>
432430
<node concept="3F0ifn" id="6zmBjqUjnOX" role="3EZMnx">
433431
<property role="3F0ifm" value="(" />
@@ -817,8 +815,8 @@
817815
<ref role="1XX52x" to="700h:6IBT1wT$hPp" resolve="IMapOneArgOp" />
818816
<node concept="3EZMnI" id="7kYh9Ws$z$o" role="2wV5jI">
819817
<node concept="2iRfu4" id="7kYh9Ws$z$p" role="2iSdaV" />
820-
<node concept="PMmxH" id="7kYh9Ws$z$m" role="3EZMnx">
821-
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
818+
<node concept="PMmxH" id="4l_LUjie3iJ" role="3EZMnx">
819+
<ref role="PMmxG" to="buwp:12bsjhgd0dR" resolve="OpAlias" />
822820
</node>
823821
<node concept="3F0ifn" id="7kYh9Ws$z$x" role="3EZMnx">
824822
<property role="3F0ifm" value="(" />
@@ -887,8 +885,8 @@
887885
<ref role="1XX52x" to="700h:4_KMC82H1yT" resolve="IListOneArgOp" />
888886
<node concept="3EZMnI" id="1RHynufnBTp" role="2wV5jI">
889887
<node concept="l2Vlx" id="NE1gl4Nw13" role="2iSdaV" />
890-
<node concept="PMmxH" id="1RHynufnBTr" role="3EZMnx">
891-
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
888+
<node concept="PMmxH" id="4l_LUjie3hU" role="3EZMnx">
889+
<ref role="PMmxG" to="buwp:12bsjhgd0dR" resolve="OpAlias" />
892890
</node>
893891
<node concept="3F0ifn" id="1RHynufnBTs" role="3EZMnx">
894892
<property role="3F0ifm" value="(" />
@@ -1065,9 +1063,15 @@
10651063
<node concept="24kQdi" id="3tudP_AOMNH">
10661064
<ref role="1XX52x" to="700h:3tudP_AOMNf" resolve="UpToTarget" />
10671065
<node concept="3EZMnI" id="3tudP_AOMNJ" role="2wV5jI">
1068-
<node concept="3F0ifn" id="3tudP_AOMNQ" role="3EZMnx">
1069-
<property role="3F0ifm" value="upto(" />
1070-
<node concept="11LMrY" id="3tudP_AOMSn" role="3F10Kt">
1066+
<node concept="PMmxH" id="4l_LUjie3jL" role="3EZMnx">
1067+
<ref role="PMmxG" to="buwp:12bsjhgd0dR" resolve="OpAlias" />
1068+
</node>
1069+
<node concept="3F0ifn" id="4l_LUjib1e6" role="3EZMnx">
1070+
<property role="3F0ifm" value="(" />
1071+
<node concept="11L4FC" id="4l_LUjib1ee" role="3F10Kt">
1072+
<property role="VOm3f" value="true" />
1073+
</node>
1074+
<node concept="11LMrY" id="4l_LUjib1ej" role="3F10Kt">
10711075
<property role="VOm3f" value="true" />
10721076
</node>
10731077
</node>
@@ -1101,8 +1105,8 @@
11011105
<ref role="1XX52x" to="700h:4hLehKTZXcg" resolve="FoldOp" />
11021106
<node concept="3EZMnI" id="4hLehKU05ea" role="2wV5jI">
11031107
<node concept="l2Vlx" id="6vzDuv94evh" role="2iSdaV" />
1104-
<node concept="PMmxH" id="4hLehKU05e7" role="3EZMnx">
1105-
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
1108+
<node concept="PMmxH" id="4l_LUjie49l" role="3EZMnx">
1109+
<ref role="PMmxG" to="buwp:12bsjhgd0dR" resolve="OpAlias" />
11061110
</node>
11071111
<node concept="3F0ifn" id="4hLehKU05ep" role="3EZMnx">
11081112
<property role="3F0ifm" value="(" />
@@ -1152,8 +1156,8 @@
11521156
<ref role="1XX52x" to="700h:thkha3aNEl" resolve="ISetOneArgOp" />
11531157
<node concept="3EZMnI" id="thkha3aNE$" role="2wV5jI">
11541158
<node concept="2iRfu4" id="thkha3aNE_" role="2iSdaV" />
1155-
<node concept="PMmxH" id="thkha3aNEA" role="3EZMnx">
1156-
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
1159+
<node concept="PMmxH" id="4l_LUjie3j5" role="3EZMnx">
1160+
<ref role="PMmxG" to="buwp:12bsjhgd0dR" resolve="OpAlias" />
11571161
</node>
11581162
<node concept="3F0ifn" id="thkha3aNEB" role="3EZMnx">
11591163
<property role="3F0ifm" value="(" />
@@ -1187,8 +1191,8 @@
11871191
<ref role="1XX52x" to="700h:LrvgQhjFyf" resolve="ListInsertOp" />
11881192
<node concept="3EZMnI" id="LrvgQhkLIP" role="2wV5jI">
11891193
<node concept="2iRfu4" id="LrvgQhkLIQ" role="2iSdaV" />
1190-
<node concept="PMmxH" id="LrvgQhkLIR" role="3EZMnx">
1191-
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
1194+
<node concept="PMmxH" id="4l_LUjie3im" role="3EZMnx">
1195+
<ref role="PMmxG" to="buwp:12bsjhgd0dR" resolve="OpAlias" />
11921196
</node>
11931197
<node concept="3F0ifn" id="LrvgQhkLIS" role="3EZMnx">
11941198
<property role="3F0ifm" value="(" />

0 commit comments

Comments
 (0)