Skip to content

Commit b0ec3b7

Browse files
sergej-koscejevsergej-koscejev
authored
Merge pull request #244 from mbeddr/merge/MPS-2024.1-partial
Merge 2023.2 → 2024.1
2 parents 579f392 + e19fd59 commit b0ec3b7

File tree

20 files changed

+436
-201
lines changed

20 files changed

+436
-201
lines changed

‎code/languages/org.mpsqa.arch/.mps/modules.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<modulePath path="$PROJECT_DIR$/languages/test.org.mpsqa.arch.baselang/test.org.mpsqa.arch.baselang.mpl" folder="test" />
77
<modulePath path="$PROJECT_DIR$/languages/test.org.mpsqa.arch.ext.ext/test.org.mpsqa.arch.ext.ext.mpl" folder="test" />
88
<modulePath path="$PROJECT_DIR$/languages/test.org.mpsqa.arch.ext/test.org.mpsqa.arch.ext.mpl" folder="test" />
9+
<modulePath path="$PROJECT_DIR$/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/test.org.mpsqa.arch.language_no_other_shall_depend_upon.mpl" folder="" />
910
<modulePath path="$PROJECT_DIR$/solutions/org.mpsqa.arch.pluginSolution/org.mpsqa.arch.pluginSolution.msd" folder="" />
1011
<modulePath path="$PROJECT_DIR$/solutions/org.mpsqa.arch.sandbox/org.mpsqa.arch.sandbox.msd" folder="" />
1112
<modulePath path="$PROJECT_DIR$/solutions/test.org.mpsqa.arch.testdata/test.org.mpsqa.arch.testdata.msd" folder="test" />

‎code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.editor.mps‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1169,5 +1169,23 @@
11691169
</node>
11701170
<node concept="22hDWj" id="Te1zv$IzfP" role="22hAXT" />
11711171
</node>
1172+
<node concept="24kQdi" id="yxqw$qsTSZ">
1173+
<property role="3GE5qa" value="dependencies" />
1174+
<ref role="1XX52x" to="ryx8:yxqw$qsTSY" resolve="ForbiddenDependency" />
1175+
<node concept="3EZMnI" id="yxqw$qsTT1" role="2wV5jI">
1176+
<node concept="3F0ifn" id="yxqw$qsTT2" role="3EZMnx">
1177+
<property role="3F0ifm" value="forbidden dependency:" />
1178+
<node concept="VechU" id="yxqw$qsU2l" role="3F10Kt">
1179+
<property role="Vb096" value="fLwANPn/red" />
1180+
</node>
1181+
</node>
1182+
<node concept="3F2HdR" id="yxqw$qsTT3" role="3EZMnx">
1183+
<property role="2czwfO" value="," />
1184+
<ref role="1NtTu8" to="ryx8:6MUZd5UjK7L" resolve="dependsOn" />
1185+
<node concept="2iRfu4" id="yxqw$qsTT4" role="2czzBx" />
1186+
</node>
1187+
<node concept="2iRfu4" id="yxqw$qsTT5" role="2iSdaV" />
1188+
</node>
1189+
</node>
11721190
</model>
11731191

‎code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.structure.mps‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,5 +264,13 @@
264264
<property role="TrG5h" value="NODE_LOCK" />
265265
</node>
266266
</node>
267+
<node concept="1TIwiD" id="yxqw$qsTSY">
268+
<property role="EcuMT" value="621894810884873790" />
269+
<property role="3GE5qa" value="dependencies" />
270+
<property role="TrG5h" value="ForbiddenDependency" />
271+
<property role="34LRSv" value="forbidden dependency" />
272+
<property role="R4oN_" value="a dependency which is forbidden" />
273+
<ref role="1TJDcQ" node="6MUZd5Uj9MQ" resolve="ComponentDependency" />
274+
</node>
267275
</model>
268276

