Skip to content

Commit 6031412

Browse files
author
Alexander Pann
committed
run all pending migrations
1 parent 346d312 commit 6031412

File tree

18 files changed

+1822
-1622
lines changed

18 files changed

+1822
-1622
lines changed

‎code/languages/org.iets3.opensource/.mps/vcs.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
</option>
1212
</component>
1313
<component name="VcsDirectoryMappings">
14-
<mapping directory="$iets3.github.opensource.home$" vcs="Git" />
14+
<mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
1515
</component>
1616
</project>

‎code/languages/org.iets3.opensource/languages/org.iets3.components.functional/org.iets3.components.functional.mpl‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,6 @@
7979
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
8080
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
8181
<language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
82-
<language slang="l:db8bd035-3f51-41d8-8fed-954c202d18be:org.iets3.analysis.base" version="0" />
83-
<language slang="l:f0fd486f-8577-43e9-b671-3d118449c6e7:org.iets3.components.core" version="10" />
84-
<language slang="l:583939be-ded0-4735-a055-a74f8477fc34:org.iets3.core.attributes" version="0" />
85-
<language slang="l:7b68d745-a7b8-48b9-bd9c-05c0f8725a35:org.iets3.core.base" version="0" />
86-
<language slang="l:cfaa4966-b7d5-4b69-b66a-309a6e1a7290:org.iets3.core.expr.base" version="22" />
87-
<language slang="l:2f7e2e35-6e74-4c43-9fa5-2465d68f5996:org.iets3.core.expr.collections" version="11" />
88-
<language slang="l:9464fa06-5ab9-409b-9274-64ab29588457:org.iets3.core.expr.lambda" version="6" />
89-
<language slang="l:f3eafff0-30d2-46d6-9150-f0f3b880ce27:org.iets3.core.expr.path" version="0" />
90-
<language slang="l:71934284-d7d1-45ee-a054-8c072591085f:org.iets3.core.expr.toplevel" version="6" />
9182
</languageVersions>
9283
<dependencyVersions>
9384
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23730,15 +23730,15 @@
2373023730
<ref role="3cqZAo" node="7KDVkAEsa9N" resolve="rightTypeParameters" />
2373123731
</node>
2373223732
<node concept="liA8E" id="7KDVkAEshtb" role="2OqNvi">
23733-
<ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
23733+
<ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
2373423734
</node>
2373523735
</node>
2373623736
<node concept="2OqwBi" id="7KDVkAErYMZ" role="3uHU7B">
2373723737
<node concept="37vLTw" id="7KDVkAErWF9" role="2Oq$k0">
2373823738
<ref role="3cqZAo" node="7KDVkAErVEc" resolve="leftTypeParameters" />
2373923739
</node>
2374023740
<node concept="liA8E" id="7KDVkAEs2OT" role="2OqNvi">
23741-
<ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
23741+
<ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
2374223742
</node>
2374323743
</node>
2374423744
</node>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4415,22 +4415,22 @@
44154415
<node concept="2OqwBi" id="2udM7u8DyDz" role="2Oq$k0">
44164416
<node concept="1Q80Hy" id="2udM7u8Dyyp" role="2Oq$k0" />
44174417
<node concept="liA8E" id="2udM7u8DyTs" role="2OqNvi">
4418-
<ref role="37wK5l" to="f4zo:~EditorCell.getStyle():jetbrains.mps.openapi.editor.style.Style" resolve="getStyle" />
4418+
<ref role="37wK5l" to="f4zo:~EditorCell.getStyle()" resolve="getStyle" />
44194419
</node>
44204420
</node>
44214421
<node concept="liA8E" id="2udM7u8D$2q" role="2OqNvi">
4422-
<ref role="37wK5l" to="hox0:~Style.set(jetbrains.mps.openapi.editor.style.StyleAttribute,java.lang.Object):void" resolve="set" />
4422+
<ref role="37wK5l" to="hox0:~Style.set(jetbrains.mps.openapi.editor.style.StyleAttribute,java.lang.Object)" resolve="set" />
44234423
<node concept="10M0yZ" id="2udM7u8DtRl" role="37wK5m">
44244424
<ref role="3cqZAo" to="5ueo:~StyleAttributes.BACKGROUND_COLOR" resolve="BACKGROUND_COLOR" />
44254425
<ref role="1PxDUh" to="5ueo:~StyleAttributes" resolve="StyleAttributes" />
44264426
</node>
44274427
<node concept="2OqwBi" id="2udM7u8D$LR" role="37wK5m">
44284428
<node concept="2YIFZM" id="3Ib5UJg3U6x" role="2Oq$k0">
4429-
<ref role="37wK5l" to="hox0:~StyleRegistry.getInstance():jetbrains.mps.openapi.editor.style.StyleRegistry" resolve="getInstance" />
4429+
<ref role="37wK5l" to="hox0:~StyleRegistry.getInstance()" resolve="getInstance" />
44304430
<ref role="1Pybhc" to="hox0:~StyleRegistry" resolve="StyleRegistry" />
44314431
</node>
44324432
<node concept="liA8E" id="2udM7u8D_4p" role="2OqNvi">
4433-
<ref role="37wK5l" to="hox0:~StyleRegistry.getSimpleColor(java.awt.Color):java.awt.Color" resolve="getSimpleColor" />
4433+
<ref role="37wK5l" to="hox0:~StyleRegistry.getSimpleColor(java.awt.Color)" resolve="getSimpleColor" />
44344434
<node concept="10M0yZ" id="43wAXFpM$oS" role="37wK5m">
44354435
<ref role="1PxDUh" node="43wAXFpMhrw" resolve="CoverageEditorUtils" />
44364436
<ref role="3cqZAo" node="43wAXFpMyT7" resolve="NOT_COVERED_BG_COLOR" />
@@ -4511,22 +4511,22 @@
45114511
<node concept="2OqwBi" id="43wAXFoL5Qn" role="2Oq$k0">
45124512
<node concept="1Q80Hy" id="43wAXFoL5Qo" role="2Oq$k0" />
45134513
<node concept="liA8E" id="43wAXFoL5Qp" role="2OqNvi">
4514-
<ref role="37wK5l" to="f4zo:~EditorCell.getStyle():jetbrains.mps.openapi.editor.style.Style" resolve="getStyle" />
4514+
<ref role="37wK5l" to="f4zo:~EditorCell.getStyle()" resolve="getStyle" />
45154515
</node>
45164516
</node>
45174517
<node concept="liA8E" id="43wAXFoL5Qq" role="2OqNvi">
4518-
<ref role="37wK5l" to="hox0:~Style.set(jetbrains.mps.openapi.editor.style.StyleAttribute,java.lang.Object):void" resolve="set" />
4518+
<ref role="37wK5l" to="hox0:~Style.set(jetbrains.mps.openapi.editor.style.StyleAttribute,java.lang.Object)" resolve="set" />
45194519
<node concept="10M0yZ" id="43wAXFoL5Qr" role="37wK5m">
45204520
<ref role="3cqZAo" to="5ueo:~StyleAttributes.BACKGROUND_COLOR" resolve="BACKGROUND_COLOR" />
45214521
<ref role="1PxDUh" to="5ueo:~StyleAttributes" resolve="StyleAttributes" />
45224522
</node>
45234523
<node concept="2OqwBi" id="43wAXFoL5Qs" role="37wK5m">
45244524
<node concept="2YIFZM" id="43wAXFoL5Qt" role="2Oq$k0">
4525-
<ref role="37wK5l" to="hox0:~StyleRegistry.getInstance():jetbrains.mps.openapi.editor.style.StyleRegistry" resolve="getInstance" />
4525+
<ref role="37wK5l" to="hox0:~StyleRegistry.getInstance()" resolve="getInstance" />
45264526
<ref role="1Pybhc" to="hox0:~StyleRegistry" resolve="StyleRegistry" />
45274527
</node>
45284528
<node concept="liA8E" id="43wAXFoL5Qu" role="2OqNvi">
4529-
<ref role="37wK5l" to="hox0:~StyleRegistry.getSimpleColor(java.awt.Color):java.awt.Color" resolve="getSimpleColor" />
4529+
<ref role="37wK5l" to="hox0:~StyleRegistry.getSimpleColor(java.awt.Color)" resolve="getSimpleColor" />
45304530
<node concept="10M0yZ" id="43wAXFpM_sv" role="37wK5m">
45314531
<ref role="1PxDUh" node="43wAXFpMhrw" resolve="CoverageEditorUtils" />
45324532
<ref role="3cqZAo" node="43wAXFpMzmM" resolve="COVERED_AND_NOT_INCLUDED_BG_COLOR" />

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/plugin.mps‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2595,7 +2595,7 @@
25952595
<ref role="3cqZAo" node="3fi3fTlpKtC" resolve="le" />
25962596
</node>
25972597
<node concept="2qgKlT" id="XbOhLk5$Ln" role="2OqNvi">
2598-
<ref role="37wK5l" to="5s8v:XbOhLk5ek9" resolve="getLamda" />
2598+
<ref role="37wK5l" to="5s8v:XbOhLk5ek9" resolve="getLambda" />
25992599
</node>
26002600
</node>
26012601
<node concept="37vLTw" id="XbOhLk5rQE" role="37vLTJ">
@@ -2674,7 +2674,7 @@
26742674
<ref role="3cqZAo" node="3fi3fTlpKtC" resolve="le" />
26752675
</node>
26762676
<node concept="2qgKlT" id="XbOhLk5SI_" role="2OqNvi">
2677-
<ref role="37wK5l" to="5s8v:XbOhLk5ekn" resolve="putLamda" />
2677+
<ref role="37wK5l" to="5s8v:XbOhLk5ekn" resolve="putLambda" />
26782678
<node concept="37vLTw" id="XbOhLk5TWD" role="37wK5m">
26792679
<ref role="3cqZAo" node="3fi3fTlpKto" resolve="lambda" />
26802680
</node>
@@ -2700,7 +2700,7 @@
27002700
<ref role="3cqZAo" node="3fi3fTlpKtC" resolve="le" />
27012701
</node>
27022702
<node concept="2qgKlT" id="5s__jxCqyeA" role="2OqNvi">
2703-
<ref role="37wK5l" to="5s8v:5s__jxCqcBE" resolve="getLamdaArg" />
2703+
<ref role="37wK5l" to="5s8v:5s__jxCqcBE" resolve="getLambdaArg" />
27042704
</node>
27052705
</node>
27062706
</node>
@@ -2733,7 +2733,7 @@
27332733
<ref role="3cqZAo" node="3fi3fTlpKtC" resolve="le" />
27342734
</node>
27352735
<node concept="2qgKlT" id="5s__jxCqZgn" role="2OqNvi">
2736-
<ref role="37wK5l" to="5s8v:5s__jxCq8Sv" resolve="putLamdaArg" />
2736+
<ref role="37wK5l" to="5s8v:5s__jxCq8Sv" resolve="putLambdaArg" />
27372737
<node concept="37vLTw" id="5s__jxCr0ql" role="37wK5m">
27382738
<ref role="3cqZAo" node="5s__jxCqyez" resolve="lambdaArg" />
27392739
</node>
@@ -3313,7 +3313,7 @@
33133313
</node>
33143314
</node>
33153315
<node concept="2AHcQZ" id="3fi3fTmWUT9" role="2AJF6D">
3316-
<ref role="2AI5Lk" to="wyt6:~Override" />
3316+
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
33173317
</node>
33183318
</node>
33193319
<node concept="2tJIrI" id="3fi3fTlpKwH" role="jymVt" />
@@ -3650,7 +3650,7 @@
36503650
</node>
36513651
</node>
36523652
<node concept="2AHcQZ" id="3fi3fTmWYbt" role="2AJF6D">
3653-
<ref role="2AI5Lk" to="wyt6:~Override" />
3653+
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
36543654
</node>
36553655
</node>
36563656
<node concept="2tJIrI" id="5s__jxCoR7u" role="jymVt" />

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

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@
7575
<reference id="5455284157993910961" name="concept" index="2pJxaS" />
7676
<child id="5455284157993911099" name="values" index="2pJxcM" />
7777
</concept>
78+
<concept id="6985522012210254362" name="jetbrains.mps.lang.quotation.structure.NodeBuilderPropertyExpression" flags="nn" index="WxPPo">
79+
<child id="6985522012210254363" name="expression" index="WxPPp" />
80+
</concept>
7881
</language>
7982
<language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions">
8083
<concept id="1158700664498" name="jetbrains.mps.lang.actions.structure.NodeFactories" flags="ng" index="37WguZ">
@@ -429,12 +432,14 @@
429432
<ref role="2pJxaS" to="87nw:2dWzqxEBMSc" resolve="Word" />
430433
<node concept="2pJxcG" id="1ikTdkW7bH5" role="2pJxcM">
431434
<ref role="2pJxcJ" to="87nw:2dWzqxEBMSe" resolve="escapedValue" />
432-
<node concept="2OqwBi" id="1ikTdkW6RBA" role="28ntcv">
433-
<node concept="Jnkvi" id="1ikTdkW6RBB" role="2Oq$k0">
434-
<ref role="1M0zk5" node="1ikTdkW6RBG" resolve="stringLiteral" />
435-
</node>
436-
<node concept="3TrcHB" id="1ikTdkW755V" role="2OqNvi">
437-
<ref role="3TsBF5" to="5qo5:4rZeNQ6OYRb" resolve="value" />
435+
<node concept="WxPPo" id="65GPZhBZf1o" role="28ntcv">
436+
<node concept="2OqwBi" id="1ikTdkW6RBA" role="WxPPp">
437+
<node concept="Jnkvi" id="1ikTdkW6RBB" role="2Oq$k0">
438+
<ref role="1M0zk5" node="1ikTdkW6RBG" resolve="stringLiteral" />
439+
</node>
440+
<node concept="3TrcHB" id="1ikTdkW755V" role="2OqNvi">
441+
<ref role="3TsBF5" to="5qo5:4rZeNQ6OYRb" resolve="value" />
442+
</node>
438443
</node>
439444
</node>
440445
</node>
@@ -471,9 +476,11 @@
471476
<ref role="2pJxaS" to="87nw:2dWzqxEBMSc" resolve="Word" />
472477
<node concept="2pJxcG" id="1ikTdkW73vp" role="2pJxcM">
473478
<ref role="2pJxcJ" to="87nw:2dWzqxEBMSe" resolve="escapedValue" />
474-
<node concept="2OqwBi" id="1ikTdkW6REe" role="28ntcv">
475-
<node concept="1r4N5L" id="1ikTdkW6REf" role="2Oq$k0" />
476-
<node concept="2Iv5rx" id="1ikTdkW6REg" role="2OqNvi" />
479+
<node concept="WxPPo" id="65GPZhBZf1p" role="28ntcv">
480+
<node concept="2OqwBi" id="1ikTdkW6REe" role="WxPPp">
481+
<node concept="1r4N5L" id="1ikTdkW6REf" role="2Oq$k0" />
482+
<node concept="2Iv5rx" id="1ikTdkW6REg" role="2OqNvi" />
483+
</node>
477484
</node>
478485
</node>
479486
</node>

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/plugin.mps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1378,7 +1378,7 @@
13781378
</node>
13791379
</node>
13801380
<node concept="2AHcQZ" id="1$atYL2NIrH" role="2AJF6D">
1381-
<ref role="2AI5Lk" to="wyt6:~Override" />
1381+
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
13821382
</node>
13831383
</node>
13841384
<node concept="3clFb_" id="5ye9uPrx1Ac" role="jymVt">

