Merge pull request #1051 from IETS3/bugfix/align20222

Get all relevant changes from 2022.3 to 2022.2
IETS3 · Aug 29, 2024 · 13a5a71 · 13a5a71
2 parents 30ae1a8 + bf459e1
commit 13a5a71
Show file tree

Hide file tree

Showing 35 changed files with 594 additions and 319 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,10 +7,14 @@ The project does _not_ follow Semantic Versioning and the changes are documented
 
 ## August 2024
 
-### Fixed
+### Added
 
-- TraceExplorer can decorate editors of lambda nodes with their values. 
+- The name of the unitless unit can now be customized through the `PhysUnitLangConfig` extension point.
+
+### Fixed
 
+- The performance of error type propagation (especially in relation to type tags) was improved.
+- TraceExplorer can decorate editors of lambda nodes with their values.
 ## July 2024
 
 ### Added

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/typesystem.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/typesystem.mps
@@ -631,10 +631,24 @@
                     </node>
                   </node>
                 </node>
-                <node concept="3y3z36" id="7Wtc_Q2kU3O" role="3clFbw">
-                  <node concept="10Nm6u" id="7Wtc_Q2kU3V" role="3uHU7w" />
-                  <node concept="37vLTw" id="7Wtc_Q2kTVq" role="3uHU7B">
-                    <ref role="3cqZAo" node="7Wtc_Q2kRy5" resolve="wrappedOpType" />
+                <node concept="1Wc70l" id="TrLxV$B918" role="3clFbw">
+                  <node concept="3fqX7Q" id="TrLxV$BBr0" role="3uHU7w">
+                    <node concept="2OqwBi" id="TrLxV$BBr2" role="3fr31v">
+                      <node concept="37vLTw" id="TrLxV$BBr3" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7Wtc_Q2kRy5" resolve="wrappedOpType" />
+                      </node>
+                      <node concept="1mIQ4w" id="TrLxV$BBr4" role="2OqNvi">
+                        <node concept="chp4Y" id="TrLxV$BBr5" role="cj9EA">
+                          <ref role="cht4Q" to="tpd4:hfSilrT" resolve="RuntimeErrorType" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3y3z36" id="7Wtc_Q2kU3O" role="3uHU7B">
+                    <node concept="37vLTw" id="7Wtc_Q2kTVq" role="3uHU7B">
+                      <ref role="3cqZAo" node="7Wtc_Q2kRy5" resolve="wrappedOpType" />
+                    </node>
+                    <node concept="10Nm6u" id="7Wtc_Q2kU3V" role="3uHU7w" />
                   </node>
                 </node>
                 <node concept="9aQIb" id="7Wtc_Q2kUlm" role="9aQIa">
@@ -827,6 +841,38 @@
                           </node>
                           <node concept="9aQIb" id="5ya_dKpNFdb" role="9aQIa">
                             <node concept="3clFbS" id="5ya_dKpNFdc" role="9aQI4">
+                              <node concept="3clFbJ" id="TrLxV$GKl$" role="3cqZAp">
+                                <node concept="3clFbS" id="TrLxV$GKlA" role="3clFbx">
+                                  <node concept="2MkqsV" id="TrLxV$GKEm" role="3cqZAp">
+                                    <node concept="2OqwBi" id="TrLxV$GLgY" role="2MkJ7o">
+                                      <node concept="1PxgMI" id="TrLxV$GL0Z" role="2Oq$k0">
+                                        <node concept="chp4Y" id="TrLxV$GL1r" role="3oSUPX">
+                                          <ref role="cht4Q" to="tpd4:hfSilrT" resolve="RuntimeErrorType" />
+                                        </node>
+                                        <node concept="37vLTw" id="TrLxV$GKEy" role="1m5AlR">
+                                          <ref role="3cqZAo" node="6Mx2TmozGCe" resolve="operationType" />
+                                        </node>
+                                      </node>
+                                      <node concept="3TrcHB" id="TrLxV$GLD1" role="2OqNvi">
+                                        <ref role="3TsBF5" to="tpd4:hfSilrU" resolve="errorText" />
+                                      </node>
+                                    </node>
+                                    <node concept="1YBJjd" id="TrLxV$GLGl" role="1urrMF">
+                                      <ref role="1YBMHb" node="4rZeNQ6PB0M" resolve="be" />
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="2OqwBi" id="TrLxV$GKur" role="3clFbw">
+                                  <node concept="37vLTw" id="TrLxV$GKlJ" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="6Mx2TmozGCe" resolve="operationType" />
+                                  </node>
+                                  <node concept="1mIQ4w" id="TrLxV$GKAL" role="2OqNvi">
+                                    <node concept="chp4Y" id="TrLxV$GKCJ" role="cj9EA">
+                                      <ref role="cht4Q" to="tpd4:hfSilrT" resolve="RuntimeErrorType" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
                               <node concept="1Z5TYs" id="4rZeNQ6PBmp" role="3cqZAp">
                                 <node concept="mw_s8" id="4rZeNQ6PBmL" role="1ZfhKB">
                                   <node concept="37vLTw" id="3f3yNhCQlpZ" role="mwGJk">
