Skip to content

Commit

Permalink
modelquery: explicitly pass in the SRepository parameter
Browse files Browse the repository at this point in the history
  • Loading branch information
@danielratiu
danielratiu committed May 17, 2024
1 parent 584026d commit ce9a214
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 9 deletions.
14 changes: 11 additions & 3 deletions .../templates/com.mbeddr.formal.safety.argument.modelquery.generator.templates@generator.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
<import index="oq0u" ref="r:e0fdabfa-18f0-4762-8817-0e7b1735bd5d(com.mbeddr.formal.safety.argument.modelquery.util)" />
<import index="agne" ref="r:2538c08a-32a3-4d93-89c3-b508268173db(com.mpsbasics.project.utils.project_finder)" />
<import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
<import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
<import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
Expand Down Expand Up @@ -42,12 +43,14 @@
<concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
<reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
</concept>
<concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
<concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
<concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
<child id="5680397130376446158" name="type" index="1tU5fm" />
</concept>
<concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
<child id="1068580123133" name="returnType" index="3clF45" />
<child id="1068580123134" name="parameter" index="3clF46" />
<child id="1068580123135" name="body" index="3clF47" />
</concept>
<concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
Expand Down Expand Up @@ -225,9 +228,8 @@
</node>
</node>
<node concept="Vyspw" id="y1G8y68fdj" role="2OqNvi">
<node concept="2YIFZM" id="y1G8y68nLc" role="Vysub">
<ref role="37wK5l" to="w1kc:~MPSModuleRepository.getInstance()" resolve="getInstance" />
<ref role="1Pybhc" to="w1kc:~MPSModuleRepository" resolve="MPSModuleRepository" />
<node concept="37vLTw" id="4VhhwF2sy9C" role="Vysub">
<ref role="3cqZAo" node="4VhhwF2sxht" resolve="repo" />
</node>
</node>
</node>
Expand Down Expand Up @@ -329,6 +331,12 @@
</node>
</node>
</node>
<node concept="37vLTG" id="4VhhwF2sxht" role="3clF46">
<property role="TrG5h" value="repo" />
<node concept="3uibUv" id="4VhhwF2sxhs" role="1tU5fm">
<ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
</node>
</node>
</node>
<node concept="2tJIrI" id="y1G8y66rB0" role="jymVt" />
<node concept="3Tm1VV" id="y1G8y66r_k" role="1B3o_S" />
Expand Down
16 changes: 16 additions & 0 deletions ...ty.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.typesystem.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@
</language>
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
<concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
<concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
<child id="1145404616321" name="leftExpression" index="2JrQYb" />
</concept>
<concept id="1212008292747" name="jetbrains.mps.lang.smodel.structure.Model_GetLongNameOperation" flags="nn" index="LkI2h" />
<concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
<reference id="1138056546658" name="link" index="3TtcxE" />
Expand Down Expand Up @@ -231,6 +234,19 @@
<node concept="2GrUjf" id="y1G8y6axzc" role="37wK5m">
<ref role="2Gs0qQ" node="y1G8y67FB2" resolve="mc" />
</node>
<node concept="2OqwBi" id="4VhhwF2suqu" role="37wK5m">
<node concept="2JrnkZ" id="4VhhwF2suin" role="2Oq$k0">
<node concept="2OqwBi" id="4VhhwF2strp" role="2JrQYb">
<node concept="1YBJjd" id="4VhhwF2stgG" role="2Oq$k0">
<ref role="1YBMHb" node="y1G8y66jB2" resolve="modelChecksContainer" />
</node>
<node concept="I4A8Y" id="4VhhwF2stWi" role="2OqNvi" />
</node>
</node>
<node concept="liA8E" id="4VhhwF2suBK" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
</node>
</node>
Expand Down
16 changes: 15 additions & 1 deletion ...l.safety.argument.modelquery/models/com.mbeddr.formal.safety.argument.modelquery.util.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@
<child id="8276990574886367508" name="body" index="1zxBo7" />
</concept>
<concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
<concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
<reference id="1116615189566" name="classifier" index="3VsUkX" />
</concept>
</language>
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
<concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
Expand Down Expand Up @@ -383,6 +386,9 @@
<node concept="37vLTw" id="y1G8y68BB1" role="37wK5m">
<ref role="3cqZAo" node="y1G8y68BAY" resolve="methodName" />
</node>
<node concept="3VsKOn" id="4VhhwF2sZdU" role="37wK5m">
<ref role="3VsUkX" to="lui2:~SRepository" resolve="SRepository" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -424,7 +430,9 @@
</node>
<node concept="liA8E" id="y1G8y68Dl3" role="2OqNvi">
<ref role="37wK5l" to="t6h5:~Method.invoke(java.lang.Object,java.lang.Object...)" resolve="invoke" />
<node concept="10Nm6u" id="y1G8y68Dl4" role="37wK5m" />
<node concept="37vLTw" id="4VhhwF2svJr" role="37wK5m">
<ref role="3cqZAo" node="4VhhwF2suGK" resolve="repo" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -470,6 +478,12 @@
<ref role="ehGHo" to="9br2:1vid6hjrqXf" resolve="ModelCheck" />
</node>
</node>
<node concept="37vLTG" id="4VhhwF2suGK" role="3clF46">
<property role="TrG5h" value="repo" />
<node concept="3uibUv" id="4VhhwF2svua" role="1tU5fm">
<ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
</node>
</node>
</node>
<node concept="3Tm1VV" id="y1G8y6adzT" role="1B3o_S" />
</node>
Expand Down
28 changes: 23 additions & 5 deletions ...odelquery/models/test.mbeddr.formal.safety.argument.modelquery._010_smoke_tests@tests.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
<import index="9br2" ref="r:70aadfb3-8246-45ac-bcd1-b345c7f7cfe4(com.mbeddr.formal.safety.argument.modelquery.structure)" />
<import index="oq0u" ref="r:e0fdabfa-18f0-4762-8817-0e7b1735bd5d(com.mbeddr.formal.safety.argument.modelquery.util)" />
<import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
<import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" implicit="true" />
</imports>
<registry>
Expand Down Expand Up @@ -74,6 +75,9 @@
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
<child id="1068499141038" name="actualArgument" index="37wK5m" />
</concept>
<concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
<reference id="1107535924139" name="classifier" index="3uigEE" />
</concept>
</language>
<language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
<concept id="361130699826193248" name="jetbrains.mps.lang.modelapi.structure.ModelPointer" flags="ng" index="1dCxOl">
Expand Down Expand Up @@ -129,6 +133,20 @@
<property role="TrG5h" value="_010_argument_over_hazards" />
<node concept="3cqZAl" id="y1G8y6aagj" role="3clF45" />
<node concept="3clFbS" id="y1G8y6aagk" role="3clF47">
<node concept="3cpWs8" id="4VhhwF2sIhH" role="3cqZAp">
<node concept="3cpWsn" id="4VhhwF2sIhI" role="3cpWs9">
<property role="TrG5h" value="repository" />
<node concept="3uibUv" id="4VhhwF2sIdP" role="1tU5fm">
<ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
</node>
<node concept="2OqwBi" id="4VhhwF2sIhJ" role="33vP2m">
<node concept="1jxXqW" id="4VhhwF2sIhK" role="2Oq$k0" />
<node concept="liA8E" id="4VhhwF2sIhL" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="y1G8y6aagr" role="3cqZAp">
<node concept="3cpWsn" id="y1G8y6aagu" role="3cpWs9">
<property role="TrG5h" value="m" />
Expand All @@ -143,11 +161,8 @@
</node>
</node>
<node concept="2yCiCJ" id="y1G8y6aaxM" role="2OqNvi">
<node concept="2OqwBi" id="y1G8y6aaGU" role="Vysub">
<node concept="1jxXqW" id="y1G8y6aay7" role="2Oq$k0" />
<node concept="liA8E" id="y1G8y6aaYQ" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
<node concept="37vLTw" id="4VhhwF2sIhM" role="Vysub">
<ref role="3cqZAo" node="4VhhwF2sIhI" resolve="repository" />
</node>
</node>
</node>
Expand Down Expand Up @@ -207,6 +222,9 @@
<node concept="37vLTw" id="y1G8y6aHXn" role="37wK5m">
<ref role="3cqZAo" node="y1G8y6aHzH" resolve="mc" />
</node>
<node concept="37vLTw" id="4VhhwF2sIp9" role="37wK5m">
<ref role="3cqZAo" node="4VhhwF2sIhI" resolve="repository" />
</node>
</node>
</node>
</node>
Expand Down

0 comments on commit ce9a214

Please sign in to comment.