Skip to content

Commit 7e4d498

Browse files
author
Alexander Pann
authored
Merge pull request #1159 from IETS3/merge/mps20223
2 parents ea87b85 + 648e81c commit 7e4d498

File tree

33 files changed

+2243
-541
lines changed

33 files changed

+2243
-541
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@ The project does _not_ follow Semantic Versioning and the changes are documented
1515
### Changed
1616

1717
- It is now possible to customize where hex values are enabled. With PrimitiveTypeMapper#filterHexadecimalSupportingNodes you can now enable/disable them for specific nodes.
18+
- The physical units B and b were renamed to byte and bit to avoid confusion.
19+
- 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.
20+
21+
### Added
22+
23+
- 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`.
1824

1925
### Added
2026

‎code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/plugin.mps‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2546,10 +2546,10 @@
25462546
<ref role="3cqZAo" node="1VsTyb1NCFx" resolve="messaging" />
25472547
</node>
25482548
<node concept="37vLTw" id="1VsTyb1NCFo" role="37wK5m">
2549-
<ref role="3cqZAo" node="1VsTyb1NCFz" resolve="execEnv" />
2549+
<ref role="3cqZAo" node="1VsTyb1NCFz" resolve="solverCreationEnv" />
25502550
</node>
25512551
<node concept="37vLTw" id="_TaQix3DF1" role="37wK5m">
2552-
<ref role="3cqZAo" node="_TaQix3_0K" resolve="execEnv2" />
2552+
<ref role="3cqZAo" node="_TaQix3_0K" resolve="solverRunEnv" />
25532553
</node>
25542554
</node>
25552555
</node>
@@ -2584,7 +2584,7 @@
25842584
<node concept="37vLTG" id="1VsTyb1NCFz" role="3clF46">
25852585
<property role="TrG5h" value="solverCreationEnv" />
25862586
<node concept="3uibUv" id="6pPfAzJAd9C" role="1tU5fm">
2587-
<ref role="3uigEE" node="6pPfAzJt_YX" resolve="IExecEnv" />
2587+
<ref role="3uigEE" node="6pPfAzJt_YX" resolve="AsyncSolverTaskExecutor.IExecEnv" />
25882588
<node concept="3uibUv" id="6pPfAzJAd9D" role="11_B2D">
25892589
<ref role="3uigEE" node="3x8VOVHeBE$" resolve="ITask" />
25902590
</node>
@@ -2593,7 +2593,7 @@
25932593
<node concept="37vLTG" id="_TaQix3_0K" role="3clF46">
25942594
<property role="TrG5h" value="solverRunEnv" />
25952595
<node concept="3uibUv" id="_TaQix3_0L" role="1tU5fm">
2596-
<ref role="3uigEE" node="6pPfAzJt_YX" resolve="IExecEnv" />
2596+
<ref role="3uigEE" node="6pPfAzJt_YX" resolve="AsyncSolverTaskExecutor.IExecEnv" />
25972597
<node concept="3vKaQO" id="_TaQix3_0M" role="11_B2D">
25982598
<node concept="3uibUv" id="_TaQix3_0N" role="3O5elw">
25992599
<ref role="3uigEE" to="gdgh:5zG5$Lyex1G" resolve="IResult" />
@@ -2739,7 +2739,7 @@
27392739
<node concept="1rXfSq" id="IJ8MgQfWHs" role="33vP2m">
27402740
<ref role="37wK5l" node="IJ8MgQekrX" resolve="scheduleTaskCreation" />
27412741
<node concept="37vLTw" id="IJ8MgQeks3" role="37wK5m">
2742-
<ref role="3cqZAo" node="1VsTyb1M33j" resolve="execEnv" />
2742+
<ref role="3cqZAo" node="1VsTyb1M33j" resolve="solverCreationEnv" />
27432743
</node>
27442744
<node concept="37vLTw" id="IJ8MgQeks4" role="37wK5m">
27452745
<ref role="3cqZAo" node="1VsTyb1M2ZA" resolve="solvableJob" />
@@ -2784,7 +2784,7 @@
27842784
<node concept="1rXfSq" id="6mS76k2TW2s" role="2Oq$k0">
27852785
<ref role="37wK5l" node="5s4vWCDj51r" resolve="runSolverTask" />
27862786
<node concept="37vLTw" id="_TaQix1RHG" role="37wK5m">
2787-
<ref role="3cqZAo" node="_TaQix1M$G" resolve="execEnvTaskRunning" />
2787+
<ref role="3cqZAo" node="_TaQix1M$G" resolve="solverRunEnv" />
27882788
</node>
27892789
<node concept="37vLTw" id="6mS76k2RYBH" role="37wK5m">
27902790
<ref role="3cqZAo" node="IJ8MgQdNa0" resolve="statusUpdater" />
@@ -2857,7 +2857,7 @@
28572857
<node concept="TUZQ0" id="6mS76k2VUxm" role="3nqlJM">
28582858
<property role="TUZQ4" value="Around-Environment where SolverTask creation is run" />
28592859
<node concept="zr_55" id="6mS76k2VXYf" role="zr_5Q">
2860-
<ref role="zr_51" node="1VsTyb1M33j" resolve="execEnv" />
2860+
<ref role="zr_51" node="1VsTyb1M33j" resolve="solverCreationEnv" />
28612861
</node>
28622862
</node>
28632863
<node concept="x79VA" id="1VsTyb1M33y" role="3nqlJM">
@@ -2904,7 +2904,7 @@
29042904
<property role="TrG5h" value="solverRunEnv" />
29052905
<property role="3TUv4t" value="true" />
29062906
<node concept="3uibUv" id="_TaQix1M$H" role="1tU5fm">
2907-
<ref role="3uigEE" node="6pPfAzJt_YX" resolve="IExecEnv" />
2907+
<ref role="3uigEE" node="6pPfAzJt_YX" resolve="AsyncSolverTaskExecutor.IExecEnv" />
29082908
<node concept="3vKaQO" id="_TaQix2WVV" role="11_B2D">
29092909
<node concept="3uibUv" id="_TaQix2WVW" role="3O5elw">
29102910
<ref role="3uigEE" to="gdgh:5zG5$Lyex1G" resolve="IResult" />
@@ -3916,7 +3916,7 @@
39163916
</node>
39173917
<node concept="2OqwBi" id="2UhbGc_SkW0" role="33vP2m">
39183918
<node concept="37vLTw" id="2UhbGc_ShK7" role="2Oq$k0">
3919-
<ref role="3cqZAo" node="_TaQix1UTw" resolve="env" />
3919+
<ref role="3cqZAo" node="_TaQix1UTw" resolve="solverRunEnv" />
39203920
</node>
39213921
<node concept="liA8E" id="2UhbGc_SnTW" role="2OqNvi">
39223922
<ref role="37wK5l" node="6pPfAzJtIEf" resolve="runWithin" />
@@ -4090,7 +4090,7 @@
40904090
<node concept="37vLTG" id="_TaQix1UTw" role="3clF46">
40914091
<property role="TrG5h" value="solverRunEnv" />
40924092
<node concept="3uibUv" id="_TaQix1UTx" role="1tU5fm">
4093-
<ref role="3uigEE" node="6pPfAzJt_YX" resolve="IExecEnv" />
4093+
<ref role="3uigEE" node="6pPfAzJt_YX" resolve="AsyncSolverTaskExecutor.IExecEnv" />
40944094
<node concept="3vKaQO" id="_TaQix2feJ" role="11_B2D">
40954095
<node concept="3uibUv" id="_TaQix2feK" role="3O5elw">
40964096
<ref role="3uigEE" to="gdgh:5zG5$Lyex1G" resolve="IResult" />
@@ -4430,7 +4430,7 @@
44304430
<node concept="1Y3b0j" id="_TaQix1vcq" role="YeSDq">
44314431
<property role="2bfB8j" value="true" />
44324432
<property role="373rjd" value="true" />
4433-
<ref role="1Y3XeK" node="6pPfAzJt_YX" resolve="IExecEnv" />
4433+
<ref role="1Y3XeK" node="6pPfAzJt_YX" resolve="AsyncSolverTaskExecutor.IExecEnv" />
44344434
<ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
44354435
<node concept="3Tm1VV" id="_TaQix1vcr" role="1B3o_S" />
44364436
<node concept="16syzq" id="_TaQix1vcs" role="2Ghqu4">
@@ -4475,7 +4475,7 @@
44754475
</node>
44764476
</node>
44774477
<node concept="3uibUv" id="_TaQix1vcD" role="3clF45">
4478-
<ref role="3uigEE" node="6pPfAzJt_YX" resolve="IExecEnv" />
4478+
<ref role="3uigEE" node="6pPfAzJt_YX" resolve="AsyncSolverTaskExecutor.IExecEnv" />
44794479
<node concept="16syzq" id="_TaQix1vcE" role="11_B2D">
44804480
<ref role="16sUi3" node="_TaQix1vcG" resolve="Y" />
44814481
</node>
@@ -4498,7 +4498,7 @@
44984498
<property role="TrG5h" value="readAccess" />
44994499
<node concept="3Tm6S6" id="4RQUD6b0lNA" role="1B3o_S" />
45004500
<node concept="3uibUv" id="4RQUD6b0lNB" role="3clF45">
4501-
<ref role="3uigEE" node="6pPfAzJt_YX" resolve="IExecEnv" />
4501+
<ref role="3uigEE" node="6pPfAzJt_YX" resolve="AsyncSolverTaskExecutor.IExecEnv" />
45024502
<node concept="3vKaQO" id="4RQUD6b0lNC" role="11_B2D">
45034503
<node concept="3uibUv" id="4RQUD6b0lND" role="3O5elw">
45044504
<ref role="3uigEE" to="gdgh:5zG5$Lyex1G" resolve="IResult" />
@@ -4515,7 +4515,7 @@
45154515
<node concept="3cpWsn" id="4RQUD6b0lMU" role="3cpWs9">
45164516
<property role="TrG5h" value="solverRunEnv" />
45174517
<node concept="3uibUv" id="4RQUD6b0lMV" role="1tU5fm">
4518-
<ref role="3uigEE" node="6pPfAzJt_YX" resolve="IExecEnv" />
4518+
<ref role="3uigEE" node="6pPfAzJt_YX" resolve="AsyncSolverTaskExecutor.IExecEnv" />
45194519
<node concept="3vKaQO" id="4RQUD6b0lMW" role="11_B2D">
45204520
<node concept="3uibUv" id="4RQUD6b0lMX" role="3O5elw">
45214521
<ref role="3uigEE" to="gdgh:5zG5$Lyex1G" resolve="IResult" />
@@ -4561,7 +4561,7 @@
45614561
<property role="TrG5h" value="writeAccess" />
45624562
<node concept="3Tm6S6" id="4RQUD6b3pHO" role="1B3o_S" />
45634563
<node concept="3uibUv" id="4RQUD6b3pHP" role="3clF45">
4564-
<ref role="3uigEE" node="6pPfAzJt_YX" resolve="IExecEnv" />
4564+
<ref role="3uigEE" node="6pPfAzJt_YX" resolve="AsyncSolverTaskExecutor.IExecEnv" />
45654565
<node concept="3uibUv" id="4RQUD6b3pHQ" role="11_B2D">
45664566
<ref role="3uigEE" node="3x8VOVHeBE$" resolve="ITask" />
45674567
</node>

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
<concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
109109
<reference id="1188208074048" name="annotation" index="2AI5Lk" />
110110
</concept>
111-
<concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
111+
<concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
112112
<child id="1188208488637" name="annotation" index="2AJF6D" />
113113
</concept>
114114
<concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -186,7 +186,7 @@
186186
<property id="1176718929932" name="isFinal" index="3TUv4t" />
187187
<child id="1068431790190" name="initializer" index="33vP2m" />
188188
</concept>
189-
<concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
189+
<concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
190190
<property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
191191
</concept>
192192
<concept id="1092119917967" name="jetbrains.mps.baseLanguage.structure.MulExpression" flags="nn" index="17qRlL" />
@@ -263,7 +263,7 @@
263263
<child id="1154542793668" name="componentType" index="3g7fb8" />
264264
<child id="1154542803372" name="initValue" index="3g7hyw" />
265265
</concept>
266-
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
266+
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
267267
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
268268
<child id="1068499141038" name="actualArgument" index="37wK5m" />
269269
</concept>
@@ -296,7 +296,7 @@
296296
</concept>
297297
<concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
298298
<concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
299-
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
299+
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
300300
<child id="1178549979242" name="visibility" index="1B3o_S" />
301301
</concept>
302302
<concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -540,7 +540,7 @@
540540
<property id="1193676396447" name="virtualPackage" index="3GE5qa" />
541541
<child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
542542
</concept>
543-
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
543+
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
544544
<property id="1169194664001" name="name" index="TrG5h" />
545545
</concept>
546546
<concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
@@ -584,7 +584,7 @@
584584
<property id="1174558315290" name="start" index="1T8p8b" />
585585
<property id="1174558317822" name="end" index="1T8pRJ" />
586586
</concept>
587-
<concept id="1174653354106" name="jetbrains.mps.baseLanguage.regexp.structure.RegexpUsingConstruction" flags="ng" index="1YMW5F">
587+
<concept id="1174653354106" name="jetbrains.mps.baseLanguage.regexp.structure.RegexpUsingConstruction" flags="ngI" index="1YMW5F">
588588
<child id="1174653387388" name="regexp" index="1YN4dH" />
589589
</concept>
590590
</language>
@@ -25833,7 +25833,7 @@
2583325833
</node>
2583425834
<node concept="2OqwBi" id="4YiHwWVM3cm" role="3uHU7w">
2583525835
<node concept="37vLTw" id="4gPFP6uBVkM" role="2Oq$k0">
25836-
<ref role="3cqZAo" node="4gPFP6uBVkI" resolve="integer" />
25836+
<ref role="3cqZAo" node="4gPFP6uBVkI" resolve="integerValue" />
2583725837
</node>
2583825838
<node concept="liA8E" id="4YiHwWVM3cq" role="2OqNvi">
2583925839
<ref role="37wK5l" to="xlxw:~BigInteger.toString(int)" resolve="toString" />

0 commit comments

Comments
 (0)