@@ -3495,6 +3541,31 @@
                         </node>
                       </node>
                     </node>
+                    <node concept="Jncv_" id="4f0EPAKOOym" role="3cqZAp">
+                      <ref role="JncvD" to="tpd4:hfSilrT" resolve="RuntimeErrorType" />
+                      <node concept="37vLTw" id="4f0EPAKOZtu" role="JncvB">
+                        <ref role="3cqZAo" node="6KhzXd8iOxU" resolve="r" />
+                      </node>
+                      <node concept="3clFbS" id="4f0EPAKOOyq" role="Jncv$">
+                        <node concept="2MkqsV" id="4f0EPAKP3GE" role="3cqZAp">
+                          <node concept="37vLTw" id="4f0EPAKPaat" role="1urrMF">
+                            <ref role="3cqZAo" node="12WRc28WHKr" resolve="toBeTypedNode" />
+                          </node>
+                          <node concept="2OqwBi" id="4f0EPAKP8ff" role="2MkJ7o">
+                            <node concept="Jnkvi" id="4f0EPAKP7Uc" role="2Oq$k0">
+                              <ref role="1M0zk5" node="4f0EPAKOOys" resolve="errorType" />
+                            </node>
+                            <node concept="3TrcHB" id="4f0EPAKP9mS" role="2OqNvi">
+                              <ref role="3TsBF5" to="tpd4:hfSilrU" resolve="errorText" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="JncvC" id="4f0EPAKOOys" role="JncvA">
+                        <property role="TrG5h" value="errorType" />
+                        <node concept="2jxLKc" id="4f0EPAKOOyt" role="1tU5fm" />
+                      </node>
+                    </node>
                     <node concept="1Z5TYs" id="6KhzXd8iOXW" role="3cqZAp">
                       <node concept="mw_s8" id="6KhzXd8iOZy" role="1ZfhKB">
                         <node concept="37vLTw" id="6KhzXd8iOZw" role="mwGJk">
@@ -6831,6 +6902,10 @@
             </node>
           </node>
         </node>
+        <node concept="2X1qdy" id="46cplYwOkUY" role="2X0Ygz">
+          <property role="TrG5h" value="sub" />
+          <node concept="2jxLKc" id="46cplYwOkUZ" role="1tU5fm" />
+        </node>
         <node concept="1Z2H0r" id="46cplYwOl9S" role="nvjzm">
           <node concept="2OqwBi" id="46cplYwOlam" role="1Z2MuG">
             <node concept="1YBJjd" id="5P6itWnRcUe" role="2Oq$k0">
@@ -6841,10 +6916,6 @@
             </node>
           </node>
         </node>
-        <node concept="2X1qdy" id="46cplYwOkUY" role="2X0Ygz">
-          <property role="TrG5h" value="sub" />
-          <node concept="2jxLKc" id="46cplYwOkUZ" role="1tU5fm" />
-        </node>
       </node>
     </node>
     <node concept="1YaCAy" id="5aHkq2w4PM6" role="1YuTPh">

