Skip to content

Commit 9f70226

Browse files
author
Alexander Pann
authored
Merge pull request #2836 from mbeddr/bugfix/fix_migrations
Fix some migrations and run re-runnable migrations
2 parents 24575e4 + c00a050 commit 9f70226

File tree

10 files changed

+116
-74
lines changed

10 files changed

+116
-74
lines changed

‎code/languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements.c/languageModels/intentions.mps

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@
176176
</concept>
177177
</language>
178178
<language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
179+
<concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
179180
<concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
180181
<child id="1199569906740" name="parameter" index="1bW2Oz" />
181182
<child id="1199569916463" name="body" index="1bW5cS" />
@@ -272,7 +273,6 @@
272273
<concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
273274
<reference id="1153944258490" name="variable" index="2Gs0qQ" />
274275
</concept>
275-
<concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
276276
<concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
277277
<concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
278278
<concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -980,15 +980,15 @@
980980
<node concept="3clFbF" id="4yPv6wmQBIT" role="3cqZAp">
981981
<node concept="2OqwBi" id="4yPv6wmQBXP" role="3clFbG">
982982
<node concept="37vLTw" id="4yPv6wmQBIS" role="2Oq$k0">
983-
<ref role="3cqZAo" node="4yPv6wmQBkB" resolve="it" />
983+
<ref role="3cqZAo" node="7Pdkyu9BxQI" resolve="it" />
984984
</node>
985985
<node concept="2Rf3mk" id="4yPv6wmQCO$" role="2OqNvi" />
986986
</node>
987987
</node>
988988
</node>
989-
<node concept="Rh6nW" id="4yPv6wmQBkB" role="1bW2Oz">
989+
<node concept="gl6BB" id="7Pdkyu9BxQI" role="1bW2Oz">
990990
<property role="TrG5h" value="it" />
991-
<node concept="2jxLKc" id="4yPv6wmQBkC" role="1tU5fm" />
991+
<node concept="2jxLKc" id="7Pdkyu9BxQJ" role="1tU5fm" />
992992
</node>
993993
</node>
994994
</node>
@@ -1009,7 +1009,7 @@
10091009
<node concept="2OqwBi" id="4rj4sdBt67j" role="3clFbG">
10101010
<node concept="2JrnkZ" id="4rj4sdBt67k" role="2Oq$k0">
10111011
<node concept="37vLTw" id="4rj4sdBt67l" role="2JrQYb">
1012-
<ref role="3cqZAo" node="4rj4sdBt67o" resolve="it" />
1012+
<ref role="3cqZAo" node="7Pdkyu9BxQK" resolve="it" />
10131013
</node>
10141014
</node>
10151015
<node concept="liA8E" id="4rj4sdBt67m" role="2OqNvi">
@@ -1021,9 +1021,9 @@
10211021
</node>
10221022
</node>
10231023
</node>
1024-
<node concept="Rh6nW" id="4rj4sdBt67o" role="1bW2Oz">
1024+
<node concept="gl6BB" id="7Pdkyu9BxQK" role="1bW2Oz">
10251025
<property role="TrG5h" value="it" />
1026-
<node concept="2jxLKc" id="4rj4sdBt67p" role="1tU5fm" />
1026+
<node concept="2jxLKc" id="7Pdkyu9BxQL" role="1tU5fm" />
10271027
</node>
10281028
</node>
10291029
</node>
@@ -1061,7 +1061,7 @@
10611061
<node concept="liA8E" id="3$DH87aKa4T" role="2OqNvi">
10621062
<ref role="37wK5l" to="qdxw:3$DH87aGXjx" resolve="clearDependentNodes" />
10631063
<node concept="37vLTw" id="3$DH87aKa7P" role="37wK5m">
1064-
<ref role="3cqZAo" node="3$DH87aK9L_" resolve="debuggable" />
1064+
<ref role="3cqZAo" node="7Pdkyu9BxQO" resolve="debuggable" />
10651065
</node>
10661066
</node>
10671067
</node>
@@ -1084,7 +1084,7 @@
10841084
<ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
10851085
<node concept="3cpWs3" id="4rj4sdBt5Dk" role="37wK5m">
10861086
<node concept="37vLTw" id="4rj4sdBt5Wg" role="3uHU7w">
1087-
<ref role="3cqZAo" node="4rj4sdBsE8U" resolve="dependency" />
1087+
<ref role="3cqZAo" node="7Pdkyu9BxQM" resolve="dependency" />
10881088
</node>
10891089
<node concept="3cpWs3" id="4rj4sdBt4Sw" role="3uHU7B">
10901090
<node concept="3cpWs3" id="5TykNF$uAAK" role="3uHU7B">
@@ -1093,7 +1093,7 @@
10931093
</node>
10941094
<node concept="2OqwBi" id="6tcu$9nt9wv" role="3uHU7w">
10951095
<node concept="37vLTw" id="5TykNF$uABm" role="2Oq$k0">
1096-
<ref role="3cqZAo" node="3$DH87aK9L_" resolve="debuggable" />
1096+
<ref role="3cqZAo" node="7Pdkyu9BxQO" resolve="debuggable" />
10971097
</node>
10981098
<node concept="2Iv5rx" id="6tcu$9nt9ww" role="2OqNvi" />
10991099
</node>
@@ -1114,10 +1114,10 @@
11141114
<node concept="liA8E" id="3$DH87aKb58" role="2OqNvi">
11151115
<ref role="37wK5l" to="qdxw:3$DH87aGNdp" resolve="registerDependentNode" />
11161116
<node concept="37vLTw" id="3$DH87aKb8Q" role="37wK5m">
1117-
<ref role="3cqZAo" node="3$DH87aK9L_" resolve="debuggable" />
1117+
<ref role="3cqZAo" node="7Pdkyu9BxQO" resolve="debuggable" />
11181118
</node>
11191119
<node concept="37vLTw" id="4rj4sdBsF3T" role="37wK5m">
1120-
<ref role="3cqZAo" node="4rj4sdBsE8U" resolve="dependency" />
1120+
<ref role="3cqZAo" node="7Pdkyu9BxQM" resolve="dependency" />
11211121
</node>
11221122
</node>
11231123
</node>
@@ -1130,7 +1130,7 @@
11301130
<node concept="liA8E" id="3$DH87aKbQF" role="2OqNvi">
11311131
<ref role="37wK5l" to="qdxw:3$DH87aG$ie" resolve="setShowDebugger" />
11321132
<node concept="37vLTw" id="3$DH87aKbU6" role="37wK5m">
1133-
<ref role="3cqZAo" node="3$DH87aK9L_" resolve="debuggable" />
1133+
<ref role="3cqZAo" node="7Pdkyu9BxQO" resolve="debuggable" />
11341134
</node>
11351135
<node concept="37vLTw" id="3$DH87aKc0t" role="37wK5m">
11361136
<ref role="3cqZAo" node="3$DH87aKbhg" resolve="expanded" />
@@ -1139,18 +1139,18 @@
11391139
</node>
11401140
</node>
11411141
</node>
1142-
<node concept="Rh6nW" id="4rj4sdBsE8U" role="1bW2Oz">
1142+
<node concept="gl6BB" id="7Pdkyu9BxQM" role="1bW2Oz">
11431143
<property role="TrG5h" value="dependency" />
1144-
<node concept="2jxLKc" id="4rj4sdBsE8V" role="1tU5fm" />
1144+
<node concept="2jxLKc" id="7Pdkyu9BxQN" role="1tU5fm" />
11451145
</node>
11461146
</node>
11471147
</node>
11481148
</node>
11491149
</node>
11501150
</node>
1151-
<node concept="Rh6nW" id="3$DH87aK9L_" role="1bW2Oz">
1151+
<node concept="gl6BB" id="7Pdkyu9BxQO" role="1bW2Oz">
11521152
<property role="TrG5h" value="debuggable" />
1153-
<node concept="2jxLKc" id="3$DH87aK9LA" role="1tU5fm" />
1153+
<node concept="2jxLKc" id="7Pdkyu9BxQP" role="1tU5fm" />
11541154
</node>
11551155
</node>
11561156
</node>
@@ -1320,7 +1320,7 @@
13201320
<node concept="3clFbF" id="$bJ0jgVdgU" role="3cqZAp">
13211321
<node concept="2OqwBi" id="$bJ0jgVdgW" role="3clFbG">
13221322
<node concept="37vLTw" id="$bJ0jgVdgX" role="2Oq$k0">
1323-
<ref role="3cqZAo" node="$bJ0jgVdh1" resolve="it" />
1323+
<ref role="3cqZAo" node="7Pdkyu9BxQQ" resolve="it" />
13241324
</node>
13251325
<node concept="2qgKlT" id="dfV14BYJk0" role="2OqNvi">
13261326
<ref role="37wK5l" to="hkt1:dfV14BYish" resolve="setDebuggedTest" />
@@ -1329,9 +1329,9 @@
13291329
</node>
13301330
</node>
13311331
</node>
1332-
<node concept="Rh6nW" id="$bJ0jgVdh1" role="1bW2Oz">
1332+
<node concept="gl6BB" id="7Pdkyu9BxQQ" role="1bW2Oz">
13331333
<property role="TrG5h" value="it" />
1334-
<node concept="2jxLKc" id="$bJ0jgVdh2" role="1tU5fm" />
1334+
<node concept="2jxLKc" id="7Pdkyu9BxQR" role="1tU5fm" />
13351335
</node>
13361336
</node>
13371337
</node>

