Skip to content

Commit a5153b3

Browse files
authored
Merge pull request #1254 from IETS3/refactor/ApplyMigration
Refactor/apply migration
2 parents d44e758 + b6373fa commit a5153b3

File tree

136 files changed

+685
-695
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+685
-695
lines changed

code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/plugin.mps

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
<child id="1068498886297" name="rValue" index="37vLTx" />
125125
<child id="1068498886295" name="lValue" index="37vLTJ" />
126126
</concept>
127-
<concept id="2323553266850475941" name="jetbrains.mps.baseLanguage.structure.IHasModifiers" flags="ng" index="2frcj7">
127+
<concept id="2323553266850475941" name="jetbrains.mps.baseLanguage.structure.IHasModifiers" flags="ngI" index="2frcj7">
128128
<child id="2323553266850475953" name="modifiers" index="2frcjj" />
129129
</concept>
130130
<concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
@@ -142,7 +142,7 @@
142142
<concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
143143
<reference id="1188208074048" name="annotation" index="2AI5Lk" />
144144
</concept>
145-
<concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
145+
<concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
146146
<child id="1188208488637" name="annotation" index="2AJF6D" />
147147
</concept>
148148
<concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -221,7 +221,7 @@
221221
<property id="1176718929932" name="isFinal" index="3TUv4t" />
222222
<child id="1068431790190" name="initializer" index="33vP2m" />
223223
</concept>
224-
<concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
224+
<concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
225225
<property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
226226
</concept>
227227
<concept id="1109279763828" name="jetbrains.mps.baseLanguage.structure.TypeVariableDeclaration" flags="ng" index="16euLQ" />
@@ -302,7 +302,7 @@
302302
<child id="1160998896846" name="condition" index="1gVkn0" />
303303
<child id="1160998916832" name="message" index="1gVpfI" />
304304
</concept>
305-
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
305+
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
306306
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
307307
<child id="1068499141038" name="actualArgument" index="37wK5m" />
308308
<child id="4972241301747169160" name="typeArgument" index="3PaCim" />
@@ -337,7 +337,7 @@
337337
<child id="8276990574895933172" name="throwable" index="1zc67B" />
338338
</concept>
339339
<concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
340-
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
340+
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
341341
<child id="1178549979242" name="visibility" index="1B3o_S" />
342342
</concept>
343343
<concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -464,7 +464,7 @@
464464
<concept id="1213999088275" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldDeclaration" flags="ig" index="2BZ0e9" />
465465
<concept id="1213999117680" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldAccessOperation" flags="nn" index="2BZ7hE" />
466466
<concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
467-
<concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
467+
<concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
468468
<reference id="1205756909548" name="member" index="2WH_rO" />
469469
</concept>
470470
</language>
@@ -532,7 +532,7 @@
532532
<property id="1193676396447" name="virtualPackage" index="3GE5qa" />
533533
<child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
534534
</concept>
535-
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
535+
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
536536
<property id="1169194664001" name="name" index="TrG5h" />
537537
</concept>
538538
<concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">

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

Lines changed: 0 additions & 10 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" />
@@ -116,7 +107,6 @@
116107
<module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
117108
<module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
118109
<module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
119-
<module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
120110
<module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
121111
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
122112
<module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />

code/languages/org.iets3.opensource/languages/org.iets3.components.hardware/org.iets3.components.hardware.mpl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@
9696
<module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
9797
<module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
9898
<module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
99-
<module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
10099
<module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
101100
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
102101
<module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />

code/languages/org.iets3.opensource/languages/org.iets3.components.req/models/editor.mps

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
4444
<property id="1073389577007" name="text" index="3F0ifm" />
4545
</concept>
46-
<concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
46+
<concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
4747
<child id="1219418656006" name="styleItem" index="3F10Kt" />
4848
</concept>
4949
<concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
@@ -74,7 +74,7 @@
7474
<concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
7575
<property id="1068580320021" name="value" index="3cmrfH" />
7676
</concept>
77-
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
77+
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
7878
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
7979
<child id="1068499141038" name="actualArgument" index="37wK5m" />
8080
</concept>

code/languages/org.iets3.opensource/languages/org.iets3.components.toplevel.adapter/org.iets3.components.toplevel.adapter.mpl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383
<module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
8484
<module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
8585
<module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
86-
<module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
8786
<module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
8887
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
8988
<module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />

