Skip to content

Commit ee3682a

Browse files
dbinkeledbinkele
committed
Restrict to concetps in hierarchy (#1323)
1 parent 9936815 commit ee3682a

File tree

5 files changed

+321
-23
lines changed

5 files changed

+321
-23
lines changed

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

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,6 +1000,9 @@
10001000
<node concept="37vLTw" id="2qZCmtwlFVG" role="37wK5m">
10011001
<ref role="3cqZAo" node="4aAsKjbyLlB" resolve="samePrio" />
10021002
</node>
1003+
<node concept="37vLTw" id="7Vgw$ZVCtN9" role="37wK5m">
1004+
<ref role="3cqZAo" node="75Ean$HgQqa" resolve="superConceptsAll" />
1005+
</node>
10031006
</node>
10041007
<node concept="liA8E" id="4aAsKjbRmO4" role="2OqNvi">
10051008
<ref role="37wK5l" node="7rOSrvnIT4g" resolve="createSolverTask" />
@@ -1104,14 +1107,6 @@
11041107
<node concept="3uibUv" id="2qZCmtwlFVF" role="3clF45">
11051108
<ref role="3uigEE" node="7rOSrvnISX_" resolve="SolverTaskFactory" />
11061109
</node>
1107-
<node concept="37vLTG" id="2qZCmtwlFV$" role="3clF46">
1108-
<property role="TrG5h" value="samePrio" />
1109-
<node concept="_YKpA" id="2qZCmtwlFV_" role="1tU5fm">
1110-
<node concept="3uibUv" id="2qZCmtwlFVA" role="_ZDj9">
1111-
<ref role="3uigEE" node="7rOSrvnISX_" resolve="SolverTaskFactory" />
1112-
</node>
1113-
</node>
1114-
</node>
11151110
<node concept="3clFbS" id="2qZCmtwlFUW" role="3clF47">
11161111
<node concept="3cpWs6" id="2qZCmtwlFUX" role="3cqZAp">
11171112
<node concept="1eOMI4" id="2qZCmtwlFUY" role="3cqZAk">
@@ -1134,12 +1129,13 @@
11341129
</node>
11351130
<node concept="1rXfSq" id="2qZCmtwlFVa" role="37wK5m">
11361131
<ref role="37wK5l" node="2qZCmtwiDKj" resolve="mostSpecializedConcept" />
1137-
<node concept="2OqwBi" id="2qZCmtwlFVb" role="37wK5m">
1138-
<node concept="37vLTw" id="2qZCmtwlFVc" role="2Oq$k0">
1139-
<ref role="3cqZAo" node="2qZCmtwlFVe" resolve="stf" />
1132+
<node concept="1rXfSq" id="7Vgw$ZVCYhy" role="37wK5m">
1133+
<ref role="37wK5l" node="4aAsKjb$M37" resolve="relevantConcepts" />
1134+
<node concept="37vLTw" id="7Vgw$ZVD27n" role="37wK5m">
1135+
<ref role="3cqZAo" node="7Vgw$ZVCxdk" resolve="superConceptsAll" />
11401136
</node>
1141-
<node concept="liA8E" id="2qZCmtwlFVd" role="2OqNvi">
1142-
<ref role="37wK5l" node="7rOSrvnJ4j5" resolve="applicableConcepts" />
1137+
<node concept="37vLTw" id="7Vgw$ZVDhC5" role="37wK5m">
1138+
<ref role="3cqZAo" node="2qZCmtwlFVe" resolve="stf" />
11431139
</node>
11441140
</node>
11451141
</node>
@@ -1220,6 +1216,21 @@
12201216
<property role="x79VB" value=" " />
12211217
</node>
12221218
</node>
1219+
<node concept="37vLTG" id="2qZCmtwlFV$" role="3clF46">
1220+
<property role="TrG5h" value="samePrio" />
1221+
<node concept="_YKpA" id="2qZCmtwlFV_" role="1tU5fm">
1222+
<node concept="3uibUv" id="2qZCmtwlFVA" role="_ZDj9">
1223+
<ref role="3uigEE" node="7rOSrvnISX_" resolve="SolverTaskFactory" />
1224+
</node>
1225+
</node>
1226+
</node>
1227+
<node concept="37vLTG" id="7Vgw$ZVCxdk" role="3clF46">
1228+
<property role="TrG5h" value="superConceptsAll" />
1229+
<node concept="3uibUv" id="7Vgw$ZVCxdl" role="1tU5fm">
1230+
<ref role="3uigEE" to="33ny:~Set" resolve="Set" />
1231+
<node concept="3bZ5Sz" id="7Vgw$ZVCxdm" role="11_B2D" />
1232+
</node>
1233+
</node>
12231234
</node>
12241235
<node concept="2tJIrI" id="2qZCmtwl6bK" role="jymVt" />
12251236
<node concept="2YIFZL" id="2qZCmtwiDKj" role="jymVt">
@@ -1284,8 +1295,7 @@
12841295
<node concept="3clFbF" id="75Ean$HowPR" role="3cqZAp">
12851296
<node concept="3fqX7Q" id="75Ean$HowPS" role="3clFbG">
12861297
<node concept="2OqwBi" id="75Ean$HowPT" role="3fr31v">
1287-
<node concept="2YIFZM" id="4aAsKjb$M3d" role="2Oq$k0">
1288-
<ref role="1Pybhc" node="7rOSrvnISp9" resolve="STF" />
1298+
<node concept="1rXfSq" id="7Vgw$ZVAPUC" role="2Oq$k0">
12891299
<ref role="37wK5l" node="4aAsKjb$M37" resolve="relevantConcepts" />
12901300
<node concept="37vLTw" id="4aAsKjb$M3b" role="37wK5m">
12911301
<ref role="3cqZAo" node="75Ean$HowQ3" resolve="superConceptsAll" />
@@ -1312,7 +1322,7 @@
13121322
<node concept="37vLTG" id="4aAsKjb$M2Y" role="3clF46">
13131323
<property role="TrG5h" value="superConceptsAll" />
13141324
<node concept="3uibUv" id="4aAsKjb$M2Z" role="1tU5fm">
1315-
<ref role="3uigEE" to="33ny:~HashSet" resolve="HashSet" />
1325+
<ref role="3uigEE" to="33ny:~Set" resolve="Set" />
13161326
<node concept="3bZ5Sz" id="4aAsKjb$M30" role="11_B2D" />
13171327
</node>
13181328
</node>

‎code/languages/org.iets3.opensource/languages/test.org.iets3.analysis.base.solvable/models/test.org.iets3.analysis.base.solvable.behavior.mps‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@
9292
<concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
9393
<property id="1068580123138" name="value" index="3clFbU" />
9494
</concept>
95+
<concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
96+
<property id="1068580320021" name="value" index="3cmrfH" />
97+
</concept>
9598
<concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
9699
<child id="1068581517676" name="expression" index="3cqZAk" />
97100
</concept>
@@ -418,5 +421,36 @@
418421
</node>
419422
</node>
420423
</node>
424+
<node concept="13h7C7" id="7Vgw$ZVF8xz">
425+
<ref role="13h7C2" to="6w03:7Vgw$ZVEZE6" resolve="Unrelated" />
426+
<node concept="13hLZK" id="7Vgw$ZVF8x$" role="13h7CW">
427+
<node concept="3clFbS" id="7Vgw$ZVF8x_" role="2VODD2" />
428+
</node>
429+
<node concept="13i0hz" id="7Vgw$ZVF8xQ" role="13h7CS">
430+
<property role="TrG5h" value="createSolverTask" />
431+
<ref role="13i0hy" to="1jcu:4pkidg67Lgb" resolve="createSolverTask" />
432+
<node concept="3Tm1VV" id="7Vgw$ZVF8xR" role="1B3o_S" />
433+
<node concept="3clFbS" id="7Vgw$ZVF8y1" role="3clF47">
434+
<node concept="3clFbF" id="7Vgw$ZVF8NR" role="3cqZAp">
435+
<node concept="2pJPEk" id="7Vgw$ZVF8NS" role="3clFbG">
436+
<node concept="2pJPED" id="7Vgw$ZVF8NT" role="2pJPEn">
437+
<ref role="2pJxaS" to="6w03:7wEqFvbO3UV" resolve="DummySolverTask" />
438+
<node concept="2pJxcG" id="7Vgw$ZVF8NU" role="2pJxcM">
439+
<ref role="2pJxcJ" to="6w03:7wEqFvbO5ba" resolve="sleepTime" />
440+
<node concept="WxPPo" id="7Vgw$ZVF8NV" role="28ntcv">
441+
<node concept="3cmrfG" id="7Vgw$ZVF8Yo" role="WxPPp">
442+
<property role="3cmrfH" value="1234" />
443+
</node>
444+
</node>
445+
</node>
446+
</node>
447+
</node>
448+
</node>
449+
</node>
450+
<node concept="3Tqbb2" id="7Vgw$ZVF8y2" role="3clF45">
451+
<ref role="ehGHo" to="l80j:7rOSrvnFUQX" resolve="AbstractSolverTask" />
452+
</node>
453+
</node>
454+
</node>
421455
</model>
422456

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

Lines changed: 115 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<import index="90d" ref="r:421d64ed-8024-497f-aeab-8bddeb389dd2(jetbrains.mps.lang.extension.methods)" />
1919
<import index="6w03" ref="r:2b6823f7-1c48-47b9-9a41-e04ac80f7887(test.org.iets3.analysis.base.solvable.structure)" implicit="true" />
2020
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
21-
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
2221
</imports>
2322
<registry>
2423
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -195,9 +194,6 @@
195194
<node concept="2YIFZM" id="4aAsKjbTrqk" role="3clFbG">
196195
<ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...)" resolve="asList" />
197196
<ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
198-
<node concept="35c_gC" id="4aAsKjbTrql" role="37wK5m">
199-
<ref role="35c_gD" to="tpck:gw2VY9q" resolve="BaseConcept" />
200-
</node>
201197
<node concept="35c_gC" id="4aAsKjbTrqm" role="37wK5m">
202198
<ref role="35c_gD" to="6w03:2qZCmtwh4Va" resolve="H4Dummy" />
203199
</node>
@@ -283,9 +279,6 @@
283279
<node concept="2YIFZM" id="4aAsKjbTtz5" role="3clFbG">
284280
<ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...)" resolve="asList" />
285281
<ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
286-
<node concept="35c_gC" id="4aAsKjbTtz6" role="37wK5m">
287-
<ref role="35c_gD" to="tpck:gw2VY9q" resolve="BaseConcept" />
288-
</node>
289282
<node concept="35c_gC" id="4aAsKjbTtz7" role="37wK5m">
290283
<ref role="35c_gD" to="6w03:2qZCmtwh4V9" resolve="H3Dummy" />
291284
</node>
@@ -385,5 +378,120 @@
385378
</node>
386379
</node>
387380
</node>
381+
<node concept="312cEu" id="7Vgw$ZVF0o1">
382+
<property role="TrG5h" value="Factory3" />
383+
<node concept="3Tm1VV" id="7Vgw$ZVF0o2" role="1B3o_S" />
384+
<node concept="3uibUv" id="7Vgw$ZVF0p4" role="EKbjA">
385+
<ref role="3uigEE" to="hnhi:7rOSrvnISX_" resolve="SolverTaskFactory" />
386+
</node>
387+
<node concept="3clFb_" id="7Vgw$ZVF0qg" role="jymVt">
388+
<property role="TrG5h" value="createSolverTask" />
389+
<node concept="3Tqbb2" id="7Vgw$ZVF0qh" role="3clF45">
390+
<ref role="ehGHo" to="l80j:7rOSrvnFUQX" resolve="AbstractSolverTask" />
391+
</node>
392+
<node concept="3Tm1VV" id="7Vgw$ZVF0qi" role="1B3o_S" />
393+
<node concept="37vLTG" id="7Vgw$ZVF0qk" role="3clF46">
394+
<property role="TrG5h" value="n" />
395+
<node concept="3Tqbb2" id="7Vgw$ZVF0ql" role="1tU5fm">
396+
<ref role="ehGHo" to="l80j:4pkidg67Lfn" resolve="ISolvable" />
397+
</node>
398+
</node>
399+
<node concept="37vLTG" id="7Vgw$ZVF0qm" role="3clF46">
400+
<property role="TrG5h" value="name" />
401+
<node concept="17QB3L" id="7Vgw$ZVF0qn" role="1tU5fm" />
402+
</node>
403+
<node concept="3clFbS" id="7Vgw$ZVF0qo" role="3clF47">
404+
<node concept="3clFbF" id="7Vgw$ZVF2Ys" role="3cqZAp">
405+
<node concept="2pJPEk" id="7Vgw$ZVF2Yt" role="3clFbG">
406+
<node concept="2pJPED" id="7Vgw$ZVF2Yu" role="2pJPEn">
407+
<ref role="2pJxaS" to="6w03:7wEqFvbO3UV" resolve="DummySolverTask" />
408+
<node concept="2pJxcG" id="7Vgw$ZVF2Yv" role="2pJxcM">
409+
<ref role="2pJxcJ" to="6w03:7wEqFvbO5ba" resolve="sleepTime" />
410+
<node concept="WxPPo" id="7Vgw$ZVF2Yw" role="28ntcv">
411+
<node concept="3cmrfG" id="7Vgw$ZVF2Yx" role="WxPPp">
412+
<property role="3cmrfH" value="1234" />
413+
</node>
414+
</node>
415+
</node>
416+
</node>
417+
</node>
418+
</node>
419+
</node>
420+
<node concept="2AHcQZ" id="7Vgw$ZVF0qp" role="2AJF6D">
421+
<ref role="2AI5Lk" to="wyt6:~Override" />
422+
</node>
423+
</node>
424+
<node concept="3clFb_" id="7Vgw$ZVF0qq" role="jymVt">
425+
<property role="TrG5h" value="applicableConcepts" />
426+
<node concept="A3Dl8" id="7Vgw$ZVF0qr" role="3clF45">
427+
<node concept="3bZ5Sz" id="7Vgw$ZVF0qs" role="A3Ik2" />
428+
</node>
429+
<node concept="3Tm1VV" id="7Vgw$ZVF0qt" role="1B3o_S" />
430+
<node concept="3clFbS" id="7Vgw$ZVF0qv" role="3clF47">
431+
<node concept="3clFbF" id="7Vgw$ZVF0R1" role="3cqZAp">
432+
<node concept="2YIFZM" id="7Vgw$ZVF0Xk" role="3clFbG">
433+
<ref role="37wK5l" to="33ny:~Collections.singleton(java.lang.Object)" resolve="singleton" />
434+
<ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
435+
<node concept="35c_gC" id="7Vgw$ZVF12i" role="37wK5m">
436+
<ref role="35c_gD" to="6w03:7Vgw$ZVEZE6" resolve="Unrelated" />
437+
</node>
438+
</node>
439+
</node>
440+
</node>
441+
<node concept="2AHcQZ" id="7Vgw$ZVF0qw" role="2AJF6D">
442+
<ref role="2AI5Lk" to="wyt6:~Override" />
443+
</node>
444+
</node>
445+
<node concept="3clFb_" id="7Vgw$ZVF3J5" role="jymVt">
446+
<property role="TrG5h" value="priority" />
447+
<node concept="10Oyi0" id="7Vgw$ZVF3J6" role="3clF45" />
448+
<node concept="3Tm1VV" id="7Vgw$ZVF3J7" role="1B3o_S" />
449+
<node concept="3clFbS" id="7Vgw$ZVF3Jg" role="3clF47">
450+
<node concept="3clFbF" id="7Vgw$ZVF6tr" role="3cqZAp">
451+
<node concept="10M0yZ" id="7Vgw$ZVF6FV" role="3clFbG">
452+
<ref role="3cqZAo" to="wyt6:~Integer.MAX_VALUE" resolve="MAX_VALUE" />
453+
<ref role="1PxDUh" to="wyt6:~Integer" resolve="Integer" />
454+
</node>
455+
</node>
456+
</node>
457+
<node concept="2AHcQZ" id="7Vgw$ZVF3Jh" role="2AJF6D">
458+
<ref role="2AI5Lk" to="wyt6:~Override" />
459+
</node>
460+
</node>
461+
</node>
462+
<node concept="1lYeZD" id="7Vgw$ZVFBM$">
463+
<property role="TrG5h" value="FactoryExtension3" />
464+
<ref role="1lYe$Y" to="hnhi:WieAE6FJqt" resolve="solverfactories" />
465+
<node concept="3Tm1VV" id="7Vgw$ZVFBM_" role="1B3o_S" />
466+
<node concept="2tJIrI" id="7Vgw$ZVFBMA" role="jymVt" />
467+
<node concept="3tTeZs" id="7Vgw$ZVFBMB" role="jymVt">
468+
<property role="3tTeZt" value="activate" />
469+
<ref role="3tTeZr" to="90d:3zLwYDe0CPy" resolve="activate" />
470+
</node>
471+
<node concept="3tTeZs" id="7Vgw$ZVFBMC" role="jymVt">
472+
<property role="3tTeZt" value="deactivate" />
473+
<ref role="3tTeZr" to="90d:3zLwYDe0BDO" resolve="deactivate" />
474+
</node>
475+
<node concept="2tJIrI" id="7Vgw$ZVFBMD" role="jymVt" />
476+
<node concept="q3mfD" id="7Vgw$ZVFBME" role="jymVt">
477+
<property role="TrG5h" value="get" />
478+
<ref role="2VtyIY" to="90d:3zLwYDe0svr" resolve="get" />
479+
<node concept="3Tm1VV" id="7Vgw$ZVFBMF" role="1B3o_S" />
480+
<node concept="3clFbS" id="7Vgw$ZVFBMG" role="3clF47">
481+
<node concept="3clFbF" id="7Vgw$ZVFBMH" role="3cqZAp">
482+
<node concept="2ShNRf" id="7Vgw$ZVFBMI" role="3clFbG">
483+
<node concept="HV5vD" id="7Vgw$ZVFBMJ" role="2ShVmc">
484+
<property role="373rjd" value="true" />
485+
<ref role="HV5vE" node="7Vgw$ZVF0o1" resolve="Factory3" />
486+
</node>
487+
</node>
488+
</node>
489+
</node>
490+
<node concept="q3mfm" id="7Vgw$ZVFBMK" role="3clF45">
491+
<ref role="1QQUv3" node="7Vgw$ZVFBME" resolve="get" />
492+
<ref role="q3mfh" to="90d:3zLwYDe0sv$" />
493+
</node>
494+
</node>
495+
</node>
388496
</model>
389497

‎code/languages/org.iets3.opensource/languages/test.org.iets3.analysis.base.solvable/models/test.org.iets3.analysis.base.solvable.structure.mps‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,12 @@
7777
<property role="TrG5h" value="H4Dummy" />
7878
<ref role="1TJDcQ" node="2qZCmtwh4V9" resolve="H3Dummy" />
7979
</node>
80+
<node concept="1TIwiD" id="7Vgw$ZVEZE6">
81+
<property role="EcuMT" value="9137946923971115654" />
82+
<property role="TrG5h" value="Unrelated" />
83+
<node concept="PrWs8" id="7Vgw$ZVF8xy" role="PzmwI">
84+
<ref role="PrY4T" to="l80j:4pkidg67Lfn" resolve="ISolvable" />
85+
</node>
86+
</node>
8087
</model>
8188

0 commit comments

Comments
 (0)