diff --git a/...ages/org.iets3.opensource/languages/org.iets3.core.expr.base/org.iets3.core.expr.base.mpl b/...ages/org.iets3.opensource/languages/org.iets3.core.expr.base/org.iets3.core.expr.base.mpl
@@ -36,6 +36,7 @@
     <language slang="l:1fc20ffe-f35b-4791-a0b7-d706bad5c49a:com.mbeddr.mpsutil.refactoring" version="0" />
     <language slang="l:1919c723-b60b-4592-9318-9ce96d91da44:de.itemis.mps.editor.celllayout" version="0" />
     <language slang="l:b8bb702e-43ed-4090-a902-d180d3e5f292:de.slisson.mps.conditionalEditor" version="0" />
+    <language slang="l:654422bf-e75f-44dc-936d-188890a746ce:de.slisson.mps.reflection" version="0" />
     <language slang="l:52733268-be24-4f5f-ab84-a73b7c0c03b0:de.slisson.mps.richtext.customcell" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />

diff --git a/...pensource/languages/org.iets3.core.expr.genjava.base/org.iets3.core.expr.genjava.base.mpl b/...pensource/languages/org.iets3.core.expr.genjava.base/org.iets3.core.expr.genjava.base.mpl
@@ -54,7 +54,6 @@
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
         <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />

diff --git a/...languages/org.iets3.core.expr.genjava.contracts/org.iets3.core.expr.genjava.contracts.mpl b/...languages/org.iets3.core.expr.genjava.contracts/org.iets3.core.expr.genjava.contracts.mpl
@@ -43,7 +43,6 @@
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
         <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />

diff --git a/...pensource/languages/org.iets3.core.expr.genjava.data/org.iets3.core.expr.genjava.data.mpl b/...pensource/languages/org.iets3.core.expr.genjava.data/org.iets3.core.expr.genjava.data.mpl
@@ -45,7 +45,6 @@
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
         <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />

diff --git a/...e/languages/org.iets3.core.expr.genjava.datetime/org.iets3.core.expr.genjava.datetime.mpl b/...e/languages/org.iets3.core.expr.genjava.datetime/org.iets3.core.expr.genjava.datetime.mpl
@@ -49,7 +49,6 @@
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
         <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />

diff --git a/...uages/org.iets3.core.expr.genjava.simpleTypes/org.iets3.core.expr.genjava.simpleTypes.mpl b/...uages/org.iets3.core.expr.genjava.simpleTypes/org.iets3.core.expr.genjava.simpleTypes.mpl
@@ -50,7 +50,6 @@
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
         <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />

diff --git a/...e/languages/org.iets3.core.expr.genjava.temporal/org.iets3.core.expr.genjava.temporal.mpl b/...e/languages/org.iets3.core.expr.genjava.temporal/org.iets3.core.expr.genjava.temporal.mpl
@@ -53,7 +53,6 @@
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
         <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />

diff --git a/...nsource/languages/org.iets3.core.expr.genjava.tests/org.iets3.core.expr.genjava.tests.mpl b/...nsource/languages/org.iets3.core.expr.genjava.tests/org.iets3.core.expr.genjava.tests.mpl
@@ -50,7 +50,6 @@
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
         <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />

diff --git a/...e/languages/org.iets3.core.expr.genjava.toplevel/org.iets3.core.expr.genjava.toplevel.mpl b/...e/languages/org.iets3.core.expr.genjava.toplevel/org.iets3.core.expr.genjava.toplevel.mpl
@@ -54,7 +54,6 @@
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
         <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />

diff --git a/...pensource/languages/org.iets3.core.expr.genjava.util/org.iets3.core.expr.genjava.util.mpl b/...pensource/languages/org.iets3.core.expr.genjava.util/org.iets3.core.expr.genjava.util.mpl
@@ -52,7 +52,6 @@
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
         <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />

