Skip to content

Commit c32f3d1

Browse files
alexanderpannalexanderpann
authored
Merge pull request #1525 from IETS3/merge/mps20241
2 parents 7000dd1 + 0c730bd commit c32f3d1

File tree

3 files changed

+160
-57
lines changed

3 files changed

+160
-57
lines changed

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

Lines changed: 8 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,15 @@
66
<use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
77
<use id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base" version="6" />
88
<use id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext" version="0" />
9-
<use id="fbba5118-5fc6-49ff-9c3b-0b4469830440" name="org.iets3.core.expr.mutable" version="8" />
9+
<use id="5186c6ce-428c-4f09-a9df-73d9e86c27d3" name="org.iets3.core.expr.typetags" version="1" />
10+
<use id="be679007-4312-4db1-9ac0-ab7dfbe66a74" name="org.iets3.core.expr.typetags.units.quantity" version="0" />
11+
<use id="cb91a38e-738a-4811-a96d-448d08f526fa" name="org.iets3.core.expr.typetags.units" version="1" />
12+
<devkit ref="ec967770-4707-442f-baaf-a8b7bb554717(org.iets3.core.expr.genall.core.devkit)" />
1013
<devkit ref="c4e521ab-b605-4ef9-a7c3-68075da058f0(org.iets3.core.expr.core.devkit)" />
11-
<devkit ref="b2a65b84-7ec9-404f-8602-f16394bb1d98(org.iets3.core.expr.stateful.devkit)" />
1214
</languages>
13-
<imports />
15+
<imports>
16+
<import index="ku0a" ref="r:1881124b-7ac4-4b0f-a7dd-12953ac3263b(org.iets3.core.expr.typetags.units.si.units)" />
17+
</imports>
1418
<registry>
1519
<language id="2f7e2e35-6e74-4c43-9fa5-2465d68f5996" name="org.iets3.core.expr.collections">
1620
<concept id="2156530943179855331" name="org.iets3.core.expr.collections.structure.SetWithOp" flags="ng" index="2iGxMk" />
@@ -97,7 +101,6 @@
97101
<child id="531692237848499024" name="selectorList" index="3LEy0l" />
98102
</concept>
99103
<concept id="4618483580248255217" name="org.iets3.core.expr.collections.structure.UnpackOptionsOp" flags="ng" index="3LGWMD" />
100-
<concept id="9097157441620016186" name="org.iets3.core.expr.collections.structure.ForeachOp" flags="ng" index="3NG6h4" />
101104
<concept id="7740953487940081584" name="org.iets3.core.expr.collections.structure.MinOp" flags="ng" index="1W43ev" />
102105
<concept id="4931785860342338320" name="org.iets3.core.expr.collections.structure.FoldOp" flags="ng" index="1XzICc">
103106
<child id="4931785860342371144" name="combiner" index="1YsmDk" />
@@ -291,9 +294,6 @@
291294
<child id="4052432714772608243" name="text" index="1w35rA" />
292295
</concept>
293296
</language>
294-
<language id="fbba5118-5fc6-49ff-9c3b-0b4469830440" name="org.iets3.core.expr.mutable">
295-
<concept id="3795092733479561024" name="org.iets3.core.expr.mutable.structure.NowExpression" flags="ng" index="3C7svV" />
296-
</language>
297297
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
298298
<concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
299299
<child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
@@ -308,7 +308,6 @@
308308
</concept>
309309
</language>
310310
<language id="9464fa06-5ab9-409b-9274-64ab29588457" name="org.iets3.core.expr.lambda">
311-
<concept id="5096753237482793710" name="org.iets3.core.expr.lambda.structure.ReadModifyEffectTag" flags="ng" index="2lgajY" />
312311
<concept id="4790956042240983401" name="org.iets3.core.expr.lambda.structure.BlockExpression" flags="ng" index="1aduha">
313312
<child id="4790956042240983402" name="expressions" index="1aduh9" />
314313
</concept>
@@ -327,7 +326,6 @@
327326
<child id="4790956042240522406" name="args" index="1afhQ5" />
328327
</concept>
329328
<concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
330-
<child id="3880322347437217307" name="effect" index="28QfE6" />
331329
<child id="4790956042240100927" name="args" index="1ahQWs" />
332330
<child id="4790956042240100950" name="body" index="1ahQXP" />
333331
</concept>
@@ -20420,17 +20418,6 @@
2042020418
</node>
2042120419
</node>
2042220420
</node>
20423-
<node concept="1aga60" id="3GdqffBR5lX" role="_iOnB">
20424-
<property role="TrG5h" value="fakeChange" />
20425-
<node concept="1aduha" id="3GdqffBR5n4" role="1ahQXP">
20426-
<node concept="3C7svV" id="1yEri41gibc" role="1aduh9" />
20427-
</node>
20428-
<node concept="2lgajY" id="4qVjx3k0RYS" role="28QfE6" />
20429-
<node concept="1ahQXy" id="3HYRP_wMtRW" role="1ahQWs">
20430-
<property role="TrG5h" value="index" />
20431-
<node concept="mLuIC" id="3HYRP_wMtX0" role="3ix9CU" />
20432-
</node>
20433-
</node>
2043420421
<node concept="_ixoA" id="1e59C2QE68d" role="_iOnB" />
2043520422
<node concept="2zPypq" id="3S$dVIhq7kc" role="_iOnB">
2043620423
<property role="TrG5h" value="indexCollection" />
@@ -20672,10 +20659,10 @@
2067220659
<node concept="1HmgMX" id="XJW33sLulK" role="1QScD9">
2067320660
<node concept="3izI60" id="XJW33sLuxk" role="2lDidJ">
2067420661
<node concept="30cPrO" id="XJW33sLuTr" role="2lDidJ">
20675-
<node concept="2GTG47" id="XJW33sLuGf" role="30dEsF" />
2067620662
<node concept="30bXRB" id="XJW33sLv4p" role="30dEs_">
2067720663
<property role="30bXRw" value="1" />
2067820664
</node>
20665+
<node concept="2GTG47" id="XJW33sLuGf" role="30dEsF" />
2067920666
</node>
2068020667
</node>
2068120668
</node>
@@ -20687,42 +20674,6 @@
2068720674
<property role="30bXRw" value="2" />
2068820675
</node>
2068920676
</node>
20690-
<node concept="_fkuZ" id="3HYRP_wF_np" role="_fkp5">
20691-
<node concept="_fku$" id="3HYRP_wF_nq" role="_fkur" />
20692-
<node concept="1QScDb" id="1yEri41h53G" role="_fkuY">
20693-
<node concept="3NG6h4" id="1yEri41he42" role="1QScD9">
20694-
<node concept="3izI60" id="1yEri41he43" role="2lDidJ">
20695-
<node concept="1af_rf" id="1yEri41hmNi" role="2lDidJ">
20696-
<property role="0Rz4W" value="-1258774389" />
20697-
<ref role="1afhQb" node="3GdqffBR5lX" resolve="fakeChange" />
20698-
<node concept="2GTG47" id="3HYRP_wPr9w" role="1afhQ5" />
20699-
</node>
20700-
</node>
20701-
</node>
20702-
<node concept="3iBYfx" id="1yEri41h50e" role="2lDidJ">
20703-
<node concept="30bXRB" id="1yEri41h50m" role="3iBYfI">
20704-
<property role="30bXRw" value="1" />
20705-
</node>
20706-
<node concept="30bXRB" id="1yEri41h51b" role="3iBYfI">
20707-
<property role="30bXRw" value="2" />
20708-
</node>
20709-
<node concept="30bXRB" id="1yEri41h52l" role="3iBYfI">
20710-
<property role="30bXRw" value="3" />
20711-
</node>
20712-
</node>
20713-
</node>
20714-
<node concept="3iBYfx" id="3HYRP_wPrxy" role="_fkuS">
20715-
<node concept="30bXRB" id="3HYRP_wPrxz" role="3iBYfI">
20716-
<property role="30bXRw" value="1" />
20717-
</node>
20718-
<node concept="30bXRB" id="3HYRP_wPrx$" role="3iBYfI">
20719-
<property role="30bXRw" value="2" />
20720-
</node>
20721-
<node concept="30bXRB" id="3HYRP_wPrx_" role="3iBYfI">
20722-
<property role="30bXRw" value="3" />
20723-
</node>
20724-
</node>
20725-
</node>
2072620677
<node concept="3dYjL0" id="3S$dVIhJYfV" role="_fkp5" />
2072720678
<node concept="_fkuZ" id="3S$dVIhJYio" role="_fkp5">
2072820679
<node concept="_fku$" id="3S$dVIhJYip" role="_fkur" />

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

Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,151 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<model ref="r:bf9e472d-86bf-4c7a-bb82-337466312f47(test.in.expr.os.forEachIndex@tests)">
3+
<persistence version="9" />
4+
<languages>
5+
<use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
6+
<use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
7+
<devkit ref="c4e521ab-b605-4ef9-a7c3-68075da058f0(org.iets3.core.expr.core.devkit)" />
8+
</languages>
9+
<imports />
10+
<registry>
11+
<language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
12+
<concept id="5097124989038916362" name="jetbrains.mps.lang.test.structure.TestInfo" flags="ng" index="2XOHcx">
13+
<property id="5097124989038916363" name="projectPath" index="2XOHcw" />
14+
</concept>
15+
</language>
16+
<language id="2f7e2e35-6e74-4c43-9fa5-2465d68f5996" name="org.iets3.core.expr.collections">
17+
<concept id="75413091695536841" name="org.iets3.core.expr.collections.structure.IndexExpr" flags="ng" index="2GTG47" />
18+
<concept id="7554398283339759319" name="org.iets3.core.expr.collections.structure.ListLiteral" flags="ng" index="3iBYfx">
19+
<child id="7554398283339759320" name="elements" index="3iBYfI" />
20+
</concept>
21+
<concept id="9097157441620016186" name="org.iets3.core.expr.collections.structure.ForeachOp" flags="ng" index="3NG6h4" />
22+
</language>
23+
<language id="7b68d745-a7b8-48b9-bd9c-05c0f8725a35" name="org.iets3.core.base">
24+
<concept id="7831630342157089621" name="org.iets3.core.base.structure.IDetectNeedToRunManually" flags="ngI" index="0Rz4o">
25+
<property id="7831630342157089649" name="__hash" index="0Rz4W" />
26+
</concept>
27+
</language>
28+
<language id="cfaa4966-b7d5-4b69-b66a-309a6e1a7290" name="org.iets3.core.expr.base">
29+
<concept id="4261931054731905240" name="org.iets3.core.expr.base.structure.IContainExpressionParam" flags="ngI" index="2lDidI">
30+
<child id="4261931054731905241" name="expr" index="2lDidJ" />
31+
</concept>
32+
<concept id="9002563722476995145" name="org.iets3.core.expr.base.structure.DotExpression" flags="ng" index="1QScDb">
33+
<child id="9002563722476995147" name="target" index="1QScD9" />
34+
</concept>
35+
</language>
36+
<language id="d441fba0-f46b-43cd-b723-dad7b65da615" name="org.iets3.core.expr.tests">
37+
<concept id="543569365052056273" name="org.iets3.core.expr.tests.structure.EqualsTestOp" flags="ng" index="_fku$" />
38+
<concept id="543569365052056263" name="org.iets3.core.expr.tests.structure.TestCase" flags="ng" index="_fkuM">
39+
<child id="543569365052056368" name="items" index="_fkp5" />
40+
</concept>
41+
<concept id="543569365052056266" name="org.iets3.core.expr.tests.structure.AssertTestItem" flags="ng" index="_fkuZ">
42+
<child id="543569365052056302" name="op" index="_fkur" />
43+
<child id="543569365052056269" name="expected" index="_fkuS" />
44+
<child id="543569365052056267" name="actual" index="_fkuY" />
45+
</concept>
46+
<concept id="543569365052711055" name="org.iets3.core.expr.tests.structure.TestSuite" flags="ng" index="_iOnU">
47+
<property id="7740953487931061385" name="referenceOnlyLocalStuff" index="1XBH2A" />
48+
<child id="543569365052711058" name="contents" index="_iOnB" />
49+
</concept>
50+
<concept id="5285810042889815162" name="org.iets3.core.expr.tests.structure.EmptyTestItem" flags="ng" index="3dYjL0" />
51+
</language>
52+
<language id="6b277d9a-d52d-416f-a209-1919bd737f50" name="org.iets3.core.expr.simpleTypes">
53+
<concept id="8219602584782245544" name="org.iets3.core.expr.simpleTypes.structure.NumberType" flags="ng" index="mLuIC" />
54+
<concept id="5115872837157054170" name="org.iets3.core.expr.simpleTypes.structure.NumberLiteral" flags="ng" index="30bXRB">
55+
<property id="5115872837157054173" name="value" index="30bXRw" />
56+
</concept>
57+
</language>
58+
<language id="71934284-d7d1-45ee-a054-8c072591085f" name="org.iets3.core.expr.toplevel">
59+
<concept id="543569365052765011" name="org.iets3.core.expr.toplevel.structure.EmptyToplevelContent" flags="ng" index="_ixoA" />
60+
<concept id="4790956042240570348" name="org.iets3.core.expr.toplevel.structure.FunctionCall" flags="ng" index="1af_rf" />
61+
<concept id="4790956042240148643" name="org.iets3.core.expr.toplevel.structure.Function" flags="ng" index="1aga60" />
62+
</language>
63+
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
64+
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
65+
<property id="1169194664001" name="name" index="TrG5h" />
66+
</concept>
67+
</language>
68+
<language id="9464fa06-5ab9-409b-9274-64ab29588457" name="org.iets3.core.expr.lambda">
69+
<concept id="5096753237482793710" name="org.iets3.core.expr.lambda.structure.ReadModifyEffectTag" flags="ng" index="2lgajY" />
70+
<concept id="4790956042240983401" name="org.iets3.core.expr.lambda.structure.BlockExpression" flags="ng" index="1aduha">
71+
<child id="4790956042240983402" name="expressions" index="1aduh9" />
72+
</concept>
73+
<concept id="4790956042240522396" name="org.iets3.core.expr.lambda.structure.IFunctionCall" flags="ngI" index="1afhQZ">
74+
<reference id="4790956042240522408" name="function" index="1afhQb" />
75+
<child id="4790956042240522406" name="args" index="1afhQ5" />
76+
</concept>
77+
<concept id="4790956042240100911" name="org.iets3.core.expr.lambda.structure.IFunctionLike" flags="ngI" index="1ahQWc">
78+
<child id="3880322347437217307" name="effect" index="28QfE6" />
79+
<child id="4790956042240100927" name="args" index="1ahQWs" />
80+
<child id="4790956042240100950" name="body" index="1ahQXP" />
81+
</concept>
82+
<concept id="4790956042240100929" name="org.iets3.core.expr.lambda.structure.FunctionArgument" flags="ng" index="1ahQXy" />
83+
<concept id="7554398283340318473" name="org.iets3.core.expr.lambda.structure.IArgument" flags="ngI" index="3ix9CZ">
84+
<child id="7554398283340318476" name="type" index="3ix9CU" />
85+
</concept>
86+
<concept id="7554398283340741814" name="org.iets3.core.expr.lambda.structure.ShortLambdaExpression" flags="ng" index="3izI60" />
87+
</language>
88+
</registry>
89+
<node concept="_iOnU" id="cPLa7FqXIK">
90+
<property role="1XBH2A" value="true" />
91+
<property role="TrG5h" value="ForEachIndex" />
92+
<node concept="1aga60" id="3GdqffBR5lX" role="_iOnB">
93+
<property role="TrG5h" value="fakeChange" />
94+
<node concept="1aduha" id="3GdqffBR5n4" role="1ahQXP">
95+
<node concept="30bXRB" id="1NU6gIv_mX_" role="1aduh9">
96+
<property role="30bXRw" value="1" />
97+
</node>
98+
</node>
99+
<node concept="2lgajY" id="4qVjx3k0RYS" role="28QfE6" />
100+
<node concept="1ahQXy" id="3HYRP_wMtRW" role="1ahQWs">
101+
<property role="TrG5h" value="index" />
102+
<node concept="mLuIC" id="3HYRP_wMtX0" role="3ix9CU" />
103+
</node>
104+
</node>
105+
<node concept="_ixoA" id="1NU6gIvMf$b" role="_iOnB" />
106+
<node concept="_fkuM" id="3S$dVIhpjXt" role="_iOnB">
107+
<property role="TrG5h" value="index" />
108+
<node concept="_fkuZ" id="3HYRP_wF_np" role="_fkp5">
109+
<node concept="_fku$" id="3HYRP_wF_nq" role="_fkur" />
110+
<node concept="1QScDb" id="1yEri41h53G" role="_fkuY">
111+
<node concept="3NG6h4" id="1yEri41he42" role="1QScD9">
112+
<node concept="3izI60" id="1yEri41he43" role="2lDidJ">
113+
<node concept="1af_rf" id="1yEri41hmNi" role="2lDidJ">
114+
<property role="0Rz4W" value="-1258774389" />
115+
<ref role="1afhQb" node="3GdqffBR5lX" resolve="fakeChange" />
116+
<node concept="2GTG47" id="3HYRP_wPr9w" role="1afhQ5" />
117+
</node>
118+
</node>
119+
</node>
120+
<node concept="3iBYfx" id="1yEri41h50e" role="2lDidJ">
121+
<node concept="30bXRB" id="1yEri41h50m" role="3iBYfI">
122+
<property role="30bXRw" value="1" />
123+
</node>
124+
<node concept="30bXRB" id="1yEri41h51b" role="3iBYfI">
125+
<property role="30bXRw" value="2" />
126+
</node>
127+
<node concept="30bXRB" id="1yEri41h52l" role="3iBYfI">
128+
<property role="30bXRw" value="3" />
129+
</node>
130+
</node>
131+
</node>
132+
<node concept="3iBYfx" id="3HYRP_wPrxy" role="_fkuS">
133+
<node concept="30bXRB" id="3HYRP_wPrxz" role="3iBYfI">
134+
<property role="30bXRw" value="1" />
135+
</node>
136+
<node concept="30bXRB" id="3HYRP_wPrx$" role="3iBYfI">
137+
<property role="30bXRw" value="2" />
138+
</node>
139+
<node concept="30bXRB" id="3HYRP_wPrx_" role="3iBYfI">
140+
<property role="30bXRw" value="3" />
141+
</node>
142+
</node>
143+
</node>
144+
<node concept="3dYjL0" id="3S$dVIhJYfV" role="_fkp5" />
145+
</node>
146+
</node>
147+
<node concept="2XOHcx" id="4rZeNQ6M9GV">
148+
<property role="2XOHcw" value="${iets3.github.opensource.home}/code/languages/org.iets3.opensource" />
149+
</node>
150+
</model>
151+

‎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
@@ -102,6 +102,7 @@
102102
<language slang="l:2c8e8304-72f7-4e6a-853a-ac0616a47569:org.iets3.core.expr.typetags.lib" version="0" />
103103
<language slang="l:7ee265bd-5986-4709-86ed-2c6daa33cd8c:org.iets3.core.expr.typetags.physunits" version="0" />
104104
<language slang="l:cb91a38e-738a-4811-a96d-448d08f526fa:org.iets3.core.expr.typetags.units" version="1" />
105+
<language slang="l:be679007-4312-4db1-9ac0-ab7dfbe66a74:org.iets3.core.expr.typetags.units.quantity" version="0" />
105106
<language slang="l:8bb1251e-eae5-47ab-9843-33adfae8edaa:org.iets3.core.expr.util" version="7" />
106107
</languageVersions>
107108
<dependencyVersions>

0 commit comments

Comments
 (0)