Merge pull request #1159 from IETS3/merge/mps20223

IETS3 · Dec 4, 2024 · 7e4d498 · 7e4d498
2 parents ea87b85 + 648e81c
commit 7e4d498
Show file tree

Hide file tree

Showing 33 changed files with 2,243 additions and 541 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,12 @@ The project does _not_ follow Semantic Versioning and the changes are documented
 ### 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`.
 
 ### Added
 

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/plugin.mps
@@ -2546,10 +2546,10 @@
               <ref role="3cqZAo" node="1VsTyb1NCFx" resolve="messaging" />
             </node>
             <node concept="37vLTw" id="1VsTyb1NCFo" role="37wK5m">
-              <ref role="3cqZAo" node="1VsTyb1NCFz" resolve="execEnv" />
+              <ref role="3cqZAo" node="1VsTyb1NCFz" resolve="solverCreationEnv" />
             </node>
             <node concept="37vLTw" id="_TaQix3DF1" role="37wK5m">
-              <ref role="3cqZAo" node="_TaQix3_0K" resolve="execEnv2" />
+              <ref role="3cqZAo" node="_TaQix3_0K" resolve="solverRunEnv" />
             </node>
           </node>
         </node>
@@ -2584,7 +2584,7 @@
       <node concept="37vLTG" id="1VsTyb1NCFz" role="3clF46">
         <property role="TrG5h" value="solverCreationEnv" />
         <node concept="3uibUv" id="6pPfAzJAd9C" role="1tU5fm">
-          <ref role="3uigEE" node="6pPfAzJt_YX" resolve="IExecEnv" />
+          <ref role="3uigEE" node="6pPfAzJt_YX" resolve="AsyncSolverTaskExecutor.IExecEnv" />
           <node concept="3uibUv" id="6pPfAzJAd9D" role="11_B2D">
             <ref role="3uigEE" node="3x8VOVHeBE$" resolve="ITask" />
           </node>
@@ -2593,7 +2593,7 @@
       <node concept="37vLTG" id="_TaQix3_0K" role="3clF46">
         <property role="TrG5h" value="solverRunEnv" />
         <node concept="3uibUv" id="_TaQix3_0L" role="1tU5fm">
-          <ref role="3uigEE" node="6pPfAzJt_YX" resolve="IExecEnv" />
+          <ref role="3uigEE" node="6pPfAzJt_YX" resolve="AsyncSolverTaskExecutor.IExecEnv" />
           <node concept="3vKaQO" id="_TaQix3_0M" role="11_B2D">
             <node concept="3uibUv" id="_TaQix3_0N" role="3O5elw">
               <ref role="3uigEE" to="gdgh:5zG5$Lyex1G" resolve="IResult" />
@@ -2739,7 +2739,7 @@
             <node concept="1rXfSq" id="IJ8MgQfWHs" role="33vP2m">
               <ref role="37wK5l" node="IJ8MgQekrX" resolve="scheduleTaskCreation" />
               <node concept="37vLTw" id="IJ8MgQeks3" role="37wK5m">
-                <ref role="3cqZAo" node="1VsTyb1M33j" resolve="execEnv" />
+                <ref role="3cqZAo" node="1VsTyb1M33j" resolve="solverCreationEnv" />
               </node>
               <node concept="37vLTw" id="IJ8MgQeks4" role="37wK5m">
                 <ref role="3cqZAo" node="1VsTyb1M2ZA" resolve="solvableJob" />
@@ -2784,7 +2784,7 @@
                       <node concept="1rXfSq" id="6mS76k2TW2s" role="2Oq$k0">
                         <ref role="37wK5l" node="5s4vWCDj51r" resolve="runSolverTask" />
                         <node concept="37vLTw" id="_TaQix1RHG" role="37wK5m">
-                          <ref role="3cqZAo" node="_TaQix1M$G" resolve="execEnvTaskRunning" />
+                          <ref role="3cqZAo" node="_TaQix1M$G" resolve="solverRunEnv" />
                         </node>
                         <node concept="37vLTw" id="6mS76k2RYBH" role="37wK5m">
                           <ref role="3cqZAo" node="IJ8MgQdNa0" resolve="statusUpdater" />