‎code/languages/com.mbeddr.core/languages/com.mbeddr.core.make/languageModels/migration.mps

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,7 @@
290290
<child id="540871147943773366" name="argument" index="25WWJ7" />
291291
</concept>
292292
<concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
293+
<concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
293294
<concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
294295
<concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
295296
<concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
@@ -511,6 +512,32 @@
511512
</node>
512513
</node>
513514
</node>
515+
<node concept="3clFbF" id="7Pdkyu9A0Cj" role="3cqZAp">
516+
<node concept="2OqwBi" id="7Pdkyu9A9O9" role="3clFbG">
517+
<node concept="2OqwBi" id="7Pdkyu9A13M" role="2Oq$k0">
518+
<node concept="37vLTw" id="7Pdkyu9A0Ch" role="2Oq$k0">
519+
<ref role="3cqZAo" node="2SR9xrsN1Id" resolve="it" />
520+
</node>
521+
<node concept="3Tsc0h" id="7Pdkyu9A6w2" role="2OqNvi">
522+
<ref role="3TtcxE" to="i2y7:4T_y5Me_pOo" resolve="commands_old" />
523+
</node>
524+
</node>
525+
<node concept="2Kehj3" id="7Pdkyu9AcHL" role="2OqNvi" />
526+
</node>
527+
</node>
528+
<node concept="3clFbF" id="7Pdkyu9Adw7" role="3cqZAp">
529+
<node concept="2OqwBi" id="7Pdkyu9AipF" role="3clFbG">
530+
<node concept="2OqwBi" id="7Pdkyu9Ae1U" role="2Oq$k0">
531+
<node concept="37vLTw" id="7Pdkyu9Adw5" role="2Oq$k0">
532+
<ref role="3cqZAo" node="2SR9xrsN1Id" resolve="it" />
533+
</node>
534+
<node concept="3Tsc0h" id="7Pdkyu9AeNc" role="2OqNvi">
535+
<ref role="3TtcxE" to="i2y7:6_CUGSFJ0IW" resolve="targets_old" />
536+
</node>
537+
</node>
538+
<node concept="2Kehj3" id="7Pdkyu9Ao4w" role="2OqNvi" />
539+
</node>
540+
</node>
514541
</node>
515542
<node concept="gl6BB" id="2SR9xrsN1Id" role="1bW2Oz">
516543
<property role="TrG5h" value="it" />