code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/editor.mps

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@
7878
</concept>
7979
<concept id="1186414860679" name="jetbrains.mps.lang.editor.structure.EditableStyleClassItem" flags="ln" index="VPxyj" />
8080
<concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
81-
<concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ng" index="2Z_bC8">
81+
<concept id="1630016958697718209" name="jetbrains.mps.lang.editor.structure.IMenuReference_Default" flags="ngI" index="2Z_bC8">
8282
<reference id="1630016958698373342" name="concept" index="2ZyFGn" />
8383
</concept>
84-
<concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
84+
<concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ngI" index="2ZABuq">
8585
<reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
8686
<child id="5991739802479788259" name="type" index="22hAXT" />
8787
</concept>
@@ -121,7 +121,7 @@
121121
<concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
122122
<property id="1073389577007" name="text" index="3F0ifm" />
123123
</concept>
124-
<concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
124+
<concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
125125
<child id="1219418656006" name="styleItem" index="3F10Kt" />
126126
</concept>
127127
<concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
@@ -180,7 +180,7 @@
180180
<property id="1068580123138" name="value" index="3clFbU" />
181181
</concept>
182182
<concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
183-
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
183+
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
184184
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
185185
<child id="1068499141038" name="actualArgument" index="37wK5m" />
186186
</concept>
@@ -267,7 +267,7 @@
267267
<concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
268268
<property id="1193676396447" name="virtualPackage" index="3GE5qa" />
269269
</concept>
270-
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
270+
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
271271
<property id="1169194664001" name="name" index="TrG5h" />
272272
</concept>
273273
</language>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<child id="1068498886297" name="rValue" index="37vLTx" />
5656
<child id="1068498886295" name="lValue" index="37vLTJ" />
5757
</concept>
58-
<concept id="2323553266850475941" name="jetbrains.mps.baseLanguage.structure.IHasModifiers" flags="ng" index="2frcj7">
58+
<concept id="2323553266850475941" name="jetbrains.mps.baseLanguage.structure.IHasModifiers" flags="ngI" index="2frcj7">
5959
<child id="2323553266850475953" name="modifiers" index="2frcjj" />
6060
</concept>
6161
<concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
@@ -68,7 +68,7 @@
6868
<reference id="1188208074048" name="annotation" index="2AI5Lk" />
6969
<child id="1188214630783" name="value" index="2B76xF" />
7070
</concept>
71-
<concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
71+
<concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
7272
<child id="1188208488637" name="annotation" index="2AJF6D" />
7373
</concept>
7474
<concept id="1188214545140" name="jetbrains.mps.baseLanguage.structure.AnnotationInstanceValue" flags="ng" index="2B6LJw">
@@ -179,7 +179,7 @@
179179
<concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
180180
<child id="1081516765348" name="expression" index="3fr31v" />
181181
</concept>
182-
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
182+
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
183183
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
184184
<child id="1068499141038" name="actualArgument" index="37wK5m" />
185185
</concept>
@@ -204,7 +204,7 @@
204204
<child id="8276990574895933172" name="throwable" index="1zc67B" />
205205
</concept>
206206
<concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
207-
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
207+
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
208208
<child id="1178549979242" name="visibility" index="1B3o_S" />
209209
</concept>
210210
<concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615">
@@ -297,7 +297,7 @@
297297
<property id="1193676396447" name="virtualPackage" index="3GE5qa" />
298298
<child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
299299
</concept>
300-
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
300+
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
301301
<property id="1169194664001" name="name" index="TrG5h" />
302302
</concept>
303303
<concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">

code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/models/typesystem.mps

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
<concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
8989
<child id="1081516765348" name="expression" index="3fr31v" />
9090
</concept>
91-
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
91+
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
9292
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
9393
<child id="1068499141038" name="actualArgument" index="37wK5m" />
9494
</concept>
@@ -240,7 +240,7 @@
240240
<concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
241241
<property id="1193676396447" name="virtualPackage" index="3GE5qa" />
242242
</concept>
243-
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
243+
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
244244
<property id="1169194664001" name="name" index="TrG5h" />
245245
</concept>
246246
</language>

0 commit comments

Comments
 (0)