Skip to content

Commit 6e5284f

Browse files
sergej-koscejevsergej-koscejev
authored
Merge pull request #1351 from IETS3/bugfix/micro-and-mu
Only recognize `U+00B5 MICRO SIGN` as 'micro' prefix
2 parents 4614b60 + 2cfb279 commit 6e5284f

File tree

8 files changed

+409
-113
lines changed

8 files changed

+409
-113
lines changed

‎CHANGELOG.md‎

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

1212
- Published SBOM contains dependencies only from runtime configurations
13+
- To avoid confusion, `U+03BC μ GREEK SMALL LETTER MU` is no longer recognized as the 'micro' unit prefix, only
14+
`U+00B5 µ MICRO SIGN` is. Although technically considered 'legacy', the micro sign is the character produced by macOS
15+
and Windows keyboard layouts when pressing `AltGr/Option+M`.
16+
17+
An [enhancement script](http://127.0.0.1:63320/node?ref=r%3A531014dc-62ca-45fa-b1c2-cf992369440b%28org.iets3.core.expr.typetags.physunits.scripts%29%2F6252521573649140294)
18+
is provided to replace 'mu' with 'micro sign'.
1319

1420
## May 2025
1521

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

Lines changed: 194 additions & 76 deletions
Large diffs are not rendered by default.

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

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<model ref="r:531014dc-62ca-45fa-b1c2-cf992369440b(org.iets3.core.expr.typetags.physunits.scripts)">
3+
<persistence version="9" />
4+
<languages>
5+
<use id="0eddeefa-c2d6-4437-bc2c-de50fd4ce470" name="jetbrains.mps.lang.script" version="1" />
6+
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
7+
</languages>
8+
<imports>
9+
<import index="i3ya" ref="r:4f64e2f0-6a4e-4db3-b3bf-7977f44949b6(org.iets3.core.expr.typetags.physunits.structure)" />
10+
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
11+
</imports>
12+
<registry>
13+
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
14+
<concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
15+
<child id="1068498886297" name="rValue" index="37vLTx" />
16+
<child id="1068498886295" name="lValue" index="37vLTJ" />
17+
</concept>
18+
<concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
19+
<concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
20+
<child id="1197027771414" name="operand" index="2Oq$k0" />
21+
<child id="1197027833540" name="operation" index="2OqNvi" />
22+
</concept>
23+
<concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
24+
<child id="1137022507850" name="body" index="2VODD2" />
25+
</concept>
26+
<concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
27+
<property id="1070475926801" name="value" index="Xl_RC" />
28+
</concept>
29+
<concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
30+
<concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
31+
<child id="1068580123156" name="expression" index="3clFbG" />
32+
</concept>
33+
<concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
34+
<child id="1068581517665" name="statement" index="3cqZAp" />
35+
</concept>
36+
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
37+
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
38+
<child id="1068499141038" name="actualArgument" index="37wK5m" />
39+
</concept>
40+
<concept id="1200397529627" name="jetbrains.mps.baseLanguage.structure.CharConstant" flags="nn" index="1Xhbcc">
41+
<property id="1200397540847" name="charConstant" index="1XhdNS" />
42+
</concept>
43+
</language>
44+
<language id="0eddeefa-c2d6-4437-bc2c-de50fd4ce470" name="jetbrains.mps.lang.script">
45+
<concept id="1177457067821" name="jetbrains.mps.lang.script.structure.MigrationScript" flags="ig" index="_UgoZ">
46+
<property id="1177457669450" name="title" index="_Wzho" />
47+
<child id="1177458178889" name="part" index="_YvDr" />
48+
</concept>
49+
<concept id="1177457850499" name="jetbrains.mps.lang.script.structure.MigrationScriptPart_Instance" flags="lg" index="_XfAh">
50+
<property id="1177457972041" name="description" index="_XH9r" />
51+
<reference id="1177457957477" name="affectedInstanceConcept" index="_XDHR" />
52+
<child id="1177457957478" name="affectedInstancePredicate" index="_XDHO" />
53+
<child id="1177458005323" name="affectedInstanceUpdater" index="_XPhp" />
54+
</concept>
55+
<concept id="1177458061340" name="jetbrains.mps.lang.script.structure.MigrationScriptPart_Instance_Predicate" flags="in" index="_Y34e" />
56+
<concept id="1177458237937" name="jetbrains.mps.lang.script.structure.MigrationScriptPart_node" flags="nn" index="_YI3z" />
57+
<concept id="1177458491964" name="jetbrains.mps.lang.script.structure.MigrationScriptPart_Instance_Updater" flags="in" index="_ZGcI" />
58+
</language>
59+
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
60+
<concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
61+
<reference id="1138056395725" name="property" index="3TsBF5" />
62+
</concept>
63+
</language>
64+
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
65+
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
66+
<property id="1169194664001" name="name" index="TrG5h" />
67+
</concept>
68+
</language>
69+
</registry>
70+
<node concept="_UgoZ" id="5r5qNTNOGD6">
71+
<property role="TrG5h" value="ReplaceMuWithMicroInUnitPrefixes" />
72+
<property role="_Wzho" value="Replace 'mu' in unit prefixes with 'micro sign'" />
73+
<node concept="_XfAh" id="5r5qNTNOGD7" role="_YvDr">
74+
<property role="_XH9r" value="Replace 'mu' in unit prefixes with 'micro sign'" />
75+
<ref role="_XDHR" to="i3ya:7eOyx9r3kR5" resolve="UnitReference" />
76+
<node concept="_ZGcI" id="5r5qNTNOGD8" role="_XPhp">
77+
<node concept="3clFbS" id="5r5qNTNOGD9" role="2VODD2">
78+
<node concept="3clFbF" id="2NkKRdwZnD7" role="3cqZAp">
79+
<node concept="37vLTI" id="2NkKRdwZpz0" role="3clFbG">
80+
<node concept="2OqwBi" id="2NkKRdwZnTp" role="37vLTJ">
81+
<node concept="_YI3z" id="2NkKRdwZnD6" role="2Oq$k0" />
82+
<node concept="3TrcHB" id="2NkKRdwZoiE" role="2OqNvi">
83+
<ref role="3TsBF5" to="i3ya:7Bmg9OopAyq" resolve="prefix" />
84+
</node>
85+
</node>
86+
<node concept="2OqwBi" id="5r5qNTNOMyg" role="37vLTx">
87+
<node concept="2OqwBi" id="5r5qNTNOPGO" role="2Oq$k0">
88+
<node concept="_YI3z" id="5r5qNTNOPsZ" role="2Oq$k0" />
89+
<node concept="3TrcHB" id="5r5qNTNOPL4" role="2OqNvi">
90+
<ref role="3TsBF5" to="i3ya:7Bmg9OopAyq" resolve="prefix" />
91+
</node>
92+
</node>
93+
<node concept="liA8E" id="5r5qNTNONRl" role="2OqNvi">
94+
<ref role="37wK5l" to="wyt6:~String.replace(char,char)" resolve="replace" />
95+
<node concept="1Xhbcc" id="5r5qNTNOQb_" role="37wK5m">
96+
<property role="1XhdNS" value="\u03bc" />
97+
</node>
98+
<node concept="1Xhbcc" id="5r5qNTNOR6V" role="37wK5m">
99+
<property role="1XhdNS" value="\u00b5" />
100+
</node>
101+
</node>
102+
</node>
103+
</node>
104+
</node>
105+
</node>
106+
</node>
107+
<node concept="_Y34e" id="5r5qNTNOGDq" role="_XDHO">
108+
<node concept="3clFbS" id="5r5qNTNOGDr" role="2VODD2">
109+
<node concept="3clFbF" id="5r5qNTNOGQW" role="3cqZAp">
110+
<node concept="2OqwBi" id="5r5qNTNOJh3" role="3clFbG">
111+
<node concept="2OqwBi" id="5r5qNTNOHnl" role="2Oq$k0">
112+
<node concept="_YI3z" id="5r5qNTNOGQV" role="2Oq$k0" />
113+
<node concept="3TrcHB" id="5r5qNTNOHHU" role="2OqNvi">
114+
<ref role="3TsBF5" to="i3ya:7Bmg9OopAyq" resolve="prefix" />
115+
</node>
116+
</node>
117+
<node concept="liA8E" id="5r5qNTNOK2v" role="2OqNvi">
118+
<ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
119+
<node concept="Xl_RD" id="5r5qNTNOK3O" role="37wK5m">
120+
<property role="Xl_RC" value="\u03bc" />
121+
</node>
122+
</node>
123+
</node>
124+
</node>
125+
</node>
126+
</node>
127+
</node>
128+
</node>
129+
</model>
130+

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10723,7 +10723,7 @@
1072310723
<ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...)" resolve="format" />
1072410724
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
1072510725
<node concept="Xl_RD" id="3eH6BL4f9p7" role="37wK5m">
10726-
<property role="Xl_RC" value="‹%s› is not a valid metric prefix" />
10726+
<property role="Xl_RC" value="‹%s› is not a valid unit prefix" />
1072710727
</node>
1072810728
<node concept="2OqwBi" id="3eH6BL4f9AO" role="37wK5m">
1072910729
<node concept="1YBJjd" id="3eH6BL4f9AP" role="2Oq$k0">

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