‎code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.typesystem.mps‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2738,5 +2738,84 @@
27382738
</node>
27392739
</node>
27402740
</node>
2741+
<node concept="18kY7G" id="yxqw$qsU2m">
2742+
<property role="TrG5h" value="check_ForbiddenDependency" />
2743+
<property role="3GE5qa" value="dependencies" />
2744+
<node concept="3clFbS" id="yxqw$qsU2n" role="18ibNy">
2745+
<node concept="2Gpval" id="yxqw$qsU35" role="3cqZAp">
2746+
<node concept="2GrKxI" id="yxqw$qsU36" role="2Gsz3X">
2747+
<property role="TrG5h" value="dep" />
2748+
</node>
2749+
<node concept="2OqwBi" id="yxqw$qsUey" role="2GsD0m">
2750+
<node concept="1YBJjd" id="yxqw$qsU3t" role="2Oq$k0">
2751+
<ref role="1YBMHb" node="yxqw$qsU2p" resolve="forbiddenDependency" />
2752+
</node>
2753+
<node concept="3Tsc0h" id="yxqw$qsW4s" role="2OqNvi">
2754+
<ref role="3TtcxE" to="ryx8:6MUZd5UjK7L" resolve="dependsOn" />
2755+
</node>
2756+
</node>
2757+
<node concept="3clFbS" id="yxqw$qsU38" role="2LFqv$">
2758+
<node concept="3clFbJ" id="yxqw$qsW8U" role="3cqZAp">
2759+
<node concept="3fqX7Q" id="yxqw$qsXb7" role="3clFbw">
2760+
<node concept="2OqwBi" id="yxqw$qsXb9" role="3fr31v">
2761+
<node concept="2OqwBi" id="yxqw$qsXba" role="2Oq$k0">
2762+
<node concept="2GrUjf" id="yxqw$qsXbb" role="2Oq$k0">
2763+
<ref role="2Gs0qQ" node="yxqw$qsU36" resolve="dep" />
2764+
</node>
2765+
<node concept="3TrcHB" id="yxqw$qsXbc" role="2OqNvi">
2766+
<ref role="3TsBF5" to="ryx8:Te1zv$_jA0" resolve="lock" />
2767+
</node>
2768+
</node>
2769+
<node concept="21noJN" id="yxqw$qsXbd" role="2OqNvi">
2770+
<node concept="21nZrQ" id="yxqw$qsXbe" role="21noJM">
2771+
<ref role="21nZrZ" to="ryx8:GdL2WcU97I" resolve="NODE_LOCK" />
2772+
</node>
2773+
</node>
2774+
</node>
2775+
</node>
2776+
<node concept="3clFbS" id="yxqw$qsW8W" role="3clFbx">
2777+
<node concept="2MkqsV" id="yxqw$qsZgg" role="3cqZAp">
2778+
<node concept="Xl_RD" id="yxqw$qsZgp" role="2MkJ7o">
2779+
<property role="Xl_RC" value="all forbidden dependencies shall be NODE locked" />
2780+
</node>
2781+
<node concept="2GrUjf" id="yxqw$qsZhX" role="1urrMF">
2782+
<ref role="2Gs0qQ" node="yxqw$qsU36" resolve="dep" />
2783+
</node>
2784+
</node>
2785+
</node>
2786+
</node>
2787+
<node concept="3clFbJ" id="yxqw$qsZip" role="3cqZAp">
2788+
<node concept="3fqX7Q" id="yxqw$qsZiq" role="3clFbw">
2789+
<node concept="2OqwBi" id="yxqw$qsZir" role="3fr31v">
2790+
<node concept="2OqwBi" id="yxqw$qsZis" role="2Oq$k0">
2791+
<node concept="2GrUjf" id="yxqw$qsZit" role="2Oq$k0">
2792+
<ref role="2Gs0qQ" node="yxqw$qsU36" resolve="dep" />
2793+
</node>
2794+
<node concept="3Tsc0h" id="yxqw$qsZVM" role="2OqNvi">
2795+
<ref role="3TtcxE" to="ryx8:Te1zv$_lYI" resolve="whitelist" />
2796+
</node>
2797+
</node>
2798+
<node concept="1v1jN8" id="yxqw$qt3Ao" role="2OqNvi" />
2799+
</node>
2800+
</node>
2801+
<node concept="3clFbS" id="yxqw$qsZix" role="3clFbx">
2802+
<node concept="2MkqsV" id="yxqw$qsZiy" role="3cqZAp">
2803+
<node concept="Xl_RD" id="yxqw$qsZiz" role="2MkJ7o">
2804+
<property role="Xl_RC" value="all forbidden dependencies shall have empty whitelists" />
2805+
</node>
2806+
<node concept="2GrUjf" id="yxqw$qsZi$" role="1urrMF">
2807+
<ref role="2Gs0qQ" node="yxqw$qsU36" resolve="dep" />
2808+
</node>
2809+
</node>
2810+
</node>
2811+
</node>
2812+
</node>
2813+
</node>
2814+
</node>
2815+
<node concept="1YaCAy" id="yxqw$qsU2p" role="1YuTPh">
2816+
<property role="TrG5h" value="forbiddenDependency" />
2817+
<ref role="1YaFvo" to="ryx8:yxqw$qsTSY" resolve="ForbiddenDependency" />
2818+
</node>
2819+
</node>
27412820
</model>
27422821

