Skip to content

Commit

Permalink
Merge pull request #1016 from IETS3/merge/mps20222
Browse files Browse the repository at this point in the history 
Merge maintenance/mps20222 into maintenance/mps20223
  • Loading branch information
@arimer
arimer authored Jul 24, 2024
2 parents 2920aaf + d355029 commit 356002a
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 12 deletions.
45 changes: 33 additions & 12 deletions ...3.core.expr.typetags.physunits/models/org.iets3.core.expr.typetags.physunits.behavior.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,11 @@
<import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
<import index="65nr" ref="r:6e69e40f-b186-4866-917f-dbdef5b3c590(org.iets3.core.expr.typetags.physunits.plugin)" />
<import index="x0pf" ref="r:d4f1532d-fc5c-419f-84ee-daef42867c8e(org.iets3.core.expr.typetags.physunits.typesystem)" />
<import index="3a50" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide(MPS.Platform/)" />
<import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
<import index="b1h1" ref="r:ac5f749f-6179-4d4f-ad24-ad9edbd8077b(org.iets3.core.expr.simpleTypes.behavior)" implicit="true" />
<import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
<import index="wyuk" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.components(MPS.Core/)" implicit="true" />
<import index="yv47" ref="r:da65683e-ff6f-430d-ab68-32a77df72c93(org.iets3.core.expr.toplevel.structure)" implicit="true" />
<import index="31cb" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.extapi.module(MPS.Core/)" implicit="true" />
</imports>
Expand Down Expand Up @@ -332,6 +335,9 @@
<concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
<concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
<concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
<concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
<reference id="1116615189566" name="classifier" index="3VsUkX" />
</concept>
<concept id="1178893518978" name="jetbrains.mps.baseLanguage.structure.ThisConstructorInvocation" flags="nn" index="1VxSAg" />
<concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
<concept id="1200397529627" name="jetbrains.mps.baseLanguage.structure.CharConstant" flags="nn" index="1Xhbcc">
Expand Down Expand Up @@ -6228,6 +6234,31 @@
</node>
</node>
<node concept="3clFbH" id="2Ux6GHgYavD" role="3cqZAp" />
<node concept="3cpWs8" id="4wvzrd4Fadu" role="3cqZAp">
<node concept="3cpWsn" id="4wvzrd4Fadv" role="3cpWs9">
<property role="TrG5h" value="repository" />
<node concept="3uibUv" id="4wvzrd4Fadw" role="1tU5fm">
<ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
</node>
<node concept="2OqwBi" id="4wvzrd4Fdye" role="33vP2m">
<node concept="2OqwBi" id="4wvzrd4Fcgl" role="2Oq$k0">
<node concept="2YIFZM" id="4wvzrd4FbSN" role="2Oq$k0">
<ref role="37wK5l" to="3a50:~MPSCoreComponents.getInstance()" resolve="getInstance" />
<ref role="1Pybhc" to="3a50:~MPSCoreComponents" resolve="MPSCoreComponents" />
</node>
<node concept="liA8E" id="4wvzrd4Fd3P" role="2OqNvi">
<ref role="37wK5l" to="3a50:~MPSCoreComponents.getPlatform()" resolve="getPlatform" />
</node>
</node>
<node concept="liA8E" id="4wvzrd4Fe1R" role="2OqNvi">
<ref role="37wK5l" to="wyuk:~ComponentHost.findComponent(java.lang.Class)" resolve="findComponent" />
<node concept="3VsKOn" id="4wvzrd4Fj$z" role="37wK5m">
<ref role="3VsUkX" to="w1kc:~MPSModuleRepository" resolve="MPSModuleRepository" />
</node>
</node>
</node>
</node>
</node>
<node concept="3SKdUt" id="4DRdDUoCYK0" role="3cqZAp">
<node concept="1PaTwC" id="17Nm8oCo8F4" role="1aUNEU">
<node concept="3oM_SD" id="17Nm8oCo8F5" role="1PaTwD">
Expand Down Expand Up @@ -6274,18 +6305,8 @@
<node concept="2YIFZM" id="3eEp8ACWcQU" role="33vP2m">
<ref role="37wK5l" node="36kPvG5pbWV" resolve="getUnitLessUnit" />
<ref role="1Pybhc" node="3xM68GMxWv0" resolve="StandardUnitHelper" />
<node concept="2OqwBi" id="3eEp8ACWfpj" role="37wK5m">
<node concept="2JrnkZ" id="3eEp8ACWeKq" role="2Oq$k0">
<node concept="2OqwBi" id="3eEp8ACWdyx" role="2JrQYb">
<node concept="37vLTw" id="3eEp8ACWd8h" role="2Oq$k0">
<ref role="3cqZAo" node="6FK1Pb8yBLh" resolve="node" />
</node>
<node concept="I4A8Y" id="3eEp8ACWel3" role="2OqNvi" />
</node>
</node>
<node concept="liA8E" id="3eEp8ACWgbu" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
</node>
<node concept="37vLTw" id="4wvzrd4FkA9" role="37wK5m">
<ref role="3cqZAo" node="4wvzrd4Fadv" resolve="repository" />
</node>
</node>
</node>
Expand Down
21 changes: 21 additions & 0 deletions ...s/org.iets3.core.expr.typetags.units/models/org.iets3.core.expr.typetags.units.plugin.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9194,6 +9194,27 @@
<node concept="3clFb_" id="3jMXg0bRHEq" role="jymVt">
<property role="TrG5h" value="addMissingImport" />
<node concept="3clFbS" id="3jMXg0bRHEt" role="3clF47">
<node concept="3clFbJ" id="4wvzrd8LFI8" role="3cqZAp">
<node concept="3clFbS" id="4wvzrd8LFIa" role="3clFbx">
<node concept="3cpWs6" id="4wvzrd8Olib" role="3cqZAp" />
</node>
<node concept="3clFbC" id="4wvzrd8NPN6" role="3clFbw">
<node concept="10Nm6u" id="4wvzrd8O66N" role="3uHU7w" />
<node concept="2OqwBi" id="4wvzrd8NoCE" role="3uHU7B">
<node concept="2JrnkZ" id="4wvzrd8N7dB" role="2Oq$k0">
<node concept="2OqwBi" id="4wvzrd8MbgF" role="2JrQYb">
<node concept="37vLTw" id="4wvzrd8LUhF" role="2Oq$k0">
<ref role="3cqZAo" node="3jMXg0bRVhi" resolve="node" />
</node>
<node concept="I4A8Y" id="4wvzrd8MtDi" role="2OqNvi" />
</node>
</node>
<node concept="liA8E" id="4wvzrd8N$M8" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="3jMXg0bS6pR" role="3cqZAp">
<node concept="3cpWsn" id="3jMXg0bS6pS" role="3cpWs9">
<property role="TrG5h" value="imports" />
Expand Down

0 comments on commit 356002a

Please sign in to comment.