Lines changed: 73 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3798,22 +3798,35 @@
37983798
<node concept="17QB3L" id="38e9cZs26TQ" role="1tU5fm" />
37993799
</node>
38003800
</node>
3801-
<node concept="3SKdUt" id="1nMzDp6IEPG" role="3cqZAp">
3802-
<node concept="1PaTwC" id="1nMzDp6IEPH" role="1aUNEU">
3803-
<node concept="3oM_SD" id="1nMzDp6IQ0T" role="1PaTwD">
3804-
<property role="3oM_SC" value="comparison" />
3801+
<node concept="3SKdUt" id="1A9sGgF51Bq" role="3cqZAp">
3802+
<node concept="1PaTwC" id="1A9sGgF51Br" role="1aUNEU">
3803+
<node concept="3oM_SD" id="1A9sGgF51Bs" role="1PaTwD">
3804+
<property role="3oM_SC" value="U+00B5" />
38053805
</node>
3806-
<node concept="3oM_SD" id="1nMzDp6IQ0W" role="1PaTwD">
3807-
<property role="3oM_SC" value="doesn't" />
3806+
<node concept="3oM_SD" id="1A9sGgF5uuj" role="1PaTwD">
3807+
<property role="3oM_SC" value="MICRO" />
38083808
</node>
3809-
<node concept="3oM_SD" id="1nMzDp6JnWC" role="1PaTwD">
3810-
<property role="3oM_SC" value="work" />
3809+
<node concept="3oM_SD" id="1A9sGgF5jZH" role="1PaTwD">
3810+
<property role="3oM_SC" value="SIGN" />
38113811
</node>
3812-
<node concept="3oM_SD" id="1nMzDp6JwDG" role="1PaTwD">
3813-
<property role="3oM_SC" value="with" />
3812+
</node>
3813+
</node>
3814+
<node concept="3SKdUt" id="1A9sGgF6G4S" role="3cqZAp">
3815+
<node concept="1PaTwC" id="1A9sGgF6G4T" role="1aUNEU">
3816+
<node concept="3oM_SD" id="1A9sGgF6G4U" role="1PaTwD">
3817+
<property role="3oM_SC" value="U+03BC" />
3818+
</node>
3819+
<node concept="3oM_SD" id="1A9sGgF6Zcu" role="1PaTwD">
3820+
<property role="3oM_SC" value="GREEK" />
3821+
</node>
3822+
<node concept="3oM_SD" id="1A9sGgF74MU" role="1PaTwD">
3823+
<property role="3oM_SC" value="SMALL" />
3824+
</node>
3825+
<node concept="3oM_SD" id="1A9sGgF74MV" role="1PaTwD">
3826+
<property role="3oM_SC" value="LETTER" />
38143827
</node>
3815-
<node concept="3oM_SD" id="1nMzDp6JwE0" role="1PaTwD">
3816-
<property role="3oM_SC" value="μ" />
3828+
<node concept="3oM_SD" id="1A9sGgF7kpf" role="1PaTwD">
3829+
<property role="3oM_SC" value="MU" />
38173830
</node>
38183831
</node>
38193832
</node>
@@ -3822,38 +3835,67 @@
38223835
<node concept="3clFbF" id="1nMzDp6HD3Q" role="3cqZAp">
38233836
<node concept="37vLTI" id="1nMzDp6HPPf" role="3clFbG">
38243837
<node concept="Xl_RD" id="1nMzDp6I1cG" role="37vLTx">
3825-
<property role="Xl_RC" value="μ" />
3838+
<property role="Xl_RC" value="\u00b5" />
38263839
</node>
38273840
<node concept="37vLTw" id="1nMzDp6HD3O" role="37vLTJ">
38283841
<ref role="3cqZAo" node="6RONOaU4$I4" resolve="prefix" />
38293842
</node>
38303843
</node>
38313844
</node>
38323845
</node>
3833-
<node concept="2OqwBi" id="1a2DxsCj2j$" role="3clFbw">
3834-
<node concept="2OqwBi" id="1nMzDp6FoiM" role="2Oq$k0">
3835-
<node concept="2OqwBi" id="1nMzDp6EQfK" role="2Oq$k0">
3836-
<node concept="37vLTw" id="1nMzDp6EFB_" role="2Oq$k0">
3837-
<ref role="3cqZAo" node="79LXaAamL2Y" resolve="oldUnit" />
3846+
<node concept="22lmx$" id="1A9sGgF5Yyn" role="3clFbw">
3847+
<node concept="2OqwBi" id="1a2DxsCj2j$" role="3uHU7B">
3848+
<node concept="2OqwBi" id="1nMzDp6FoiM" role="2Oq$k0">
3849+
<node concept="2OqwBi" id="1nMzDp6EQfK" role="2Oq$k0">
3850+
<node concept="37vLTw" id="1nMzDp6EFB_" role="2Oq$k0">
3851+
<ref role="3cqZAo" node="79LXaAamL2Y" resolve="oldUnit" />
3852+
</node>
3853+
<node concept="3TrcHB" id="1nMzDp6F5cm" role="2OqNvi">
3854+
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
3855+
</node>
38383856
</node>
3839-
<node concept="3TrcHB" id="1nMzDp6F5cm" role="2OqNvi">
3840-
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
3857+
<node concept="liA8E" id="1nMzDp6FEfo" role="2OqNvi">
3858+
<ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
3859+
<node concept="3cmrfG" id="1nMzDp6FOS4" role="37wK5m">
3860+
<property role="3cmrfH" value="0" />
3861+
</node>
3862+
<node concept="3cmrfG" id="1nMzDp6GEQO" role="37wK5m">
3863+
<property role="3cmrfH" value="1" />
3864+
</node>
38413865
</node>
38423866
</node>
3843-
<node concept="liA8E" id="1nMzDp6FEfo" role="2OqNvi">
3844-
<ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
3845-
<node concept="3cmrfG" id="1nMzDp6FOS4" role="37wK5m">
3846-
<property role="3cmrfH" value="0" />
3847-
</node>
3848-
<node concept="3cmrfG" id="1nMzDp6GEQO" role="37wK5m">
3849-
<property role="3cmrfH" value="1" />
3867+
<node concept="liA8E" id="1a2DxsCjmRv" role="2OqNvi">
3868+
<ref role="37wK5l" to="wyt6:~String.equalsIgnoreCase(java.lang.String)" resolve="equalsIgnoreCase" />
3869+
<node concept="Xl_RD" id="1a2DxsCjCgs" role="37wK5m">
3870+
<property role="Xl_RC" value="\u00b5" />
38503871
</node>
38513872
</node>
38523873
</node>
3853-
<node concept="liA8E" id="1a2DxsCjmRv" role="2OqNvi">
3854-
<ref role="37wK5l" to="wyt6:~String.equalsIgnoreCase(java.lang.String)" resolve="equalsIgnoreCase" />
3855-
<node concept="Xl_RD" id="1a2DxsCjCgs" role="37wK5m">
3856-
<property role="Xl_RC" value="μ" />
3874+
<node concept="2OqwBi" id="1A9sGgF6b4W" role="3uHU7w">
3875+
<node concept="2OqwBi" id="1A9sGgF6b4X" role="2Oq$k0">
3876+
<node concept="2OqwBi" id="1A9sGgF6b4Y" role="2Oq$k0">
3877+
<node concept="37vLTw" id="1A9sGgF6b4Z" role="2Oq$k0">
3878+
<ref role="3cqZAo" node="79LXaAamL2Y" resolve="oldUnit" />
3879+
</node>
3880+
<node concept="3TrcHB" id="1A9sGgF6b50" role="2OqNvi">
3881+
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
3882+
</node>
3883+
</node>
3884+
<node concept="liA8E" id="1A9sGgF6b51" role="2OqNvi">
3885+
<ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
3886+
<node concept="3cmrfG" id="1A9sGgF6b52" role="37wK5m">
3887+
<property role="3cmrfH" value="0" />
3888+
</node>
3889+
<node concept="3cmrfG" id="1A9sGgF6b53" role="37wK5m">
3890+
<property role="3cmrfH" value="1" />
3891+
</node>
3892+
</node>
3893+
</node>
3894+
<node concept="liA8E" id="1A9sGgF6b54" role="2OqNvi">
3895+
<ref role="37wK5l" to="wyt6:~String.equalsIgnoreCase(java.lang.String)" resolve="equalsIgnoreCase" />
3896+
<node concept="Xl_RD" id="1A9sGgF6b55" role="37wK5m">
3897+
<property role="Xl_RC" value="\u03bc" />
3898+
</node>
38573899
</node>
38583900
</node>
38593901
</node>