‎code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/generator/templates/test.org.mpsqa.arch.language_no_other_shall_depend_upon.generator.templates@generator.mps‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<model ref="r:1d2b0346-8bd9-4284-8203-23dd29045b0b(test.org.mpsqa.arch.language_no_other_shall_depend_upon.generator.templates@generator)">
3+
<persistence version="9" />
4+
<languages>
5+
<devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
6+
</languages>
7+
<imports>
8+
<import index="adb4" ref="r:5b9b96ac-6395-4a4e-8264-c09584d90f97(test.org.mpsqa.arch.language_no_other_shall_depend_upon.structure)" />
9+
</imports>
10+
<registry>
11+
<language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
12+
<concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
13+
</language>
14+
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
15+
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
16+
<property id="1169194664001" name="name" index="TrG5h" />
17+
</concept>
18+
</language>
19+
</registry>
20+
<node concept="bUwia" id="yxqw$qurrl">
21+
<property role="TrG5h" value="main" />
22+
</node>
23+
</model>
24+

‎code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/models/test.org.mpsqa.arch.language_no_other_shall_depend_upon.behavior.mps‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<model ref="r:62fb1273-e73d-4d2c-881e-81ffd6eac472(test.org.mpsqa.arch.language_no_other_shall_depend_upon.behavior)">
3+
<persistence version="9" />
4+
<languages>
5+
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
6+
<use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
7+
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
8+
</languages>
9+
<imports />
10+
<registry />
11+
</model>
12+

‎code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/models/test.org.mpsqa.arch.language_no_other_shall_depend_upon.constraints.mps‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<model ref="r:6acd3eeb-ab34-4f7d-bb21-d1cbefbb3286(test.org.mpsqa.arch.language_no_other_shall_depend_upon.constraints)">
3+
<persistence version="9" />
4+
<languages>
5+
<use id="5dae8159-ab99-46bb-a40d-0cee30ee7018" name="jetbrains.mps.lang.constraints.rules.kinds" version="0" />
6+
<use id="ea3159bf-f48e-4720-bde2-86dba75f0d34" name="jetbrains.mps.lang.context.defs" version="0" />
7+
<use id="e51810c5-7308-4642-bcb6-469e61b5dd18" name="jetbrains.mps.lang.constraints.msg.specification" version="0" />
8+
<use id="134c38d4-e3af-4d9e-b069-1c7df0a4005d" name="jetbrains.mps.lang.constraints.rules.skeleton" version="0" />
9+
<use id="b3551702-269c-4f05-ba61-58060cef4292" name="jetbrains.mps.lang.rulesAndMessages" version="0" />
10+
<use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="6" />
11+
<use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
12+
<use id="3ad5badc-1d9c-461c-b7b1-fa2fcd0a0ae7" name="jetbrains.mps.lang.context" version="0" />
13+
<use id="ad93155d-79b2-4759-b10c-55123e763903" name="jetbrains.mps.lang.messages" version="0" />
14+
<devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
15+
</languages>
16+
<imports />
17+
<registry />
18+
</model>
19+

‎code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/models/test.org.mpsqa.arch.language_no_other_shall_depend_upon.editor.mps‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<model ref="r:7ae90d27-c607-4f55-b718-2b24949b4a84(test.org.mpsqa.arch.language_no_other_shall_depend_upon.editor)">
3+
<persistence version="9" />
4+
<languages>
5+
<use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
6+
<use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
7+
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
8+
</languages>
9+
<imports />
10+
<registry />
11+
</model>
12+

‎code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/models/test.org.mpsqa.arch.language_no_other_shall_depend_upon.structure.mps‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<model ref="r:5b9b96ac-6395-4a4e-8264-c09584d90f97(test.org.mpsqa.arch.language_no_other_shall_depend_upon.structure)">
3+
<persistence version="9" />
4+
<languages>
5+
<devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
6+
</languages>
7+
<imports />
8+
<registry />
9+
</model>
10+

‎code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/models/test.org.mpsqa.arch.language_no_other_shall_depend_upon.typesystem.mps‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<model ref="r:f8151e4e-2bf4-4877-ad12-16fb878936d2(test.org.mpsqa.arch.language_no_other_shall_depend_upon.typesystem)">
3+
<persistence version="9" />
4+
<languages>
5+
<use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
6+
<devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
7+
</languages>
8+
<imports />
9+
<registry />
10+
</model>
11+

0 commit comments

Comments
 (0)