@@ -2857,7 +2857,7 @@
         <node concept="TUZQ0" id="6mS76k2VUxm" role="3nqlJM">
           <property role="TUZQ4" value="Around-Environment where SolverTask creation is run" />
           <node concept="zr_55" id="6mS76k2VXYf" role="zr_5Q">
-            <ref role="zr_51" node="1VsTyb1M33j" resolve="execEnv" />
+            <ref role="zr_51" node="1VsTyb1M33j" resolve="solverCreationEnv" />
           </node>
         </node>
         <node concept="x79VA" id="1VsTyb1M33y" role="3nqlJM">
@@ -2904,7 +2904,7 @@
         <property role="TrG5h" value="solverRunEnv" />
         <property role="3TUv4t" value="true" />
         <node concept="3uibUv" id="_TaQix1M$H" role="1tU5fm">
-          <ref role="3uigEE" node="6pPfAzJt_YX" resolve="IExecEnv" />
+          <ref role="3uigEE" node="6pPfAzJt_YX" resolve="AsyncSolverTaskExecutor.IExecEnv" />
           <node concept="3vKaQO" id="_TaQix2WVV" role="11_B2D">
             <node concept="3uibUv" id="_TaQix2WVW" role="3O5elw">
               <ref role="3uigEE" to="gdgh:5zG5$Lyex1G" resolve="IResult" />
@@ -3916,7 +3916,7 @@
                 </node>
                 <node concept="2OqwBi" id="2UhbGc_SkW0" role="33vP2m">
                   <node concept="37vLTw" id="2UhbGc_ShK7" role="2Oq$k0">
-                    <ref role="3cqZAo" node="_TaQix1UTw" resolve="env" />
+                    <ref role="3cqZAo" node="_TaQix1UTw" resolve="solverRunEnv" />
                   </node>
                   <node concept="liA8E" id="2UhbGc_SnTW" role="2OqNvi">
                     <ref role="37wK5l" node="6pPfAzJtIEf" resolve="runWithin" />
@@ -4090,7 +4090,7 @@
       <node concept="37vLTG" id="_TaQix1UTw" role="3clF46">
         <property role="TrG5h" value="solverRunEnv" />
         <node concept="3uibUv" id="_TaQix1UTx" role="1tU5fm">
-          <ref role="3uigEE" node="6pPfAzJt_YX" resolve="IExecEnv" />
+          <ref role="3uigEE" node="6pPfAzJt_YX" resolve="AsyncSolverTaskExecutor.IExecEnv" />
           <node concept="3vKaQO" id="_TaQix2feJ" role="11_B2D">
             <node concept="3uibUv" id="_TaQix2feK" role="3O5elw">
               <ref role="3uigEE" to="gdgh:5zG5$Lyex1G" resolve="IResult" />
@@ -4430,7 +4430,7 @@
               <node concept="1Y3b0j" id="_TaQix1vcq" role="YeSDq">
                 <property role="2bfB8j" value="true" />
                 <property role="373rjd" value="true" />
-                <ref role="1Y3XeK" node="6pPfAzJt_YX" resolve="IExecEnv" />
+                <ref role="1Y3XeK" node="6pPfAzJt_YX" resolve="AsyncSolverTaskExecutor.IExecEnv" />
                 <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                 <node concept="3Tm1VV" id="_TaQix1vcr" role="1B3o_S" />
                 <node concept="16syzq" id="_TaQix1vcs" role="2Ghqu4">
@@ -4475,7 +4475,7 @@
         </node>
       </node>
       <node concept="3uibUv" id="_TaQix1vcD" role="3clF45">
-        <ref role="3uigEE" node="6pPfAzJt_YX" resolve="IExecEnv" />
+        <ref role="3uigEE" node="6pPfAzJt_YX" resolve="AsyncSolverTaskExecutor.IExecEnv" />
         <node concept="16syzq" id="_TaQix1vcE" role="11_B2D">
           <ref role="16sUi3" node="_TaQix1vcG" resolve="Y" />
         </node>
