Skip to content

Commit c3d4308

Browse files
author
Alexander Pann
authored
Merge pull request #1015 from IETS3/bugfix/unit_lang
physunits: small fixes
2 parents 0c4bbde + f276ce0 commit c3d4308

File tree

2 files changed

+54
-12
lines changed

2 files changed

+54
-12
lines changed

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.physunits/models/org.iets3.core.expr.typetags.physunits.behavior.mps‎

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,11 @@
3939
<import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
4040
<import index="65nr" ref="r:6e69e40f-b186-4866-917f-dbdef5b3c590(org.iets3.core.expr.typetags.physunits.plugin)" />
4141
<import index="x0pf" ref="r:d4f1532d-fc5c-419f-84ee-daef42867c8e(org.iets3.core.expr.typetags.physunits.typesystem)" />
42+
<import index="3a50" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide(MPS.Platform/)" />
43+
<import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
4244
<import index="b1h1" ref="r:ac5f749f-6179-4d4f-ad24-ad9edbd8077b(org.iets3.core.expr.simpleTypes.behavior)" implicit="true" />
4345
<import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
46+
<import index="wyuk" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.components(MPS.Core/)" implicit="true" />
4447
<import index="yv47" ref="r:da65683e-ff6f-430d-ab68-32a77df72c93(org.iets3.core.expr.toplevel.structure)" implicit="true" />
4548
<import index="31cb" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.extapi.module(MPS.Core/)" implicit="true" />
4649
</imports>
@@ -332,6 +335,9 @@
332335
<concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
333336
<concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
334337
<concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
338+
<concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
339+
<reference id="1116615189566" name="classifier" index="3VsUkX" />
340+
</concept>
335341
<concept id="1178893518978" name="jetbrains.mps.baseLanguage.structure.ThisConstructorInvocation" flags="nn" index="1VxSAg" />
336342
<concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
337343
<concept id="1200397529627" name="jetbrains.mps.baseLanguage.structure.CharConstant" flags="nn" index="1Xhbcc">
@@ -6228,6 +6234,31 @@
62286234
</node>
62296235
</node>
62306236
<node concept="3clFbH" id="2Ux6GHgYavD" role="3cqZAp" />
6237+
<node concept="3cpWs8" id="4wvzrd4Fadu" role="3cqZAp">
6238+
<node concept="3cpWsn" id="4wvzrd4Fadv" role="3cpWs9">
6239+
<property role="TrG5h" value="repository" />
6240+
<node concept="3uibUv" id="4wvzrd4Fadw" role="1tU5fm">
6241+
<ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
6242+
</node>
6243+
<node concept="2OqwBi" id="4wvzrd4Fdye" role="33vP2m">
6244+
<node concept="2OqwBi" id="4wvzrd4Fcgl" role="2Oq$k0">
6245+
<node concept="2YIFZM" id="4wvzrd4FbSN" role="2Oq$k0">
6246+
<ref role="37wK5l" to="3a50:~MPSCoreComponents.getInstance()" resolve="getInstance" />
6247+
<ref role="1Pybhc" to="3a50:~MPSCoreComponents" resolve="MPSCoreComponents" />
6248+
</node>
6249+
<node concept="liA8E" id="4wvzrd4Fd3P" role="2OqNvi">
6250+
<ref role="37wK5l" to="3a50:~MPSCoreComponents.getPlatform()" resolve="getPlatform" />
6251+
</node>
6252+
</node>
6253+
<node concept="liA8E" id="4wvzrd4Fe1R" role="2OqNvi">
6254+
<ref role="37wK5l" to="wyuk:~ComponentHost.findComponent(java.lang.Class)" resolve="findComponent" />
6255+
<node concept="3VsKOn" id="4wvzrd4Fj$z" role="37wK5m">
6256+
<ref role="3VsUkX" to="w1kc:~MPSModuleRepository" resolve="MPSModuleRepository" />
6257+
</node>
6258+
</node>
6259+
</node>
6260+
</node>
6261+
</node>
62316262
<node concept="3SKdUt" id="4DRdDUoCYK0" role="3cqZAp">
62326263
<node concept="1PaTwC" id="17Nm8oCo8F4" role="1aUNEU">
62336264
<node concept="3oM_SD" id="17Nm8oCo8F5" role="1PaTwD">
@@ -6274,18 +6305,8 @@
62746305
<node concept="2YIFZM" id="3eEp8ACWcQU" role="33vP2m">
62756306
<ref role="37wK5l" node="36kPvG5pbWV" resolve="getUnitLessUnit" />
62766307
<ref role="1Pybhc" node="3xM68GMxWv0" resolve="StandardUnitHelper" />
6277-
<node concept="2OqwBi" id="3eEp8ACWfpj" role="37wK5m">
6278-
<node concept="2JrnkZ" id="3eEp8ACWeKq" role="2Oq$k0">
6279-
<node concept="2OqwBi" id="3eEp8ACWdyx" role="2JrQYb">
6280-
<node concept="37vLTw" id="3eEp8ACWd8h" role="2Oq$k0">
6281-
<ref role="3cqZAo" node="6FK1Pb8yBLh" resolve="node" />
6282-
</node>
6283-
<node concept="I4A8Y" id="3eEp8ACWel3" role="2OqNvi" />
6284-
</node>
6285-
</node>
6286-
<node concept="liA8E" id="3eEp8ACWgbu" role="2OqNvi">
6287-
<ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
6288-
</node>
6308+
<node concept="37vLTw" id="4wvzrd4FkA9" role="37wK5m">
6309+
<ref role="3cqZAo" node="4wvzrd4Fadv" resolve="repository" />
62896310
</node>
62906311
</node>
62916312
</node>

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/org.iets3.core.expr.typetags.units.plugin.mps‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9194,6 +9194,27 @@
91949194
<node concept="3clFb_" id="3jMXg0bRHEq" role="jymVt">
91959195
<property role="TrG5h" value="addMissingImport" />
91969196
<node concept="3clFbS" id="3jMXg0bRHEt" role="3clF47">
9197+
<node concept="3clFbJ" id="4wvzrd8LFI8" role="3cqZAp">
9198+
<node concept="3clFbS" id="4wvzrd8LFIa" role="3clFbx">
9199+
<node concept="3cpWs6" id="4wvzrd8Olib" role="3cqZAp" />
9200+
</node>
9201+
<node concept="3clFbC" id="4wvzrd8NPN6" role="3clFbw">
9202+
<node concept="10Nm6u" id="4wvzrd8O66N" role="3uHU7w" />
9203+
<node concept="2OqwBi" id="4wvzrd8NoCE" role="3uHU7B">
9204+
<node concept="2JrnkZ" id="4wvzrd8N7dB" role="2Oq$k0">
9205+
<node concept="2OqwBi" id="4wvzrd8MbgF" role="2JrQYb">
9206+
<node concept="37vLTw" id="4wvzrd8LUhF" role="2Oq$k0">
9207+
<ref role="3cqZAo" node="3jMXg0bRVhi" resolve="node" />
9208+
</node>
9209+
<node concept="I4A8Y" id="4wvzrd8MtDi" role="2OqNvi" />
9210+
</node>
9211+
</node>
9212+
<node concept="liA8E" id="4wvzrd8N$M8" role="2OqNvi">
9213+
<ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
9214+
</node>
9215+
</node>
9216+
</node>
9217+
</node>
91979218
<node concept="3cpWs8" id="3jMXg0bS6pR" role="3cqZAp">
91989219
<node concept="3cpWsn" id="3jMXg0bS6pS" role="3cpWs9">
91999220
<property role="TrG5h" value="imports" />

0 commit comments

Comments
 (0)