Skip to content

Commit 881511a

Browse files
wsafonovwsafonov
committed
physunits: code improvements
1 parent 233a619 commit 881511a

File tree

2 files changed

+193
-35
lines changed

2 files changed

+193
-35
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: 176 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -596,10 +596,7 @@
596596
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
597597
<property id="1169194664001" name="name" index="TrG5h" />
598598
</concept>
599-
<concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
600-
<property id="8575328350543493365" name="message" index="huDt6" />
601-
<property id="2423417345669755629" name="filter" index="1eyWvh" />
602-
</concept>
599+
<concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7" />
603600
</language>
604601
<language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
605602
<concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="nn" index="3oM_SD">
@@ -4874,6 +4871,52 @@
48744871
</node>
48754872
</node>
48764873
<node concept="3clFbH" id="2Ux6GHgYavD" role="3cqZAp" />
4874+
<node concept="3SKdUt" id="5zjZVcti4Mr" role="3cqZAp">
4875+
<node concept="1PaTwC" id="5zjZVcti4Ms" role="1aUNEU">
4876+
<node concept="3oM_SD" id="5zjZVcti5E1" role="1PaTwD">
4877+
<property role="3oM_SC" value="deprecated" />
4878+
</node>
4879+
<node concept="3oM_SD" id="5zjZVcti5E2" role="1PaTwD">
4880+
<property role="3oM_SC" value="getInstance" />
4881+
</node>
4882+
<node concept="3oM_SD" id="5zjZVcti5E3" role="1PaTwD">
4883+
<property role="3oM_SC" value="is" />
4884+
</node>
4885+
<node concept="3oM_SD" id="5zjZVcti5E4" role="1PaTwD">
4886+
<property role="3oM_SC" value="necessary" />
4887+
</node>
4888+
<node concept="3oM_SD" id="5zjZVcti5E5" role="1PaTwD">
4889+
<property role="3oM_SC" value="to" />
4890+
</node>
4891+
<node concept="3oM_SD" id="5zjZVcti5E6" role="1PaTwD">
4892+
<property role="3oM_SC" value="ensure" />
4893+
</node>
4894+
<node concept="3oM_SD" id="5zjZVcti5E7" role="1PaTwD">
4895+
<property role="3oM_SC" value="compatibility" />
4896+
</node>
4897+
<node concept="3oM_SD" id="5zjZVcti5E8" role="1PaTwD">
4898+
<property role="3oM_SC" value="with" />
4899+
</node>
4900+
<node concept="3oM_SD" id="5zjZVcti5E9" role="1PaTwD">
4901+
<property role="3oM_SC" value="the" />
4902+
</node>
4903+
<node concept="3oM_SD" id="5zjZVcti5Ea" role="1PaTwD">
4904+
<property role="3oM_SC" value="command-line" />
4905+
</node>
4906+
<node concept="3oM_SD" id="5zjZVcti5Eb" role="1PaTwD">
4907+
<property role="3oM_SC" value="generator" />
4908+
</node>
4909+
<node concept="3oM_SD" id="5zjZVcti5Ec" role="1PaTwD">
4910+
<property role="3oM_SC" value="execution" />
4911+
</node>
4912+
<node concept="3oM_SD" id="5zjZVcti5Ed" role="1PaTwD">
4913+
<property role="3oM_SC" value="(MpsEnvironment)" />
4914+
</node>
4915+
<node concept="3oM_SD" id="5zjZVcti5DZ" role="1PaTwD">
4916+
<property role="3oM_SC" value="" />
4917+
</node>
4918+
</node>
4919+
</node>
48774920
<node concept="3cpWs8" id="4wvzrd4Fadu" role="3cqZAp">
48784921
<node concept="3cpWsn" id="4wvzrd4Fadv" role="3cpWs9">
48794922
<property role="TrG5h" value="repository" />
@@ -7769,10 +7812,8 @@
77697812
</node>
77707813
</node>
77717814
</node>
7772-
<node concept="_YKpA" id="4jkbLB63Lsl" role="3clF45">
7773-
<node concept="3Tqbb2" id="4jkbLB63LOI" role="_ZDj9">
7774-
<ref role="ehGHo" to="i3ya:7athFveEYHG" resolve="UnitExpression" />
7775-
</node>
7815+
<node concept="2I9FWS" id="5zjZVctrBox" role="3clF45">
7816+
<ref role="2I9WkF" to="i3ya:7athFveEYHG" resolve="UnitExpression" />
77767817
</node>
77777818
</node>
77787819
<node concept="2tJIrI" id="4jkbLB61hJe" role="jymVt" />
@@ -9167,17 +9208,18 @@
91679208
<ref role="3Tt5mk" to="i3ya:7eOyx9r3qG3" resolve="specification" />
91689209
</node>
91699210
</node>
9170-
<node concept="1rXfSq" id="7dduDjLgU0m" role="37vLTx">
9171-
<ref role="37wK5l" node="7dduDjL8xAO" resolve="createUnitMultiplication" />
9172-
<node concept="37vLTw" id="7dduDjLgXlK" role="37wK5m">
9173-
<ref role="3cqZAo" node="6q$NxWeYcv3" resolve="unitRefs" />
9211+
<node concept="1PxgMI" id="5zjZVcts1pc" role="37vLTx">
9212+
<node concept="chp4Y" id="5zjZVcts6$v" role="3oSUPX">
9213+
<ref role="cht4Q" to="i3ya:7athFveEYHG" resolve="UnitExpression" />
9214+
</node>
9215+
<node concept="1rXfSq" id="7dduDjLgU0m" role="1m5AlR">
9216+
<ref role="37wK5l" node="7dduDjL8xAO" resolve="createUnitMultiplication" />
9217+
<node concept="37vLTw" id="7dduDjLgXlK" role="37wK5m">
9218+
<ref role="3cqZAo" node="6q$NxWeYcv3" resolve="unitRefs" />
9219+
</node>
91749220
</node>
91759221
</node>
91769222
</node>
9177-
<node concept="15s5l7" id="4esM_INBtf_" role="lGtFl">
9178-
<property role="1eyWvh" value="FLAVOUR_ISSUE_KIND=&quot;typesystem (typesystem)&quot;;" />
9179-
<property role="huDt6" value="all typesystem messages" />
9180-
</node>
91819223
</node>
91829224
<node concept="3cpWs6" id="6q$NxWeYcvl" role="3cqZAp">
91839225
<node concept="37vLTw" id="6q$NxWeYcvm" role="3cqZAk">
@@ -9274,10 +9316,8 @@
92749316
</node>
92759317
<node concept="37vLTG" id="7dduDjL8_GQ" role="3clF46">
92769318
<property role="TrG5h" value="unitExprs" />
9277-
<node concept="_YKpA" id="7dduDjL8_GO" role="1tU5fm">
9278-
<node concept="3Tqbb2" id="7dduDjL8EGs" role="_ZDj9">
9279-
<ref role="ehGHo" to="i3ya:45a4DYZTq2h" resolve="IGroupLike" />
9280-
</node>
9319+
<node concept="2I9FWS" id="5zjZVctruRz" role="1tU5fm">
9320+
<ref role="2I9WkF" to="i3ya:45a4DYZTq2h" resolve="IGroupLike" />
92819321
</node>
92829322
</node>
92839323
</node>
@@ -9397,10 +9437,8 @@
93979437
</node>
93989438
</node>
93999439
<node concept="3Tm1VV" id="28ZCOKTZGej" role="1B3o_S" />
9400-
<node concept="_YKpA" id="28ZCOKTZNQp" role="3clF45">
9401-
<node concept="3Tqbb2" id="28ZCOKTZQDS" role="_ZDj9">
9402-
<ref role="ehGHo" to="i3ya:7athFveEYHG" resolve="UnitExpression" />
9403-
</node>
9440+
<node concept="2I9FWS" id="5zjZVctrGVS" role="3clF45">
9441+
<ref role="2I9WkF" to="i3ya:7athFveEYHG" resolve="UnitExpression" />
94049442
</node>
94059443
<node concept="37vLTG" id="28ZCOKTZV_K" role="3clF46">
94069444
<property role="TrG5h" value="expr" />
@@ -9693,6 +9731,61 @@
96939731
</node>
96949732
</node>
96959733
</node>
9734+
<node concept="3SKdUt" id="5zjZVctiMcU" role="3cqZAp">
9735+
<node concept="1PaTwC" id="5zjZVctiMcV" role="1aUNEU">
9736+
<node concept="3oM_SD" id="5zjZVctiRZp" role="1PaTwD">
9737+
<property role="3oM_SC" value="deprecated" />
9738+
</node>
9739+
<node concept="3oM_SD" id="5zjZVctiRZq" role="1PaTwD">
9740+
<property role="3oM_SC" value="getInstance" />
9741+
</node>
9742+
<node concept="3oM_SD" id="5zjZVctiRZr" role="1PaTwD">
9743+
<property role="3oM_SC" value="is" />
9744+
</node>
9745+
<node concept="3oM_SD" id="5zjZVctiRZs" role="1PaTwD">
9746+
<property role="3oM_SC" value="necessary" />
9747+
</node>
9748+
<node concept="3oM_SD" id="5zjZVctiRZt" role="1PaTwD">
9749+
<property role="3oM_SC" value="to" />
9750+
</node>
9751+
<node concept="3oM_SD" id="5zjZVctiRZu" role="1PaTwD">
9752+
<property role="3oM_SC" value="ensure" />
9753+
</node>
9754+
<node concept="3oM_SD" id="5zjZVctiRZv" role="1PaTwD">
9755+
<property role="3oM_SC" value="compatibility" />
9756+
</node>
9757+
<node concept="3oM_SD" id="5zjZVctiRZw" role="1PaTwD">
9758+
<property role="3oM_SC" value="with" />
9759+
</node>
9760+
<node concept="3oM_SD" id="5zjZVctiRZx" role="1PaTwD">
9761+
<property role="3oM_SC" value="the" />
9762+
</node>
9763+
<node concept="3oM_SD" id="5zjZVctiRZy" role="1PaTwD">
9764+
<property role="3oM_SC" value="command-line" />
9765+
</node>
9766+
<node concept="3oM_SD" id="5zjZVctiRZz" role="1PaTwD">
9767+
<property role="3oM_SC" value="generator" />
9768+
</node>
9769+
<node concept="3oM_SD" id="5zjZVctiRZ$" role="1PaTwD">
9770+
<property role="3oM_SC" value="execution" />
9771+
</node>
9772+
<node concept="3oM_SD" id="5zjZVctiRZ_" role="1PaTwD">
9773+
<property role="3oM_SC" value="(MpsEnvironment)" />
9774+
</node>
9775+
</node>
9776+
</node>
9777+
<node concept="3cpWs8" id="5zjZVctioiE" role="3cqZAp">
9778+
<node concept="3cpWsn" id="5zjZVctioiF" role="3cpWs9">
9779+
<property role="TrG5h" value="classLoaderManager" />
9780+
<node concept="3uibUv" id="5zjZVctiaXu" role="1tU5fm">
9781+
<ref role="3uigEE" to="3qmy:~ClassLoaderManager" resolve="ClassLoaderManager" />
9782+
</node>
9783+
<node concept="2YIFZM" id="5zjZVctioiG" role="33vP2m">
9784+
<ref role="37wK5l" to="3qmy:~ClassLoaderManager.getInstance()" resolve="getInstance" />
9785+
<ref role="1Pybhc" to="3qmy:~ClassLoaderManager" resolve="ClassLoaderManager" />
9786+
</node>
9787+
</node>
9788+
</node>
96969789
<node concept="3cpWs8" id="4P6r3pewrDc" role="3cqZAp">
96979790
<node concept="3cpWsn" id="4P6r3pewrDd" role="3cpWs9">
96989791
<property role="TrG5h" value="typeChecking" />
@@ -9712,9 +9805,8 @@
97129805
<ref role="37wK5l" to="u78q:~TypeChecker.getTypeCheckerHelper()" resolve="getTypeCheckerHelper" />
97139806
</node>
97149807
</node>
9715-
<node concept="2YIFZM" id="6sSKyiUq00K" role="37wK5m">
9716-
<ref role="37wK5l" to="3qmy:~ClassLoaderManager.getInstance()" resolve="getInstance" />
9717-
<ref role="1Pybhc" to="3qmy:~ClassLoaderManager" resolve="ClassLoaderManager" />
9808+
<node concept="37vLTw" id="5zjZVctioiH" role="37wK5m">
9809+
<ref role="3cqZAo" node="5zjZVctioiF" resolve="instance" />
97189810
</node>
97199811
</node>
97209812
</node>
@@ -10776,6 +10868,61 @@
1077610868
</node>
1077710869
<node concept="3clFbJ" id="3_TFq$0_vSL" role="3cqZAp">
1077810870
<node concept="3clFbS" id="3_TFq$0_vSM" role="3clFbx">
10871+
<node concept="3SKdUt" id="5zjZVcthEyb" role="3cqZAp">
10872+
<node concept="1PaTwC" id="5zjZVcthEyc" role="1aUNEU">
10873+
<node concept="3oM_SD" id="5zjZVcti1HI" role="1PaTwD">
10874+
<property role="3oM_SC" value="deprecated" />
10875+
</node>
10876+
<node concept="3oM_SD" id="5zjZVcthPJv" role="1PaTwD">
10877+
<property role="3oM_SC" value="getInstance" />
10878+
</node>
10879+
<node concept="3oM_SD" id="5zjZVcthPLS" role="1PaTwD">
10880+
<property role="3oM_SC" value="is" />
10881+
</node>
10882+
<node concept="3oM_SD" id="5zjZVcthPOh" role="1PaTwD">
10883+
<property role="3oM_SC" value="necessary" />
10884+
</node>
10885+
<node concept="3oM_SD" id="5zjZVcthPOi" role="1PaTwD">
10886+
<property role="3oM_SC" value="to" />
10887+
</node>
10888+
<node concept="3oM_SD" id="5zjZVcthPPv" role="1PaTwD">
10889+
<property role="3oM_SC" value="ensure" />
10890+
</node>
10891+
<node concept="3oM_SD" id="5zjZVcthPQG" role="1PaTwD">
10892+
<property role="3oM_SC" value="compatibility" />
10893+
</node>
10894+
<node concept="3oM_SD" id="5zjZVcthPRT" role="1PaTwD">
10895+
<property role="3oM_SC" value="with" />
10896+
</node>
10897+
<node concept="3oM_SD" id="5zjZVcthPRU" role="1PaTwD">
10898+
<property role="3oM_SC" value="the" />
10899+
</node>
10900+
<node concept="3oM_SD" id="5zjZVcthQ7s" role="1PaTwD">
10901+
<property role="3oM_SC" value="command-line" />
10902+
</node>
10903+
<node concept="3oM_SD" id="5zjZVcthPWH" role="1PaTwD">
10904+
<property role="3oM_SC" value="generator" />
10905+
</node>
10906+
<node concept="3oM_SD" id="5zjZVcthPXU" role="1PaTwD">
10907+
<property role="3oM_SC" value="execution" />
10908+
</node>
10909+
<node concept="3oM_SD" id="5zjZVcthPXV" role="1PaTwD">
10910+
<property role="3oM_SC" value="(MpsEnvironment)" />
10911+
</node>
10912+
</node>
10913+
</node>
10914+
<node concept="3cpWs8" id="5zjZVcthJ9j" role="3cqZAp">
10915+
<node concept="3cpWsn" id="5zjZVcthJ9k" role="3cpWs9">
10916+
<property role="TrG5h" value="classLoaderManager" />
10917+
<node concept="3uibUv" id="5zjZVcthFgf" role="1tU5fm">
10918+
<ref role="3uigEE" to="3qmy:~ClassLoaderManager" resolve="ClassLoaderManager" />
10919+
</node>
10920+
<node concept="2YIFZM" id="5zjZVcthJ9l" role="33vP2m">
10921+
<ref role="37wK5l" to="3qmy:~ClassLoaderManager.getInstance()" resolve="getInstance" />
10922+
<ref role="1Pybhc" to="3qmy:~ClassLoaderManager" resolve="ClassLoaderManager" />
10923+
</node>
10924+
</node>
10925+
</node>
1077910926
<node concept="3cpWs8" id="5pqsPq42MOm" role="3cqZAp">
1078010927
<node concept="3cpWsn" id="5pqsPq42MOn" role="3cpWs9">
1078110928
<property role="TrG5h" value="typeChecking" />
@@ -10795,9 +10942,8 @@
1079510942
<ref role="37wK5l" to="u78q:~TypeChecker.getTypeCheckerHelper()" resolve="getTypeCheckerHelper" />
1079610943
</node>
1079710944
</node>
10798-
<node concept="2YIFZM" id="6sSKyiUpdcc" role="37wK5m">
10799-
<ref role="37wK5l" to="3qmy:~ClassLoaderManager.getInstance()" resolve="getInstance" />
10800-
<ref role="1Pybhc" to="3qmy:~ClassLoaderManager" resolve="ClassLoaderManager" />
10945+
<node concept="37vLTw" id="5zjZVcthJ9m" role="37wK5m">
10946+
<ref role="3cqZAo" node="5zjZVcthJ9k" resolve="instance" />
1080110947
</node>
1080210948
</node>
1080310949
</node>

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

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,6 +1058,23 @@
10581058
<node concept="3Tm1VV" id="77DmBXAD1A9" role="1B3o_S" />
10591059
<node concept="10P_77" id="77DmBXAD16M" role="3clF45" />
10601060
<node concept="2JFqV2" id="77DmBXAD1VJ" role="2frcjj" />
1061+
<node concept="P$JXv" id="5zjZVctiSA$" role="lGtFl">
1062+
<node concept="TZ5HA" id="5zjZVctiSA_" role="TZ5H$">
1063+
<node concept="1dT_AC" id="5zjZVctiSAA" role="1dT_Ay">
1064+
<property role="1dT_AB" value="Allows compatible unit specifications (e.g. different prefix than expected) without implicit conversions being enabled." />
1065+
</node>
1066+
</node>
1067+
<node concept="TZ5HA" id="5zjZVctiTT4" role="TZ5H$">
1068+
<node concept="1dT_AC" id="5zjZVctiTT5" role="1dT_Ay">
1069+
<property role="1dT_AB" value="" />
1070+
</node>
1071+
</node>
1072+
<node concept="TZ5HA" id="5zjZVctiTYG" role="TZ5H$">
1073+
<node concept="1dT_AC" id="5zjZVctiTYH" role="1dT_Ay">
1074+
<property role="1dT_AB" value="Introduced to support the new, stricter unit compatibility check without forcing activation of the implicit conversions." />
1075+
</node>
1076+
</node>
1077+
</node>
10611078
</node>
10621079
<node concept="2tJIrI" id="77DmBXAD1ms" role="jymVt" />
10631080
<node concept="2tJIrI" id="77DmBXAD1rE" role="jymVt" />
@@ -1077,11 +1094,6 @@
10771094
<property role="1dT_AB" value="Returns the comparator used to order exponents in group-like expressions e.g. quantity and unit specification expression." />
10781095
</node>
10791096
</node>
1080-
<node concept="TZ5HA" id="HeBpG2jsq" role="TZ5H$">
1081-
<node concept="1dT_AC" id="HeBpG2jsr" role="1dT_Ay">
1082-
<property role="1dT_AB" value="" />
1083-
</node>
1084-
</node>
10851097
</node>
10861098
</node>
10871099
<node concept="3Tm1VV" id="4qv99IryjZp" role="1B3o_S" />

0 commit comments

Comments
 (0)