Merge pull request #1138 from IETS3/bugfix/units_of_digital_information

Author: Alexander Pann

CHANGELOG.md

@@ -12,9 +12,15 @@ The project does _not_ follow Semantic Versioning and the changes are documented
 - Hexadecimal attributes are now better visible in the diff view.
 - Negative decimal values are now correctly converted to hexadecimal values.
 
-### Changes
+### Changed
 
 - It is now possible to customize where hex values are enabled. With PrimitiveTypeMapper#filterHexadecimalSupportingNodes you can now enable/disable them for specific nodes.
+- The physical units B and b were renamed to byte and bit to avoid confusion.
+- Breaking change: The units of digital information were split into 3 different libraries: UnitsOfInformationIEC, UnitsOfInformationJEDEC, UnitsOfInformationMetric. They are still considered part of the derived units.
+
+### Added 
+
+- Physical units now also support metric scaling for only the positive and negative prefixes. Scaling can also be overwritten for units by overwritten `IUnitLangConfig#getOverwrittenScaling` for the extension point `PhysUnitLangConfig`.
 
 ## October 2024
 

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

@@ -2465,15 +2465,14 @@
                       <node concept="liA8E" id="4dsOSthqJzd" role="2OqNvi">
                         <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                         <node concept="2OqwBi" id="4dsOSthr4cu" role="37wK5m">
-                          <node concept="2OqwBi" id="4dsOSthr2SI" role="2Oq$k0">
-                            <node concept="2ZBlsa" id="4dsOSthr0_4" role="2Oq$k0" />
-                            <node concept="3TrcHB" id="4dsOSthr3KS" role="2OqNvi">
-                              <ref role="3TsBF5" to="i3ya:2hbaSyABN4s" resolve="scaling" />
-                            </node>
-                          </node>
                           <node concept="liA8E" id="4dsOSthr4DB" role="2OqNvi">
                             <ref role="37wK5l" to="c17a:~SEnumerationLiteral.getPresentation()" resolve="getPresentation" />
                           </node>
+                          <node concept="2YIFZM" id="4zqoYUCgk0L" role="2Oq$k0">
+                            <ref role="37wK5l" to="rppw:4zqoYUCdlDz" resolve="getScaling" />
+                            <ref role="1Pybhc" to="rppw:4jkbLB5RJZL" resolve="UnitConversionUtil" />
+                            <node concept="2ZBlsa" id="4zqoYUCjkkJ" role="37wK5m" />
+                          </node>
                         </node>
                       </node>
                     </node>

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

@@ -19,7 +19,7 @@
     <import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" />
     <import index="pbu6" ref="r:83e946de-2a7f-4a4c-b3c9-4f671aa7f2db(org.iets3.core.expr.base.behavior)" />
     <import index="3o3z" ref="ecfb9949-7433-4db5-85de-0f84d172e4ce/java:com.google.common.collect(de.q60.mps.collections.libs/)" />
-    <import index="rppw" ref="r:720d563d-1633-46b3-a98e-08d2fde4c4a8(org.iets3.core.expr.typetags.quantities.behavior)" />
+    <import index="rppw" ref="r:720d563d-1633-46b3-a98e-08d2fde4c4a8(org.iets3.core.expr.typetags.physunits.behavior)" />
     <import index="i3ya" ref="r:4f64e2f0-6a4e-4db3-b3bf-7977f44949b6(org.iets3.core.expr.typetags.physunits.structure)" />
     <import index="rxpb" ref="r:31fd8edf-66c5-44d7-84a8-5940badb4d17(org.iets3.core.expr.base.interpreter.plugin)" />
     <import index="km5y" ref="r:78e88ebb-2d27-4b89-867f-623c50619338(org.iets3.core.expr.simpleTypes.interpreter.plugin)" />
@@ -314,6 +314,9 @@
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
+      <concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU">
+        <reference id="7400021826771268269" name="concept" index="2sp9C9" />
+      </concept>
       <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