‎code/languages/com.mbeddr.core/languages/com.mbeddr.core.statements/languageModels/migration.mps

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -243,12 +243,17 @@
243243
<node concept="3clFbS" id="1iWV611fiil" role="1bW5cS">
244244
<node concept="3clFbF" id="1iWV611fiim" role="3cqZAp">
245245
<node concept="2OqwBi" id="1iWV611fiin" role="3clFbG">
246-
<node concept="2OqwBi" id="1iWV611fiio" role="2Oq$k0">
247-
<node concept="37vLTw" id="1iWV611fiip" role="2Oq$k0">
248-
<ref role="3cqZAo" node="2SR9xrsN1QQ" resolve="it" />
246+
<node concept="2OqwBi" id="7Pdkyu9B5pJ" role="2Oq$k0">
247+
<node concept="2OqwBi" id="1iWV611fiio" role="2Oq$k0">
248+
<node concept="37vLTw" id="1iWV611fiip" role="2Oq$k0">
249+
<ref role="3cqZAo" node="2SR9xrsN1QQ" resolve="it" />
250+
</node>
251+
<node concept="3TrEf2" id="1iWV611fiiq" role="2OqNvi">
252+
<ref role="3Tt5mk" to="c4fa:2I09F8VK$gF" resolve="elsePart" />
253+
</node>
249254
</node>
250-
<node concept="3TrEf2" id="1iWV611fiiq" role="2OqNvi">
251-
<ref role="3Tt5mk" to="c4fa:2I09F8VK$gF" resolve="elsePart" />
255+
<node concept="3TrEf2" id="7Pdkyu9B658" role="2OqNvi">
256+
<ref role="3Tt5mk" to="c4fa:1iWV611dFCL" resolve="body" />
252257
</node>
253258
</node>
254259
<node concept="1mIQ4w" id="1iWV611fiir" role="2OqNvi">
@@ -277,7 +282,9 @@
277282
<node concept="3cpWs8" id="1iWV611fm7B" role="3cqZAp">
278283
<node concept="3cpWsn" id="1iWV611fm7C" role="3cpWs9">
279284
<property role="TrG5h" value="elsePartSM" />
280-
<node concept="3Tqbb2" id="1iWV611fm7p" role="1tU5fm" />
285+
<node concept="3Tqbb2" id="1iWV611fm7p" role="1tU5fm">
286+
<ref role="ehGHo" to="c4fa:1iWV611dFzA" resolve="ElsePart" />
287+
</node>
281288
<node concept="2OqwBi" id="1iWV611fm7D" role="33vP2m">
282289
<node concept="2GrUjf" id="1iWV611fm7E" role="2Oq$k0">
283290
<ref role="2Gs0qQ" node="1iWV611fk4y" resolve="oldIf" />
@@ -313,8 +320,13 @@
313320
<node concept="chp4Y" id="79i$vAY5ZdW" role="3oSUPX">
314321
<ref role="cht4Q" to="c4fa:3CmSUB7Fp_l" resolve="StatementList" />
315322
</node>
316-
<node concept="37vLTw" id="1iWV611fFZX" role="1m5AlR">
317-
<ref role="3cqZAo" node="1iWV611fm7C" resolve="elsePartSM" />
323+
<node concept="2OqwBi" id="7Pdkyu9B9dG" role="1m5AlR">
324+
<node concept="37vLTw" id="1iWV611fFZX" role="2Oq$k0">
325+
<ref role="3cqZAo" node="1iWV611fm7C" resolve="elsePartSM" />
326+
</node>
327+
<node concept="3TrEf2" id="7Pdkyu9B9Gj" role="2OqNvi">
328+
<ref role="3Tt5mk" to="c4fa:1iWV611dFCL" resolve="body" />
329+
</node>
318330
</node>
319331
</node>
320332
<node concept="2OqwBi" id="1iWV611fFkc" role="37vLTJ">

‎code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/structure.mps

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<model ref="r:61d840b4-12c1-49ea-b142-b2a1550a9b15(com.mbeddr.core.udt.structure)">
33
<persistence version="9" />
44
<languages>
5+
<use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
56
<devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
67
</languages>
78
<imports>

‎code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/udt.mpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@
108108
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
109109
<language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
110110
<language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
111+
<language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
111112
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
112113
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
113114
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
@@ -172,6 +173,7 @@
172173
<module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />
173174
<module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
174175
<module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
176+
<module reference="daafa647-f1f7-4b0b-b096-69cd7c8408c0(jetbrains.mps.baseLanguage.regexp)" version="0" />
175177
<module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
176178
<module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
177179
<module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />

0 commit comments

Comments
 (0)