diff --git a/...ore.expr.typetags.physunits/models/org.iets3.core.expr.typetags.physunits.constraints.mps b/...ore.expr.typetags.physunits/models/org.iets3.core.expr.typetags.physunits.constraints.mps
@@ -15,6 +15,11 @@
     <import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" />
     <import index="i3ya" ref="r:4f64e2f0-6a4e-4db3-b3bf-7977f44949b6(org.iets3.core.expr.typetags.physunits.structure)" />
     <import index="rppw" ref="r:720d563d-1633-46b3-a98e-08d2fde4c4a8(org.iets3.core.expr.typetags.physunits.behavior)" />
+    <import index="65nr" ref="r:6e69e40f-b186-4866-917f-dbdef5b3c590(org.iets3.core.expr.typetags.physunits.plugin)" />
+    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
+    <import index="3a50" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide(MPS.Platform/)" />
+    <import index="wyuk" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.components(MPS.Core/)" />
+    <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
     <import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" implicit="true" />
     <import index="hwgx" ref="r:fd2980c8-676c-4b19-b524-18c70e02f8b7(com.mbeddr.core.base.behavior)" implicit="true" />
     <import index="qlm2" ref="r:c0482758-b46b-48c3-8482-fa4a3115b53b(org.iets3.core.expr.typetags.behavior)" implicit="true" />
@@ -51,6 +56,7 @@
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
       <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
+      <concept id="1225271283259" name="jetbrains.mps.baseLanguage.structure.NPEEqualsExpression" flags="nn" index="17R0WA" />
       <concept id="1225271408483" name="jetbrains.mps.baseLanguage.structure.IsNotEmptyOperation" flags="nn" index="17RvpY" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
@@ -644,6 +650,47 @@
   <node concept="1M2fIO" id="1KUmgSFvSuo">
     <property role="3GE5qa" value="definition.unit" />
     <ref role="1M2myG" to="i3ya:7eOyx9r3jsZ" resolve="Unit" />
+    <node concept="EnEH3" id="3xwfj1iseUc" role="1MhHOB">
+      <ref role="EomxK" to="tpck:h0TrG11" resolve="name" />
+      <node concept="Eqf_E" id="3xwfj1ivqJx" role="EtsB7">
+        <node concept="3clFbS" id="3xwfj1ivqJy" role="2VODD2">
+          <node concept="3clFbJ" id="7amkF1KMrHA" role="3cqZAp">
+            <node concept="3clFbS" id="7amkF1KMrHC" role="3clFbx">
+              <node concept="3cpWs6" id="7amkF1KMtPH" role="3cqZAp">
+                <node concept="2OqwBi" id="3xwfj1ivyIG" role="3cqZAk">
+                  <node concept="2YIFZM" id="3xwfj1ivyvg" role="2Oq$k0">
+                    <ref role="37wK5l" to="65nr:4qv99IrBnzk" resolve="getConfig" />
+                    <ref role="1Pybhc" to="65nr:4qv99IrBkzE" resolve="PhysUnitLangConfigHelper" />
+                  </node>
+                  <node concept="liA8E" id="3xwfj1ivySq" role="2OqNvi">
+                    <ref role="37wK5l" to="65nr:3xwfj1imT4h" resolve="getUnitLessUnitName" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="17R0WA" id="7amkF1KMtFP" role="3clFbw">
+              <node concept="Xl_RD" id="7amkF1KMtIz" role="3uHU7w">
+                <property role="Xl_RC" value="unitless" />
+              </node>
+              <node concept="2OqwBi" id="7amkF1KMsaW" role="3uHU7B">
+                <node concept="EsrRn" id="7amkF1KMrIt" role="2Oq$k0" />
+                <node concept="3TrcHB" id="7amkF1KMsMI" role="2OqNvi">
+                  <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs6" id="3xwfj1ivz4w" role="3cqZAp">
+            <node concept="2OqwBi" id="3xwfj1ivAwP" role="3cqZAk">
+              <node concept="EsrRn" id="3xwfj1ivzaR" role="2Oq$k0" />
+              <node concept="3TrcHB" id="3xwfj1ivB96" role="2OqNvi">
+                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="1N5Pfh" id="1KUmgSFvSup" role="1Mr941">
       <ref role="1N5Vy1" to="i3ya:1KUmgSFpwWq" resolve="quantity" />
       <node concept="3dgokm" id="1KUmgSFvSut" role="1N6uqs">