Skip to content

Commit

Permalink
removed canBeAncestor checks that don't make sense anymore
Browse files Browse the repository at this point in the history 
* canBeAncestor checks require both ancestor and parent node to be executed, or else an exception
would be thrown. Because of this some of the old canBeAncestor checks cannot be applied or
don't make sense anymore and therefore were removed.
  • Loading branch information
@wsafonov
wsafonov committed Jul 12, 2021
1 parent 9a7e2e7 commit a8b6f32
Show file tree
Hide file tree
Showing 4 changed files with 82 additions and 250 deletions.
82 changes: 0 additions & 82 deletions code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/intentions.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@
<reference id="1144433194310" name="classConcept" index="1Pybhc" />
</concept>
<concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
<concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
<concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
<property id="1176718929932" name="isFinal" index="3TUv4t" />
Expand Down Expand Up @@ -241,9 +240,6 @@
<concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
<concept id="1138757581985" name="jetbrains.mps.lang.smodel.structure.Link_SetNewChildOperation" flags="nn" index="zfrQC" />
<concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
<concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
<reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
</concept>
<concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
<concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
<child id="1177027386292" name="conceptArgument" index="cj9EA" />
Expand Down Expand Up @@ -477,84 +473,6 @@
</node>
<node concept="2SaL7w" id="3m8H$lmFM7n" role="2ZfVeh">
<node concept="3clFbS" id="3m8H$lmFM7o" role="2VODD2">
<node concept="3SKdUt" id="63CFXsSfYx" role="3cqZAp">
<node concept="1PaTwC" id="13p6s1wtie2" role="1aUNEU">
<node concept="3oM_SD" id="13p6s1wtie3" role="1PaTwD">
<property role="3oM_SC" value="We" />
</node>
<node concept="3oM_SD" id="13p6s1wtie4" role="1PaTwD">
<property role="3oM_SC" value="check" />
</node>
<node concept="3oM_SD" id="13p6s1wtie5" role="1PaTwD">
<property role="3oM_SC" value="canBeAncestor" />
</node>
<node concept="3oM_SD" id="13p6s1wtie6" role="1PaTwD">
<property role="3oM_SC" value="constraint" />
</node>
<node concept="3oM_SD" id="13p6s1wtie7" role="1PaTwD">
<property role="3oM_SC" value="from" />
</node>
<node concept="3oM_SD" id="13p6s1wtie8" role="1PaTwD">
<property role="3oM_SC" value="parent" />
</node>
<node concept="3oM_SD" id="13p6s1wtie9" role="1PaTwD">
<property role="3oM_SC" value="node" />
</node>
</node>
</node>
<node concept="3cpWs8" id="63CFXsPEld" role="3cqZAp">
<node concept="3cpWsn" id="63CFXsPEle" role="3cpWs9">
<property role="TrG5h" value="canBeAncestor" />
<node concept="10P_77" id="63CFXsPEl7" role="1tU5fm" />
<node concept="2OqwBi" id="6g_o1CJCW_C" role="33vP2m">
<node concept="2YIFZM" id="6g_o1CJCXcf" role="2Oq$k0">
<ref role="37wK5l" to="ykok:~ConstraintsCanBeFacade.checkCanBeAncestor(jetbrains.mps.core.aspects.constraints.rules.kinds.CanBeAncestorContext)" resolve="checkCanBeAncestor" />
<ref role="1Pybhc" to="ykok:~ConstraintsCanBeFacade" resolve="ConstraintsCanBeFacade" />
<node concept="2OqwBi" id="6g_o1CJCXcg" role="37wK5m">
<node concept="2OqwBi" id="6g_o1CJCXch" role="2Oq$k0">
<node concept="2OqwBi" id="6g_o1CJCXci" role="2Oq$k0">
<node concept="2ShNRf" id="6g_o1CJCXcj" role="2Oq$k0">
<node concept="1pGfFk" id="6g_o1CJCXck" role="2ShVmc">
<ref role="37wK5l" to="pdwk:~CanBeAncestorContext$Builder.&lt;init&gt;()" resolve="CanBeAncestorContext.Builder" />
</node>
</node>
<node concept="liA8E" id="6g_o1CJCXcl" role="2OqNvi">
<ref role="37wK5l" to="pdwk:~CanBeAncestorContext$Builder.ancestorNode(org.jetbrains.mps.openapi.model.SNode)" resolve="ancestorNode" />
<node concept="2Sf5sV" id="6g_o1CJCXcm" role="37wK5m" />
</node>
</node>
<node concept="liA8E" id="6g_o1CJCXcn" role="2OqNvi">
<ref role="37wK5l" to="pdwk:~CanBeAncestorContext$Builder.childConcept(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="childConcept" />
<node concept="35c_gC" id="6g_o1CJCXco" role="37wK5m">
<ref role="35c_gD" to="vs0r:3m8H$lmFM5W" resolve="ElementDocumentation" />
</node>
</node>
</node>
<node concept="liA8E" id="6g_o1CJCXcp" role="2OqNvi">
<ref role="37wK5l" to="pdwk:~CanBeAncestorContext$Builder.build()" resolve="build" />
</node>
</node>
</node>
<node concept="liA8E" id="6g_o1CJCYj$" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
</node>
</node>
</node>
</node>
<node concept="3clFbJ" id="3ni3WidACYr" role="3cqZAp">
<node concept="3clFbS" id="3ni3WidACYt" role="3clFbx">
<node concept="3cpWs6" id="3ni3WidADD4" role="3cqZAp">
<node concept="3clFbT" id="3ni3WidADP1" role="3cqZAk">
<property role="3clFbU" value="false" />
</node>
</node>
</node>
<node concept="3fqX7Q" id="3ni3WidADeh" role="3clFbw">
<node concept="37vLTw" id="3ni3WidADq0" role="3fr31v">
<ref role="3cqZAo" node="63CFXsPEle" resolve="canBeAncestor" />
</node>
</node>
</node>
<node concept="3clFbJ" id="3ni3WidA_sU" role="3cqZAp">
<node concept="3clFbS" id="3ni3WidA_sW" role="3clFbx">
<node concept="3cpWs6" id="3ni3WidAAcT" role="3cqZAp">
Expand Down
58 changes: 0 additions & 58 deletions ....core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22856,64 +22856,6 @@
</node>
</node>
</node>
<node concept="3cpWs8" id="63CFXsPEld" role="3cqZAp">
<node concept="3cpWsn" id="63CFXsPEle" role="3cpWs9">
<property role="TrG5h" value="canBeAncestor" />
<node concept="10P_77" id="63CFXsPEl7" role="1tU5fm" />
<node concept="2OqwBi" id="6g_o1CJDrc_" role="33vP2m">
<node concept="2YIFZM" id="6g_o1CJDrNG" role="2Oq$k0">
<ref role="37wK5l" to="ykok:~ConstraintsCanBeFacade.checkCanBeAncestor(jetbrains.mps.core.aspects.constraints.rules.kinds.CanBeAncestorContext)" resolve="checkCanBeAncestor" />
<ref role="1Pybhc" to="ykok:~ConstraintsCanBeFacade" resolve="ConstraintsCanBeFacade" />
<node concept="2OqwBi" id="6g_o1CJDrNH" role="37wK5m">
<node concept="2OqwBi" id="6g_o1CJDrNI" role="2Oq$k0">
<node concept="2OqwBi" id="6g_o1CJDrNJ" role="2Oq$k0">
<node concept="2ShNRf" id="6g_o1CJDrNK" role="2Oq$k0">
<node concept="1pGfFk" id="6g_o1CJDrNL" role="2ShVmc">
<ref role="37wK5l" to="pdwk:~CanBeAncestorContext$Builder.&lt;init&gt;()" resolve="CanBeAncestorContext.Builder" />
</node>
</node>
<node concept="liA8E" id="6g_o1CJDrNM" role="2OqNvi">
<ref role="37wK5l" to="pdwk:~CanBeAncestorContext$Builder.ancestorNode(org.jetbrains.mps.openapi.model.SNode)" resolve="ancestorNode" />
<node concept="2OqwBi" id="6g_o1CJDrNN" role="37wK5m">
<node concept="2WthIp" id="6g_o1CJDrNO" role="2Oq$k0" />
<node concept="3gHZIF" id="6g_o1CJDrNP" role="2OqNvi">
<ref role="2WH_rO" node="7HcPDtliWhO" resolve="contextNode" />
</node>
</node>
</node>
</node>
<node concept="liA8E" id="6g_o1CJDrNQ" role="2OqNvi">
<ref role="37wK5l" to="pdwk:~CanBeAncestorContext$Builder.childConcept(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="childConcept" />
<node concept="35c_gC" id="6g_o1CJDrNR" role="37wK5m">
<ref role="35c_gD" to="vs0r:3m8H$lmFM5W" resolve="ElementDocumentation" />
</node>
</node>
</node>
<node concept="liA8E" id="6g_o1CJDrNS" role="2OqNvi">
<ref role="37wK5l" to="pdwk:~CanBeAncestorContext$Builder.build()" resolve="build" />
</node>
</node>
</node>
<node concept="liA8E" id="6g_o1CJDsOX" role="2OqNvi">
<ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
</node>
</node>
</node>
</node>
<node concept="3clFbJ" id="3ni3WidACYr" role="3cqZAp">
<node concept="3clFbS" id="3ni3WidACYt" role="3clFbx">
<node concept="3cpWs6" id="3ni3WidADD4" role="3cqZAp">
<node concept="3clFbT" id="3ni3WidADP1" role="3cqZAk">
<property role="3clFbU" value="false" />
</node>
</node>
</node>
<node concept="3fqX7Q" id="3ni3WidADeh" role="3clFbw">
<node concept="37vLTw" id="3ni3WidADq0" role="3fr31v">
<ref role="3cqZAo" node="63CFXsPEle" resolve="canBeAncestor" />
</node>
</node>
</node>
<node concept="3clFbH" id="2ZC4d8r2L2A" role="3cqZAp" />
<node concept="3cpWs6" id="7HcPDtljE8d" role="3cqZAp">
<node concept="1Wc70l" id="rK9hH149J7" role="3cqZAk">
Expand Down
80 changes: 51 additions & 29 deletions ...anguages/com.mbeddr.core/languages/com.mbeddr.core.expressions/languageModels/actions.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,9 @@
<property id="8355037393041754995" name="isNative" index="2aFKle" />
</concept>
<concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
<concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
<reference id="1107535924139" name="classifier" index="3uigEE" />
</concept>
<concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
<child id="1081773367579" name="rightExpression" index="3uHU7w" />
<child id="1081773367580" name="leftExpression" index="3uHU7B" />
Expand Down Expand Up @@ -2522,6 +2525,46 @@
</node>
</node>
</node>
<node concept="3cpWs8" id="1uvPAqC_8YX" role="3cqZAp">
<node concept="3cpWsn" id="1uvPAqC_8YY" role="3cpWs9">
<property role="TrG5h" value="canBeAncestorBuilder" />
<node concept="3uibUv" id="1uvPAqC_8zF" role="1tU5fm">
<ref role="3uigEE" to="pdwk:~CanBeAncestorContext$Builder" resolve="CanBeAncestorContext.Builder" />
</node>
<node concept="2OqwBi" id="1uvPAqC_8YZ" role="33vP2m">
<node concept="2OqwBi" id="1uvPAqC_8Z0" role="2Oq$k0">
<node concept="2OqwBi" id="1uvPAqC_8Z1" role="2Oq$k0">
<node concept="2ShNRf" id="1uvPAqC_8Z3" role="2Oq$k0">
<node concept="1pGfFk" id="1uvPAqC_8Z4" role="2ShVmc">
<ref role="37wK5l" to="pdwk:~CanBeAncestorContext$Builder.&lt;init&gt;()" resolve="CanBeAncestorContext.Builder" />
</node>
</node>
<node concept="liA8E" id="1uvPAqC_8Z7" role="2OqNvi">
<ref role="37wK5l" to="pdwk:~CanBeAncestorContext$Builder.parentNode(org.jetbrains.mps.openapi.model.SNode)" resolve="parentNode" />
<node concept="37vLTw" id="1uvPAqC_8Z8" role="37wK5m">
<ref role="3cqZAo" node="1wu5Hv5M3Ll" resolve="sourceNode" />
</node>
</node>
</node>
<node concept="liA8E" id="1uvPAqC_8Z9" role="2OqNvi">
<ref role="37wK5l" to="pdwk:~CanBeAncestorContext$Builder.childConcept(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="childConcept" />
<node concept="37vLTw" id="1uvPAqC_8Za" role="37wK5m">
<ref role="3cqZAo" node="1wu5Hv5M4dY" resolve="c" />
</node>
</node>
</node>
<node concept="liA8E" id="1uvPAqC_8Zb" role="2OqNvi">
<ref role="37wK5l" to="pdwk:~CanBeAncestorContext$Builder.link(org.jetbrains.mps.openapi.language.SContainmentLink)" resolve="link" />
<node concept="2OqwBi" id="1uvPAqC_8Zc" role="37wK5m">
<node concept="37vLTw" id="1uvPAqC_8Zd" role="2Oq$k0">
<ref role="3cqZAo" node="1wu5Hv5M3Ll" resolve="sourceNode" />
</node>
<node concept="2NL2c5" id="1uvPAqC_8Ze" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
<node concept="2Gpval" id="1wu5Hv5SkyG" role="3cqZAp">
<node concept="2GrKxI" id="1wu5Hv5SkyI" role="2Gsz3X">
<property role="TrG5h" value="currentAncestor" />
Expand All @@ -2541,35 +2584,14 @@
<ref role="37wK5l" to="ykok:~ConstraintsCanBeFacade.checkCanBeAncestor(jetbrains.mps.core.aspects.constraints.rules.kinds.CanBeAncestorContext)" resolve="checkCanBeAncestor" />
<ref role="1Pybhc" to="ykok:~ConstraintsCanBeFacade" resolve="ConstraintsCanBeFacade" />
<node concept="2OqwBi" id="6g_o1CJGfE_" role="37wK5m">
<node concept="2OqwBi" id="6g_o1CJGeJU" role="2Oq$k0">
<node concept="2OqwBi" id="6g_o1CJGe14" role="2Oq$k0">
<node concept="2OqwBi" id="6g_o1CJGd8s" role="2Oq$k0">
<node concept="2ShNRf" id="6g_o1CJGcmC" role="2Oq$k0">
<node concept="1pGfFk" id="6g_o1CJGcRn" role="2ShVmc">
<ref role="37wK5l" to="pdwk:~CanBeAncestorContext$Builder.&lt;init&gt;()" resolve="CanBeAncestorContext.Builder" />
</node>
</node>
<node concept="liA8E" id="6g_o1CJGdqw" role="2OqNvi">
<ref role="37wK5l" to="pdwk:~CanBeAncestorContext$Builder.ancestorNode(org.jetbrains.mps.openapi.model.SNode)" resolve="ancestorNode" />
<node concept="2GrUjf" id="6g_o1CJGbOy" role="37wK5m">
<ref role="2Gs0qQ" node="1wu5Hv5SkyI" resolve="currentAncestor" />
</node>
</node>
</node>
<node concept="liA8E" id="6g_o1CJGelI" role="2OqNvi">
<ref role="37wK5l" to="pdwk:~CanBeAncestorContext$Builder.childConcept(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="childConcept" />
<node concept="37vLTw" id="6g_o1CJGbOz" role="37wK5m">
<ref role="3cqZAo" node="1wu5Hv5M4dY" resolve="c" />
</node>
</node>
</node>
<node concept="liA8E" id="6g_o1CJGf0O" role="2OqNvi">
<ref role="37wK5l" to="pdwk:~CanBeAncestorContext$Builder.link(org.jetbrains.mps.openapi.language.SContainmentLink)" resolve="link" />
<node concept="2OqwBi" id="6g_o1CJGbO$" role="37wK5m">
<node concept="37vLTw" id="6g_o1CJGbO_" role="2Oq$k0">
<ref role="3cqZAo" node="1wu5Hv5M3Ll" resolve="sourceNode" />
</node>
<node concept="2NL2c5" id="6g_o1CJGbOA" role="2OqNvi" />
<node concept="2OqwBi" id="1uvPAqC_b66" role="2Oq$k0">
<node concept="37vLTw" id="1uvPAqC_8Zf" role="2Oq$k0">
<ref role="3cqZAo" node="1uvPAqC_8YY" resolve="canBeAncestorBuilder" />
</node>
<node concept="liA8E" id="1uvPAqC_bo7" role="2OqNvi">
<ref role="37wK5l" to="pdwk:~CanBeAncestorContext$Builder.ancestorNode(org.jetbrains.mps.openapi.model.SNode)" resolve="ancestorNode" />
<node concept="2GrUjf" id="1uvPAqC_bCk" role="37wK5m">
<ref role="2Gs0qQ" node="1wu5Hv5SkyI" resolve="currentAncestor" />
</node>
</node>
</node>
Expand Down
Loading

0 comments on commit a8b6f32

Please sign in to comment.