‎code/languages/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/generator/template/[email protected]‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,6 @@
365365
<child id="1235573175711" name="elementType" index="2HTBi0" />
366366
<child id="1235573187520" name="singletonValue" index="2HTEbv" />
367367
</concept>
368-
<concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
369368
<concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
370369
<concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
371370
<concept id="1240325842691" name="jetbrains.mps.baseLanguage.collections.structure.AsSequenceOperation" flags="nn" index="39bAoz" />
@@ -2798,17 +2797,17 @@
27982797
<node concept="3clFbF" id="5I1s5NvyvqV" role="3cqZAp">
27992798
<node concept="2OqwBi" id="5I1s5NvyvUh" role="3clFbG">
28002799
<node concept="37vLTw" id="5I1s5NvyvqU" role="2Oq$k0">
2801-
<ref role="3cqZAo" node="5I1s5NvyuVx" resolve="it" />
2800+
<ref role="3cqZAo" node="65GPZhBZjwx" resolve="it" />
28022801
</node>
28032802
<node concept="3TrEf2" id="3a3EL8S74N7" role="2OqNvi">
28042803
<ref role="3Tt5mk" to="as3y:5I1s5NvuWcp" resolve="plugin" />
28052804
</node>
28062805
</node>
28072806
</node>
28082807
</node>
2809-
<node concept="Rh6nW" id="5I1s5NvyuVx" role="1bW2Oz">
2808+
<node concept="gl6BB" id="65GPZhBZjwx" role="1bW2Oz">
28102809
<property role="TrG5h" value="it" />
2811-
<node concept="2jxLKc" id="5I1s5NvyuVy" role="1tU5fm" />
2810+
<node concept="2jxLKc" id="65GPZhBZjwy" role="1tU5fm" />
28122811
</node>
28132812
</node>
28142813
</node>
@@ -2950,7 +2949,7 @@
29502949
</node>
29512950
<node concept="2OqwBi" id="3vNUe1zfYUL" role="3uHU7B">
29522951
<node concept="37vLTw" id="3vNUe1zfYhA" role="2Oq$k0">
2953-
<ref role="3cqZAo" node="3vNUe1zfXzC" resolve="it" />
2952+
<ref role="3cqZAo" node="65GPZhBZjwz" resolve="it" />
29542953
</node>
29552954
<node concept="2Xjw5R" id="3vNUe1zfZC8" role="2OqNvi">
29562955
<node concept="1xMEDy" id="3vNUe1zfZCa" role="1xVPHs">
@@ -2963,9 +2962,9 @@
29632962
</node>
29642963
</node>
29652964
</node>
2966-
<node concept="Rh6nW" id="3vNUe1zfXzC" role="1bW2Oz">
2965+
<node concept="gl6BB" id="65GPZhBZjwz" role="1bW2Oz">
29672966
<property role="TrG5h" value="it" />
2968-
<node concept="2jxLKc" id="3vNUe1zfXzD" role="1tU5fm" />
2967+
<node concept="2jxLKc" id="65GPZhBZjw$" role="1tU5fm" />
29692968
</node>
29702969
</node>
29712970
</node>
@@ -3125,7 +3124,7 @@
31253124
<node concept="3clFbC" id="3vNUe1zg4S2" role="3clFbG">
31263125
<node concept="2OqwBi" id="3vNUe1zg3qu" role="3uHU7B">
31273126
<node concept="37vLTw" id="3vNUe1zg3qv" role="2Oq$k0">
3128-
<ref role="3cqZAo" node="3vNUe1zg3qz" resolve="it" />
3127+
<ref role="3cqZAo" node="65GPZhBZjw_" resolve="it" />
31293128
</node>
31303129
<node concept="2Xjw5R" id="3vNUe1zg3qw" role="2OqNvi">
31313130
<node concept="1xMEDy" id="3vNUe1zg3qx" role="1xVPHs">
@@ -3141,9 +3140,9 @@
31413140
</node>
31423141
</node>
31433142
</node>
3144-
<node concept="Rh6nW" id="3vNUe1zg3qz" role="1bW2Oz">
3143+
<node concept="gl6BB" id="65GPZhBZjw_" role="1bW2Oz">
31453144
<property role="TrG5h" value="it" />
3146-
<node concept="2jxLKc" id="3vNUe1zg3q$" role="1tU5fm" />
3145+
<node concept="2jxLKc" id="65GPZhBZjwA" role="1tU5fm" />
31473146
</node>
31483147
</node>
31493148
</node>

‎code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.math.interpreter/org.iets3.core.expr.math.interpreter.msd‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,9 @@
1111
<facets>
1212
<facet type="java" compile="mps" classes="mps" ext="yes">
1313
<classes generated="true" path="${module}/classes_gen" />
14+
<library location="${module}/lib/big-math.jar" />
1415
</facet>
1516
</facets>
16-
<stubModelEntries>
17-
<stubModelEntry path="${module}/lib/big-math.jar" />
18-
</stubModelEntries>
1917
<dependencies>
2018
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
2119
<dependency reexport="false">6b277d9a-d52d-416f-a209-1919bd737f50(org.iets3.core.expr.simpleTypes)</dependency>

0 commit comments

Comments
 (0)