‎code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.physunits.documentation/models/org.iets3.core.expr.typetags.physunits.documentation.mps‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1590,8 +1590,8 @@
15901590
<node concept="_fku$" id="69HsIy5GAQR" role="_fkur" />
15911591
<node concept="1QScDb" id="69HsIy5GAQS" role="_fkuY">
15921592
<node concept="3EXbTZ" id="3eEp8ADcivZ" role="1QScD9">
1593-
<node concept="CIsvn" id="3eEp8ADciw1" role="2qyG0l">
1594-
<property role="1xG2w7" value="μ" />
1593+
<node concept="CIsvn" id="5r5qNTNNdAu" role="2qyG0l">
1594+
<property role="1xG2w7" value="µ" />
15951595
<ref role="CIi3I" node="3xM68GMigWr" resolve="m" />
15961596
</node>
15971597
</node>

‎code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.phyunits.si/models/org.iets3.core.expr.typetags.phyunits.si.units.mps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1428,7 +1428,7 @@
14281428
<ref role="CIi3I" node="3xM68GMigWt" resolve="kg" />
14291429
</node>
14301430
<node concept="CIsvn" id="1bJsYf594GJ" role="2vOYbH">
1431-
<property role="1xG2w7" value="μ" />
1431+
<property role="1xG2w7" value="µ" />
14321432
<ref role="CIi3I" node="6EvkZrOLErr" resolve="g" />
14331433
</node>
14341434
</node>

‎code/languages/org.iets3.opensource/tests/test.ts.expr.os/models/test.ts.expr.os.phyunits@tests.mps‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7651,8 +7651,8 @@
76517651
<node concept="_fku$" id="69HsIy5GAQR" role="_fkur" />
76527652
<node concept="1QScDb" id="69HsIy5GAQS" role="_fkuY">
76537653
<node concept="3EXbTZ" id="3eEp8ADcivZ" role="1QScD9">
7654-
<node concept="CIsvn" id="3eEp8ADciw1" role="2qyG0l">
7655-
<property role="1xG2w7" value="μ" />
7654+
<node concept="CIsvn" id="5r5qNTNM1Fk" role="2qyG0l">
7655+
<property role="1xG2w7" value="µ" />
76567656
<ref role="CIi3I" to="8ps7:3xM68GMigWr" resolve="m" />
76577657
</node>
76587658
</node>

0 commit comments

Comments
 (0)