@@ -330,6 +333,9 @@
         <child id="1145404616321" name="leftExpression" index="2JrQYb" />
       </concept>
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
+      <concept id="1240170042401" name="jetbrains.mps.lang.smodel.structure.SEnumerationMemberType" flags="in" index="2ZThk1">
+        <reference id="1240170836027" name="enum" index="2ZWj4r" />
+      </concept>
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
       </concept>
@@ -388,6 +394,14 @@
       </concept>
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1178286324487" name="jetbrains.mps.baseLanguage.collections.structure.SortDirection" flags="nn" index="1nlBCl" />
+      <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
+        <child id="1197683466920" name="keyType" index="3rvQeY" />
+        <child id="1197683475734" name="valueType" index="3rvSg0" />
+      </concept>
+      <concept id="1197686869805" name="jetbrains.mps.baseLanguage.collections.structure.HashMapCreator" flags="nn" index="3rGOSV">
+        <child id="1197687026896" name="keyType" index="3rHrn6" />
+        <child id="1197687035757" name="valueType" index="3rHtpV" />
+      </concept>
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1240687580870" name="jetbrains.mps.baseLanguage.collections.structure.JoinOperation" flags="nn" index="3uJxvA">
         <child id="1240687658305" name="delimiter" index="3uJOhx" />
@@ -1071,6 +1085,34 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="4zqoYUC7Ogg" role="jymVt" />
+    <node concept="3clFb_" id="4zqoYUC7SCk" role="jymVt">
+      <property role="TrG5h" value="getOverwrittenScaling" />
+      <node concept="3clFbS" id="4zqoYUC7SCn" role="3clF47">
+        <node concept="3clFbF" id="4zqoYUC7Tyx" role="3cqZAp">
+          <node concept="2ShNRf" id="4zqoYUC7Tyv" role="3clFbG">
+            <node concept="3rGOSV" id="4zqoYUC82TL" role="2ShVmc">
+              <node concept="2sp9CU" id="4zqoYUCkRrG" role="3rHrn6">
+                <ref role="2sp9C9" to="i3ya:7eOyx9r3jsZ" resolve="Unit" />
+              </node>
+              <node concept="2ZThk1" id="4zqoYUC83yy" role="3rHtpV">
+                <ref role="2ZWj4r" to="i3ya:2hbaSyABMZL" resolve="UnitScalingType" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="4zqoYUC7SCo" role="1B3o_S" />
+      <node concept="3rvAFt" id="4zqoYUC7Sjl" role="3clF45">
+        <node concept="2sp9CU" id="4zqoYUCkRhk" role="3rvQeY">
+          <ref role="2sp9C9" to="i3ya:7eOyx9r3jsZ" resolve="Unit" />
+        </node>
+        <node concept="2ZThk1" id="4zqoYUC7SCi" role="3rvSg0">
+          <ref role="2ZWj4r" to="i3ya:2hbaSyABMZL" resolve="UnitScalingType" />
+        </node>
+      </node>
+      <node concept="2JFqV2" id="4zqoYUC7TgQ" role="2frcjj" />
+    </node>
     <node concept="3Tm1VV" id="4qv99IryjZp" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="4qv99IrzTI8">

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

@@ -825,6 +825,16 @@
       <property role="TrG5h" value="metric" />
       <property role="1L1pqM" value="metric-scaled" />
     </node>
+    <node concept="25R33" id="4zqoYUyQ7z3" role="25R1y">
+      <property role="3tVfz5" value="5249618192239196355" />
+      <property role="TrG5h" value="metric_positive" />
+      <property role="1L1pqM" value="metric-scaled (positive)" />
+    </node>
+    <node concept="25R33" id="4zqoYUyQ7z4" role="25R1y">
+      <property role="3tVfz5" value="5249618192239196356" />
+      <property role="TrG5h" value="metric_negative" />
+      <property role="1L1pqM" value="metric-scaled (negative)" />
+    </node>
     <node concept="25R33" id="2hbaSyABMZQ" role="25R1y">
       <property role="3tVfz5" value="2615231874529701878" />
       <property role="TrG5h" value="binary_iec" />