@@ -4498,7 +4498,7 @@
       <property role="TrG5h" value="readAccess" />
       <node concept="3Tm6S6" id="4RQUD6b0lNA" role="1B3o_S" />
       <node concept="3uibUv" id="4RQUD6b0lNB" role="3clF45">
-        <ref role="3uigEE" node="6pPfAzJt_YX" resolve="IExecEnv" />
+        <ref role="3uigEE" node="6pPfAzJt_YX" resolve="AsyncSolverTaskExecutor.IExecEnv" />
         <node concept="3vKaQO" id="4RQUD6b0lNC" role="11_B2D">
           <node concept="3uibUv" id="4RQUD6b0lND" role="3O5elw">
             <ref role="3uigEE" to="gdgh:5zG5$Lyex1G" resolve="IResult" />
@@ -4515,7 +4515,7 @@
           <node concept="3cpWsn" id="4RQUD6b0lMU" role="3cpWs9">
             <property role="TrG5h" value="solverRunEnv" />
             <node concept="3uibUv" id="4RQUD6b0lMV" role="1tU5fm">
-              <ref role="3uigEE" node="6pPfAzJt_YX" resolve="IExecEnv" />
+              <ref role="3uigEE" node="6pPfAzJt_YX" resolve="AsyncSolverTaskExecutor.IExecEnv" />
               <node concept="3vKaQO" id="4RQUD6b0lMW" role="11_B2D">
                 <node concept="3uibUv" id="4RQUD6b0lMX" role="3O5elw">
                   <ref role="3uigEE" to="gdgh:5zG5$Lyex1G" resolve="IResult" />
@@ -4561,7 +4561,7 @@
       <property role="TrG5h" value="writeAccess" />
       <node concept="3Tm6S6" id="4RQUD6b3pHO" role="1B3o_S" />
       <node concept="3uibUv" id="4RQUD6b3pHP" role="3clF45">
-        <ref role="3uigEE" node="6pPfAzJt_YX" resolve="IExecEnv" />
+        <ref role="3uigEE" node="6pPfAzJt_YX" resolve="AsyncSolverTaskExecutor.IExecEnv" />
         <node concept="3uibUv" id="4RQUD6b3pHQ" role="11_B2D">
           <ref role="3uigEE" node="3x8VOVHeBE$" resolve="ITask" />
         </node>

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps
@@ -108,7 +108,7 @@
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -186,7 +186,7 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
       <concept id="1092119917967" name="jetbrains.mps.baseLanguage.structure.MulExpression" flags="nn" index="17qRlL" />
@@ -263,7 +263,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -296,7 +296,7 @@
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -540,7 +540,7 @@
         <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">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
@@ -584,7 +584,7 @@
         <property id="1174558315290" name="start" index="1T8p8b" />
         <property id="1174558317822" name="end" index="1T8pRJ" />
       </concept>
-      <concept id="1174653354106" name="jetbrains.mps.baseLanguage.regexp.structure.RegexpUsingConstruction" flags="ng" index="1YMW5F">
+      <concept id="1174653354106" name="jetbrains.mps.baseLanguage.regexp.structure.RegexpUsingConstruction" flags="ngI" index="1YMW5F">
         <child id="1174653387388" name="regexp" index="1YN4dH" />
       </concept>
     </language>
@@ -25833,7 +25833,7 @@
                       </node>
                       <node concept="2OqwBi" id="4YiHwWVM3cm" role="3uHU7w">
                         <node concept="37vLTw" id="4gPFP6uBVkM" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4gPFP6uBVkI" resolve="integer" />
+                          <ref role="3cqZAo" node="4gPFP6uBVkI" resolve="integerValue" />
                         </node>
                         <node concept="liA8E" id="4YiHwWVM3cq" role="2OqNvi">
                           <ref role="37wK5l" to="xlxw:~BigInteger.toString(int)" resolve="toString" />