Skip to content

Commit f105df7

Browse files
dbinkeledbinkele
committed
Revert "Remove unecessary model access (#993)"
This reverts commit 7ff7b2a.
1 parent 96e1f2e commit f105df7

File tree

1 file changed

+162
-29
lines changed
  • code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models

1 file changed

+162
-29
lines changed

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

Lines changed: 162 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,10 @@
294294
<concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
295295
<child id="1081516765348" name="expression" index="3fr31v" />
296296
</concept>
297+
<concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
298+
<child id="1160998896846" name="condition" index="1gVkn0" />
299+
<child id="1160998916832" name="message" index="1gVpfI" />
300+
</concept>
297301
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
298302
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
299303
<child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -483,14 +487,23 @@
483487
<concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
484488
<child id="1144104376918" name="parameter" index="1xVPHs" />
485489
</concept>
490+
<concept id="5045161044515397667" name="jetbrains.mps.lang.smodel.structure.Node_PointerOperation" flags="ng" index="iZEcu" />
486491
<concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
492+
<concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU">
493+
<reference id="7400021826771268269" name="concept" index="2sp9C9" />
494+
</concept>
495+
<concept id="4065387505485742749" name="jetbrains.mps.lang.smodel.structure.AbstractPointerResolveOperation" flags="ng" index="2yCiFS">
496+
<child id="3648723375513868575" name="repositoryArg" index="Vysub" />
497+
</concept>
487498
<concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
488499
<concept id="1173122760281" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorsOperation" flags="nn" index="z$bX8" />
500+
<concept id="8866923313515890008" name="jetbrains.mps.lang.smodel.structure.AsNodeOperation" flags="nn" index="FGMqu" />
489501
<concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
490502
<concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
491503
<child id="1145404616321" name="leftExpression" index="2JrQYb" />
492504
</concept>
493505
<concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
506+
<concept id="3648723375513868532" name="jetbrains.mps.lang.smodel.structure.NodePointer_ResolveOperation" flags="ng" index="Vyspw" />
494507
<concept id="6677504323281689838" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3bZ5Sz">
495508
<reference id="6677504323281689839" name="conceptDeclaraton" index="3bZ5Sy" />
496509
</concept>
@@ -4466,17 +4479,13 @@
44664479
</node>
44674480
</node>
44684481
</node>
4469-
<node concept="1X3_iC" id="6$yRT_MEzQI" role="lGtFl">
4470-
<property role="3V$3am" value="statement" />
4471-
<property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
4472-
<node concept="3clFbF" id="4t0fbsdpkf2" role="8Wnug">
4473-
<node concept="2OqwBi" id="4t0fbsdpkf3" role="3clFbG">
4474-
<node concept="37vLTw" id="4t0fbsdpkf4" role="2Oq$k0">
4475-
<ref role="3cqZAo" node="4t0fbsdpkeM" resolve="st" />
4476-
</node>
4477-
<node concept="2qgKlT" id="4t0fbsdpkf5" role="2OqNvi">
4478-
<ref role="37wK5l" to="1jcu:7rOSrvnHe0i" resolve="finishAndCleanup" />
4479-
</node>
4482+
<node concept="3clFbF" id="4t0fbsdpkf2" role="3cqZAp">
4483+
<node concept="2OqwBi" id="4t0fbsdpkf3" role="3clFbG">
4484+
<node concept="37vLTw" id="4t0fbsdpkf4" role="2Oq$k0">
4485+
<ref role="3cqZAo" node="4t0fbsdpkeM" resolve="st" />
4486+
</node>
4487+
<node concept="2qgKlT" id="4t0fbsdpkf5" role="2OqNvi">
4488+
<ref role="37wK5l" to="1jcu:7rOSrvnHe0i" resolve="finishAndCleanup" />
44804489
</node>
44814490
</node>
44824491
</node>
@@ -7564,8 +7573,15 @@
75647573
<node concept="312cEg" id="2E$J0Goej6J" role="jymVt">
75657574
<property role="TrG5h" value="solvable" />
75667575
<node concept="3Tm6S6" id="2E$J0Goe7i7" role="1B3o_S" />
7567-
<node concept="3Tqbb2" id="2r3IUTFC1Gr" role="1tU5fm">
7568-
<ref role="ehGHo" to="l80j:4pkidg67Lfn" resolve="ISolvable" />
7576+
<node concept="2sp9CU" id="2E$J0GoedGc" role="1tU5fm">
7577+
<ref role="2sp9C9" to="l80j:4pkidg67Lfn" resolve="ISolvable" />
7578+
</node>
7579+
</node>
7580+
<node concept="312cEg" id="2E$J0GoeDNX" role="jymVt">
7581+
<property role="TrG5h" value="repo" />
7582+
<node concept="3Tm6S6" id="2E$J0Goe_e6" role="1B3o_S" />
7583+
<node concept="3uibUv" id="2E$J0GoeI9O" role="1tU5fm">
7584+
<ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
75697585
</node>
75707586
</node>
75717587
<node concept="312cEg" id="121_t0FbxFz" role="jymVt">
@@ -7624,8 +7640,11 @@
76247640
<node concept="3clFbS" id="121_t0FbAtL" role="3clF47">
76257641
<node concept="3clFbF" id="121_t0FbBau" role="3cqZAp">
76267642
<node concept="37vLTI" id="121_t0FbBPE" role="3clFbG">
7627-
<node concept="37vLTw" id="121_t0FbC22" role="37vLTx">
7628-
<ref role="3cqZAo" node="121_t0FbAui" resolve="solvable" />
7643+
<node concept="2OqwBi" id="2E$J0Goew7i" role="37vLTx">
7644+
<node concept="37vLTw" id="121_t0FbC22" role="2Oq$k0">
7645+
<ref role="3cqZAo" node="121_t0FbAui" resolve="solvable" />
7646+
</node>
7647+
<node concept="iZEcu" id="2E$J0GoewBq" role="2OqNvi" />
76297648
</node>
76307649
<node concept="2OqwBi" id="121_t0FbBg2" role="37vLTJ">
76317650
<node concept="Xjq3P" id="121_t0FbBat" role="2Oq$k0" />
@@ -7635,6 +7654,74 @@
76357654
</node>
76367655
</node>
76377656
</node>
7657+
<node concept="3cpWs8" id="2E$J0GolDIL" role="3cqZAp">
7658+
<node concept="3cpWsn" id="2E$J0GolDIM" role="3cpWs9">
7659+
<property role="TrG5h" value="model" />
7660+
<node concept="3uibUv" id="2E$J0GolDHK" role="1tU5fm">
7661+
<ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
7662+
</node>
7663+
<node concept="2OqwBi" id="5UWHomOvX_4" role="33vP2m">
7664+
<node concept="2YIFZM" id="5UWHomOvWIs" role="2Oq$k0">
7665+
<ref role="37wK5l" to="33ny:~Optional.ofNullable(java.lang.Object)" resolve="ofNullable" />
7666+
<ref role="1Pybhc" to="33ny:~Optional" resolve="Optional" />
7667+
<node concept="2OqwBi" id="2E$J0GolDIN" role="37wK5m">
7668+
<node concept="2JrnkZ" id="2E$J0GolDIO" role="2Oq$k0">
7669+
<node concept="37vLTw" id="2E$J0GolDIP" role="2JrQYb">
7670+
<ref role="3cqZAo" node="121_t0FbAui" resolve="solvable" />
7671+
</node>
7672+
</node>
7673+
<node concept="liA8E" id="2E$J0GolDIQ" role="2OqNvi">
7674+
<ref role="37wK5l" to="mhbf:~SNode.getModel()" resolve="getModel" />
7675+
</node>
7676+
</node>
7677+
</node>
7678+
<node concept="liA8E" id="5UWHomOvYRJ" role="2OqNvi">
7679+
<ref role="37wK5l" to="33ny:~Optional.orElse(java.lang.Object)" resolve="orElse" />
7680+
<node concept="2OqwBi" id="5UWHomOw3Q9" role="37wK5m">
7681+
<node concept="2OqwBi" id="5UWHomOw2nS" role="2Oq$k0">
7682+
<node concept="2OqwBi" id="5UWHomOw168" role="2Oq$k0">
7683+
<node concept="37vLTw" id="5UWHomOw0dr" role="2Oq$k0">
7684+
<ref role="3cqZAo" node="121_t0FbAui" resolve="solvable" />
7685+
</node>
7686+
<node concept="2yIwOk" id="5UWHomOw1OY" role="2OqNvi" />
7687+
</node>
7688+
<node concept="FGMqu" id="5UWHomOw3e6" role="2OqNvi" />
7689+
</node>
7690+
<node concept="I4A8Y" id="5UWHomOw4OV" role="2OqNvi" />
7691+
</node>
7692+
</node>
7693+
</node>
7694+
</node>
7695+
</node>
7696+
<node concept="1gVbGN" id="2E$J0GolEh$" role="3cqZAp">
7697+
<node concept="3y3z36" id="2E$J0GolFeh" role="1gVkn0">
7698+
<node concept="10Nm6u" id="2E$J0GolFvM" role="3uHU7w" />
7699+
<node concept="37vLTw" id="2E$J0GolESJ" role="3uHU7B">
7700+
<ref role="3cqZAo" node="2E$J0GolDIM" resolve="model" />
7701+
</node>
7702+
</node>
7703+
<node concept="Xl_RD" id="2E$J0GolFWL" role="1gVpfI">
7704+
<property role="Xl_RC" value="Solvable is not in a model" />
7705+
</node>
7706+
</node>
7707+
<node concept="3clFbF" id="2E$J0GofiK0" role="3cqZAp">
7708+
<node concept="37vLTI" id="2E$J0GofjUu" role="3clFbG">
7709+
<node concept="2OqwBi" id="2E$J0Goflyi" role="37vLTx">
7710+
<node concept="37vLTw" id="2E$J0GolDIR" role="2Oq$k0">
7711+
<ref role="3cqZAo" node="2E$J0GolDIM" resolve="model" />
7712+
</node>
7713+
<node concept="liA8E" id="2E$J0GoflJB" role="2OqNvi">
7714+
<ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
7715+
</node>
7716+
</node>
7717+
<node concept="2OqwBi" id="2E$J0Gofj5I" role="37vLTJ">
7718+
<node concept="Xjq3P" id="2E$J0GofiJY" role="2Oq$k0" />
7719+
<node concept="2OwXpG" id="2E$J0GofjDd" role="2OqNvi">
7720+
<ref role="2Oxat5" node="2E$J0GoeDNX" resolve="repo" />
7721+
</node>
7722+
</node>
7723+
</node>
7724+
</node>
76387725
<node concept="3clFbF" id="121_t0FbCz6" role="3cqZAp">
76397726
<node concept="37vLTI" id="121_t0FbDkL" role="3clFbG">
76407727
<node concept="37vLTw" id="121_t0FbDxT" role="37vLTx">
@@ -7690,11 +7777,34 @@
76907777
<node concept="3clFb_" id="2E$J0GofUhQ" role="jymVt">
76917778
<property role="TrG5h" value="getSolvable" />
76927779
<node concept="3clFbS" id="2E$J0GofUhR" role="3clF47">
7693-
<node concept="3clFbF" id="2r3IUTFC9ip" role="3cqZAp">
7694-
<node concept="2OqwBi" id="2r3IUTFCaBV" role="3clFbG">
7695-
<node concept="Xjq3P" id="2r3IUTFC9io" role="2Oq$k0" />
7696-
<node concept="2OwXpG" id="2r3IUTFCcAB" role="2OqNvi">
7697-
<ref role="2Oxat5" node="2E$J0Goej6J" resolve="solvable" />
7780+
<node concept="3clFbF" id="2E$J0GojUxX" role="3cqZAp">
7781+
<node concept="2OqwBi" id="2E$J0GojXC3" role="3clFbG">
7782+
<node concept="2ShNRf" id="2E$J0GojUxT" role="2Oq$k0">
7783+
<node concept="1pGfFk" id="2E$J0GojX3V" role="2ShVmc">
7784+
<ref role="37wK5l" to="w1kc:~ModelAccessHelper.&lt;init&gt;(org.jetbrains.mps.openapi.module.SRepository)" resolve="ModelAccessHelper" />
7785+
<node concept="37vLTw" id="2E$J0GojXkL" role="37wK5m">
7786+
<ref role="3cqZAo" node="2E$J0GoeDNX" resolve="repo" />
7787+
</node>
7788+
</node>
7789+
</node>
7790+
<node concept="liA8E" id="2E$J0GojXYw" role="2OqNvi">
7791+
<ref role="37wK5l" to="w1kc:~ModelAccessHelper.runReadAction(jetbrains.mps.util.Computable)" resolve="runReadAction" />
7792+
<node concept="1bVj0M" id="2E$J0GojYu2" role="37wK5m">
7793+
<node concept="3clFbS" id="2E$J0GojYu3" role="1bW5cS">
7794+
<node concept="3clFbF" id="2E$J0GofUhS" role="3cqZAp">
7795+
<node concept="2OqwBi" id="2E$J0GofUhU" role="3clFbG">
7796+
<node concept="37vLTw" id="2E$J0GofUhV" role="2Oq$k0">
7797+
<ref role="3cqZAo" node="2E$J0Goej6J" resolve="solvable" />
7798+
</node>
7799+
<node concept="Vyspw" id="2E$J0GofUhW" role="2OqNvi">
7800+
<node concept="37vLTw" id="2E$J0GofUhX" role="Vysub">
7801+
<ref role="3cqZAo" node="2E$J0GoeDNX" resolve="repo" />
7802+
</node>
7803+
</node>
7804+
</node>
7805+
</node>
7806+
</node>
7807+
</node>
76987808
</node>
76997809
</node>
77007810
</node>
@@ -7708,17 +7818,40 @@
77087818
<node concept="3clFb_" id="121_t0FbG7I" role="jymVt">
77097819
<property role="TrG5h" value="getName" />
77107820
<node concept="3clFbS" id="121_t0FbG7L" role="3clF47">
7711-
<node concept="3clFbF" id="2r3IUTFCdEP" role="3cqZAp">
7712-
<node concept="2OqwBi" id="2r3IUTFCj9J" role="3clFbG">
7713-
<node concept="2OqwBi" id="2r3IUTFCdEQ" role="2Oq$k0">
7714-
<node concept="Xjq3P" id="2r3IUTFCdER" role="2Oq$k0" />
7715-
<node concept="2OwXpG" id="2r3IUTFCdES" role="2OqNvi">
7716-
<ref role="2Oxat5" node="2E$J0Goej6J" resolve="solvable" />
7821+
<node concept="3clFbF" id="2E$J0Gojdxb" role="3cqZAp">
7822+
<node concept="2OqwBi" id="2E$J0Gojhm3" role="3clFbG">
7823+
<node concept="2ShNRf" id="2E$J0Gojdx5" role="2Oq$k0">
7824+
<node concept="1pGfFk" id="2E$J0GojgQk" role="2ShVmc">
7825+
<ref role="37wK5l" to="w1kc:~ModelAccessHelper.&lt;init&gt;(org.jetbrains.mps.openapi.module.SRepository)" resolve="ModelAccessHelper" />
7826+
<node concept="37vLTw" id="2E$J0Gojh4u" role="37wK5m">
7827+
<ref role="3cqZAo" node="2E$J0GoeDNX" resolve="repo" />
7828+
</node>
7829+
</node>
7830+
</node>
7831+
<node concept="liA8E" id="2E$J0GojhEj" role="2OqNvi">
7832+
<ref role="37wK5l" to="w1kc:~ModelAccessHelper.runReadAction(jetbrains.mps.util.Computable)" resolve="runReadAction" />
7833+
<node concept="1bVj0M" id="2E$J0Goji7L" role="37wK5m">
7834+
<node concept="3clFbS" id="2E$J0Goji7M" role="1bW5cS">
7835+
<node concept="3clFbF" id="2E$J0GojiBu" role="3cqZAp">
7836+
<node concept="2OqwBi" id="2E$J0Goja2W" role="3clFbG">
7837+
<node concept="2OqwBi" id="2E$J0Goja2X" role="2Oq$k0">
7838+
<node concept="37vLTw" id="2E$J0Goja2Y" role="2Oq$k0">
7839+
<ref role="3cqZAo" node="2E$J0Goej6J" resolve="solvable" />
7840+
</node>
7841+
<node concept="Vyspw" id="2E$J0Goja2Z" role="2OqNvi">
7842+
<node concept="37vLTw" id="2E$J0Goja30" role="Vysub">
7843+
<ref role="3cqZAo" node="2E$J0GoeDNX" resolve="repo" />
7844+
</node>
7845+
</node>
7846+
</node>
7847+
<node concept="2qgKlT" id="2E$J0Goja31" role="2OqNvi">
7848+
<ref role="37wK5l" to="1jcu:WieAE6TWOo" resolve="getSolvableName" />
7849+
</node>
7850+
</node>
7851+
</node>
7852+
</node>
77177853
</node>
77187854
</node>
7719-
<node concept="2qgKlT" id="2r3IUTFCknc" role="2OqNvi">
7720-
<ref role="37wK5l" to="1jcu:WieAE6TWOo" resolve="getSolvableName" />
7721-
</node>
77227855
</node>
77237856
</node>
77247857
</node>

0 commit comments

Comments
 (0)