Merge pull request #952 from IETS3/merge/mps20222

Merge maintenance/mps20222 into maintenance/mps20223
IETS3 · May 16, 2024 · 2ddaa85 · 2ddaa85
2 parents 1323317 + 1a5bc62
commit 2ddaa85
Show file tree

Hide file tree

Showing 14 changed files with 3,129 additions and 1,779 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,23 @@ All notable changes to this project are documented in this file.
 Format of the log is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 The project does _not_ follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.
 
+## May 2024
+
+### Added
+
+- A new memory prefix for units was implemented (https://en.wikipedia.org/wiki/JEDEC_memory_standards#Unit_prefixes_for_semiconductor_storage_capacity)
+- Quantities now support transformation properties such as scalar or vector, so that you can't incorrectly mix units such as speed (scalar) and velocity (vector).
+- The error message that a unit is shadowed, can now be ignored through an annotation.
+
+### Changed
+
+- The name changes to the binary IEC unit prefixes was reversed.
+
+### Fixed
+
+- The prevision loss when converting units in the interpreter was fixed.
+- An editor issue in NumberRangeSpec was fixed that also prevented adding a precision to a number type.
+
 ## April 2024
 
 ### Removed

diff --git a/...anguages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/editor.mps b/...anguages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/editor.mps
@@ -767,9 +767,6 @@
         <node concept="11L4FC" id="2MMBR00YG8u" role="3F10Kt">
           <property role="VOm3f" value="true" />
         </node>
-        <node concept="11LMrY" id="2MMBR00YG8v" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
         <node concept="1HfYo3" id="2MMBR00YFMJ" role="1HlULh">
           <node concept="3TQlhw" id="2MMBR00YFMM" role="1Hhtcw">
             <node concept="3clFbS" id="2MMBR00YFMP" role="2VODD2">

diff --git a/...rce/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/plugin.mps b/...rce/languages/org.iets3.core.expr.toplevel/models/org/iets3/core/expr/toplevel/plugin.mps
@@ -455,7 +455,7 @@
       <property role="TrG5h" value="presenter" />
       <node concept="3Tm6S6" id="3IFv_upFiz0" role="1B3o_S" />
       <node concept="3uibUv" id="3IFv_upHVyD" role="1tU5fm">
-        <ref role="3uigEE" node="3IFv_upJqYO" resolve="IRecordValuePresenter" />
+        <ref role="3uigEE" node="3IFv_upJqYO" resolve="IPresenter" />
       </node>
     </node>
     <node concept="2tJIrI" id="3IFv_upFffk" role="jymVt" />
@@ -2922,13 +2922,13 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="3IFv_upJsur" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="763_liNzF66" role="jymVt" />
     <node concept="3Tm1VV" id="3IFv_upHUaW" role="1B3o_S" />
     <node concept="3uibUv" id="3IFv_upJrq0" role="EKbjA">
-      <ref role="3uigEE" node="3IFv_upJqYO" resolve="IRecordValuePresenter" />
+      <ref role="3uigEE" node="3IFv_upJqYO" resolve="IPresenter" />
       <node concept="3uibUv" id="3IFv_upJ_F6" role="11_B2D">
         <ref role="3uigEE" node="7D7uZV2szll" resolve="RecordValue" />
       </node>
@@ -2945,7 +2945,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="763_liNzEmx" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
   </node>

diff --git a/...3.core.expr.typetags.physunits/models/org.iets3.core.expr.typetags.physunits.behavior.mps b/...3.core.expr.typetags.physunits/models/org.iets3.core.expr.typetags.physunits.behavior.mps
diff --git a/...ts3.core.expr.typetags.physunits/models/org.iets3.core.expr.typetags.physunits.editor.mps b/...ts3.core.expr.typetags.physunits/models/org.iets3.core.expr.typetags.physunits.editor.mps
diff --git a/...ts3.core.expr.typetags.physunits/models/org.iets3.core.expr.typetags.physunits.plugin.mps b/...ts3.core.expr.typetags.physunits/models/org.iets3.core.expr.typetags.physunits.plugin.mps
@@ -389,7 +389,7 @@
     </language>
   </registry>
   <node concept="312cEu" id="2rzAw9UX_8Q">
-    <property role="TrG5h" value="vUnitTypesPrimitiveTypeMapperHelper" />
+    <property role="TrG5h" value="UnitTypesPrimitiveTypeMapperHelper" />
     <node concept="3clFbW" id="2rzAw9UX_gS" role="jymVt">
       <node concept="3cqZAl" id="2rzAw9UX_gU" role="3clF45" />
       <node concept="3Tm6S6" id="2rzAw9UX_hi" role="1B3o_S" />
@@ -453,7 +453,7 @@
                       </node>
                       <node concept="2YIFZM" id="2rzAw9UY1ST" role="33vP2m">
                         <ref role="37wK5l" node="2rzAw9UXBuX" resolve="findUnitSpecificationInKey" />
-                        <ref role="1Pybhc" node="2rzAw9UX_8Q" resolve="vUnitTypesPrimitiveTypeMapperHelper" />
+                        <ref role="1Pybhc" node="2rzAw9UX_8Q" resolve="UnitTypesPrimitiveTypeMapperHelper" />
                         <node concept="37vLTw" id="2rzAw9UY1SU" role="37wK5m">
                           <ref role="3cqZAo" node="2rzAw9UY1SA" resolve="unitSpec2TypesMap" />
                         </node>
@@ -1364,7 +1364,7 @@
                           <node concept="2qgKlT" id="4qv99Irzo9w" role="2OqNvi">
                             <ref role="37wK5l" to="rppw:3_TFq$0_vSx" resolve="getApplicableConversionSpecifiers" />
                             <node concept="37vLTw" id="tQsiKdSs4Q" role="37wK5m">
-                              <ref role="3cqZAo" node="tQsiKdSs4K" resolve="ancestor" />
+                              <ref role="3cqZAo" node="tQsiKdSs4K" resolve="visibleElementsProvider" />
                             </node>
                           </node>
                         </node>

diff --git a/....core.expr.typetags.physunits/models/org.iets3.core.expr.typetags.physunits.structure.mps b/....core.expr.typetags.physunits/models/org.iets3.core.expr.typetags.physunits.structure.mps
@@ -23,9 +23,16 @@
         <reference id="1075010451642646892" name="defaultMember" index="1H5jkz" />
         <child id="3348158742936976577" name="members" index="25R1y" />
       </concept>
+      <concept id="6054523464627964745" name="jetbrains.mps.lang.structure.structure.AttributeInfo_AttributedConcept" flags="ng" index="trNpa">
+        <reference id="6054523464627965081" name="concept" index="trN6q" />
+      </concept>
       <concept id="1082978164218" name="jetbrains.mps.lang.structure.structure.DataTypeDeclaration" flags="ng" index="AxPO6">
         <property id="7791109065626895363" name="datatypeId" index="3F6X1D" />
       </concept>
+      <concept id="2992811758677295509" name="jetbrains.mps.lang.structure.structure.AttributeInfo" flags="ng" index="M6xJ_">
+        <property id="7588428831955550663" name="role" index="Hh88m" />
+        <child id="7588428831947959310" name="attributed" index="EQaZv" />
+      </concept>
       <concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
         <property id="6714410169261853888" name="conceptId" index="EcuMT" />
         <property id="4628067390765907488" name="conceptShortDescription" index="R4oN_" />
@@ -61,6 +68,7 @@
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
@@ -393,6 +401,13 @@
       <ref role="20lvS9" node="7athFveyQjs" resolve="QuantitySpecification" />
       <ref role="20ksaX" node="6q45UTyLsCx" resolve="specification" />
     </node>
+    <node concept="1TJgyj" id="1eut2uU9_A6" role="1TKVEi">
+      <property role="IQ2ns" value="1413695047016536454" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="transformationProperties" />
+      <property role="20lbJX" value="fLJekj5/_0__n" />
+      <ref role="20lvS9" node="1eut2uU9$qs" resolve="ITransformationProperty" />
+    </node>
     <node concept="1TJgyi" id="7Bmg9Oo3Vr1" role="1TKVEl">
       <property role="IQ2nx" value="8779275567063086785" />
       <property role="TrG5h" value="derived" />
@@ -808,8 +823,13 @@
     </node>
     <node concept="25R33" id="2hbaSyABMZQ" role="25R1y">
       <property role="3tVfz5" value="2615231874529701878" />
-      <property role="TrG5h" value="binary" />
-      <property role="1L1pqM" value="binary-scaled" />
+      <property role="TrG5h" value="binary_iec" />
+      <property role="1L1pqM" value="binary-scaled (IEC)" />
+    </node>
+    <node concept="25R33" id="6DczoUSGcZl" role="25R1y">
+      <property role="3tVfz5" value="7659652710373838805" />
+      <property role="TrG5h" value="binary_memory" />
+      <property role="1L1pqM" value="binary-scaled (memory)" />
     </node>
   </node>
   <node concept="1TIwiD" id="14aBVbMOlEH">
@@ -955,5 +975,77 @@
       <ref role="PrY4T" node="45a4DYZYSsN" resolve="IGroupNeutral" />
     </node>
   </node>
+  <node concept="PlHQZ" id="1eut2uU9$qs">
+    <property role="EcuMT" value="1413695047016531612" />
+    <property role="3GE5qa" value="group.transformationProperty" />
+    <property role="TrG5h" value="ITransformationProperty" />
+  </node>
+  <node concept="1TIwiD" id="1eut2uU9$_R">
+    <property role="EcuMT" value="1413695047016532343" />
+    <property role="3GE5qa" value="group.transformationProperty" />
+    <property role="TrG5h" value="Scalar" />
+    <property role="34LRSv" value="scalar" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="PrWs8" id="1eut2uU9$KS" role="PzmwI">
+      <ref role="PrY4T" node="1eut2uU9$qs" resolve="ITransformationProperty" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="1eut2uU9$Mz">
+    <property role="EcuMT" value="1413695047016533155" />
+    <property role="3GE5qa" value="group.transformationProperty" />
+    <property role="TrG5h" value="Vector" />
+    <property role="34LRSv" value="vector" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="PrWs8" id="1eut2uU9$M$" role="PzmwI">
+      <ref role="PrY4T" node="1eut2uU9$qs" resolve="ITransformationProperty" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="1eut2uU9_pu">
+    <property role="EcuMT" value="1413695047016535646" />
+    <property role="3GE5qa" value="group.transformationProperty" />
+    <property role="TrG5h" value="Tensor" />
+    <property role="34LRSv" value="tensor" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="PrWs8" id="1eut2uU9_pv" role="PzmwI">
+      <ref role="PrY4T" node="1eut2uU9$qs" resolve="ITransformationProperty" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="1eut2uWh6mA">
+    <property role="EcuMT" value="1413695047052060070" />
+    <property role="3GE5qa" value="group.transformationProperty" />
+    <property role="TrG5h" value="PseudoScalar" />
+    <property role="34LRSv" value="pseudoscalar" />
+    <ref role="1TJDcQ" node="1eut2uU9$_R" resolve="Scalar" />
+  </node>
+  <node concept="1TIwiD" id="1eut2uWEsLQ">
+    <property role="EcuMT" value="1413695047058705526" />
+    <property role="3GE5qa" value="group.transformationProperty" />
+    <property role="TrG5h" value="VectorField" />
+    <property role="34LRSv" value="vector field" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="PrWs8" id="1eut2uWEsLR" role="PzmwI">
+      <ref role="PrY4T" node="1eut2uU9$qs" resolve="ITransformationProperty" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="1eut2uXxsyl">
+    <property role="EcuMT" value="1413695047073122453" />
+    <property role="3GE5qa" value="group.transformationProperty" />
+    <property role="TrG5h" value="PseudoVector" />
+    <property role="34LRSv" value="pseudovector" />
+    <ref role="1TJDcQ" node="1eut2uU9$Mz" resolve="Vector" />
+  </node>
+  <node concept="1TIwiD" id="3V2fk_c6FtV">
+    <property role="EcuMT" value="4522244360852125563" />
+    <property role="3GE5qa" value="definition.unit" />
+    <property role="TrG5h" value="AllowNameShadowingAnnotation" />
+    <property role="34LRSv" value="@allow name shadowing" />
+    <ref role="1TJDcQ" to="tpck:2ULFgo8_XDk" resolve="NodeAttribute" />
+    <node concept="M6xJ_" id="3V2fk_c6FEi" role="lGtFl">
+      <property role="Hh88m" value="allowShadowing" />
+      <node concept="trNpa" id="3V2fk_c6FO$" role="EQaZv">
+        <ref role="trN6q" node="7eOyx9r3jsZ" resolve="Unit" />
+      </node>
+    </node>
+  </node>
 </model>