Skip to content

Commit 8d2eeb6

Browse files
tmilnthorptmilnthorp
authored
Change replacement token in json files from x to {x}
To distinguish from constant fields and other names with `x` in them.
1 parent 2ef6659 commit 8d2eeb6

File tree

116 files changed

+1270
-1270
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+1270
-1270
lines changed

‎CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ For a fairly complete summary of the unit definition JSON schema, see [Meter of
2727
### Conversion functions
2828
Converting from unit A to B is achieved by first converting from unit A to the base unit, then from the base unit to unit B. To achieve this, each unit defines two conversion functions.
2929

30-
* Prefer multiplication for `FromUnitToBaseFunc` (`x*2.54e-2` for `Inch` to `Meter`)
31-
* Prefer division for `FromBaseToUnitFunc` (`x/2.54e-2` for `Meter` to `Inch`)
30+
* Prefer multiplication for `FromUnitToBaseFunc` (`{x}*2.54e-2` for `Inch` to `Meter`)
31+
* Prefer division for `FromBaseToUnitFunc` (`{x}/2.54e-2` for `Meter` to `Inch`)
3232
* Prefer scientific notation `1e3` and `1e-5` instead of `1000` and `0.00001`
33-
* Prefer a constant if the conversion factor is finite (`x*2.54e-2` for `Inch`)
34-
* Prefer a calculation if the conversion factor is infinite (`(x/72.27)*2.54e-2` for `PrinterPoint`)
33+
* Prefer a constant if the conversion factor is finite (`{x}*2.54e-2` for `Inch`)
34+
* Prefer a calculation if the conversion factor is infinite (`({x}/72.27)*2.54e-2` for `PrinterPoint`)
3535

3636
### Units
3737
Generally we try to name the units as what is the most widely used.

‎CodeGen/Generators/NanoFrameworkGen/QuantityGenerator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ private void GenerateConversionMethods()
208208
{{");
209209
foreach (var unit in _quantity.Units)
210210
{
211-
var func = unit.FromUnitToBaseFunc.Replace("x", "_value");
211+
var func = unit.FromUnitToBaseFunc.Replace("{x}", "_value");
212212
Writer.WL($@"
213213
case {_unitEnumName}.{unit.SingularName}: return {func};");
214214
}
@@ -230,7 +230,7 @@ private void GenerateConversionMethods()
230230
{{");
231231
foreach (var unit in _quantity.Units)
232232
{
233-
var func = unit.FromBaseToUnitFunc.Replace("x", "baseUnitValue");
233+
var func = unit.FromBaseToUnitFunc.Replace("{x}", "baseUnitValue");
234234
Writer.WL($@"
235235
case {_unitEnumName}.{unit.SingularName}: return {func};");
236236
}

‎CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -954,7 +954,7 @@ IQuantity IQuantity.ToUnit(Enum unit)
954954
{{");
955955
foreach (var unit in _quantity.Units)
956956
{
957-
var func = unit.FromUnitToBaseFunc.Replace("x", "_value");
957+
var func = unit.FromUnitToBaseFunc.Replace("{x}", "_value");
958958
Writer.WL($@"
959959
case {_unitEnumName}.{unit.SingularName}: return {func};");
960960
}
@@ -987,7 +987,7 @@ IQuantity IQuantity.ToUnit(Enum unit)
987987
{{");
988988
foreach (var unit in _quantity.Units)
989989
{
990-
var func = unit.FromBaseToUnitFunc.Replace("x", "baseUnitValue");
990+
var func = unit.FromBaseToUnitFunc.Replace("{x}", "baseUnitValue");
991991
Writer.WL($@"
992992
case {_unitEnumName}.{unit.SingularName}: return {func};");
993993
}

‎CodeGen/Generators/UnitsNetWrcGen/QuantityGenerator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ public double As({_unitEnumName} unit)
639639
{{");
640640
foreach (var unit in _quantity.Units)
641641
{
642-
var func = unit.FromUnitToBaseFunc.Replace("x", "_value");
642+
var func = unit.FromUnitToBaseFunc.Replace("{x}", "_value");
643643
Writer.WL($@"
644644
case {_unitEnumName}.{unit.SingularName}: return {func};");
645645
}
@@ -661,7 +661,7 @@ public double As({_unitEnumName} unit)
661661
{{");
662662
foreach (var unit in _quantity.Units)
663663
{
664-
var func = unit.FromBaseToUnitFunc.Replace("x", "baseUnitValue");
664+
var func = unit.FromBaseToUnitFunc.Replace("{x}", "baseUnitValue");
665665
Writer.WL($@"
666666
case {_unitEnumName}.{unit.SingularName}: return {func};");
667667
}

‎Common/UnitDefinitions/Acceleration.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"L": "Meter",
1515
"T": "Second"
1616
},
17-
"FromUnitToBaseFunc": "x",
18-
"FromBaseToUnitFunc": "x",
17+
"FromUnitToBaseFunc": "{x}",
18+
"FromBaseToUnitFunc": "{x}",
1919
"Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Kilo" ],
2020
"Localization": [
2121
{
@@ -35,8 +35,8 @@
3535
"L": "Inch",
3636
"T": "Second"
3737
},
38-
"FromUnitToBaseFunc": "x*0.0254",
39-
"FromBaseToUnitFunc": "x/0.0254",
38+
"FromUnitToBaseFunc": "{x}*0.0254",
39+
"FromBaseToUnitFunc": "{x}/0.0254",
4040
"Localization": [
4141
{
4242
"Culture": "en-US",
@@ -55,8 +55,8 @@
5555
"L": "Foot",
5656
"T": "Second"
5757
},
58-
"FromUnitToBaseFunc": "x*0.304800",
59-
"FromBaseToUnitFunc": "x/0.304800",
58+
"FromUnitToBaseFunc": "{x}*0.304800",
59+
"FromBaseToUnitFunc": "{x}/0.304800",
6060
"Localization": [
6161
{
6262
"Culture": "en-US",
@@ -75,8 +75,8 @@
7575
"L": "NauticalMile",
7676
"T": "Second"
7777
},
78-
"FromUnitToBaseFunc": "x*0.5144444444444",
79-
"FromBaseToUnitFunc": "x/0.5144444444444",
78+
"FromUnitToBaseFunc": "{x}*0.5144444444444",
79+
"FromBaseToUnitFunc": "{x}/0.5144444444444",
8080
"Localization": [
8181
{
8282
"Culture": "en-US",
@@ -95,8 +95,8 @@
9595
"L": "NauticalMile",
9696
"T": "Minute"
9797
},
98-
"FromUnitToBaseFunc": "x*0.5144444444444/60",
99-
"FromBaseToUnitFunc": "x/0.5144444444444*60",
98+
"FromUnitToBaseFunc": "{x}*0.5144444444444/60",
99+
"FromBaseToUnitFunc": "{x}/0.5144444444444*60",
100100
"Localization": [
101101
{
102102
"Culture": "en-US",
@@ -115,8 +115,8 @@
115115
"L": "NauticalMile",
116116
"T": "Hour"
117117
},
118-
"FromUnitToBaseFunc": "x*0.5144444444444/3600",
119-
"FromBaseToUnitFunc": "x/0.5144444444444*3600",
118+
"FromUnitToBaseFunc": "{x}*0.5144444444444/3600",
119+
"FromBaseToUnitFunc": "{x}/0.5144444444444*3600",
120120
"Localization": [
121121
{
122122
"Culture": "en-US",
@@ -135,8 +135,8 @@
135135
"L": "Meter",
136136
"T": "Second"
137137
},
138-
"FromUnitToBaseFunc": "x*9.80665",
139-
"FromBaseToUnitFunc": "x/9.80665",
138+
"FromUnitToBaseFunc": "{x}*9.80665",
139+
"FromBaseToUnitFunc": "{x}/9.80665",
140140
"Prefixes": [ "Milli"],
141141
"Localization": [
142142
{

‎Common/UnitDefinitions/AmountOfSubstance.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
{
1010
"SingularName": "Mole",
1111
"PluralName": "Moles",
12-
"FromUnitToBaseFunc": "x",
13-
"FromBaseToUnitFunc": "x",
12+
"FromUnitToBaseFunc": "{x}",
13+
"FromBaseToUnitFunc": "{x}",
1414
"BaseUnits": {
1515
"N": "Mole"
1616
},
@@ -28,8 +28,8 @@
2828
"BaseUnits": {
2929
"N": "PoundMole"
3030
},
31-
"FromUnitToBaseFunc": "x*453.59237",
32-
"FromBaseToUnitFunc": "x/453.59237",
31+
"FromUnitToBaseFunc": "{x}*453.59237",
32+
"FromBaseToUnitFunc": "{x}/453.59237",
3333
"Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Kilo" ],
3434
"Localization": [
3535
{

‎Common/UnitDefinitions/AmplitudeRatio.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
{
99
"SingularName": "DecibelVolt",
1010
"PluralName": "DecibelVolts",
11-
"FromUnitToBaseFunc": "x",
12-
"FromBaseToUnitFunc": "x",
11+
"FromUnitToBaseFunc": "{x}",
12+
"FromBaseToUnitFunc": "{x}",
1313
"Localization": [
1414
{
1515
"Culture": "en-US",
@@ -20,8 +20,8 @@
2020
{
2121
"SingularName": "DecibelMicrovolt",
2222
"PluralName": "DecibelMicrovolts",
23-
"FromUnitToBaseFunc": "x - 120",
24-
"FromBaseToUnitFunc": "x + 120",
23+
"FromUnitToBaseFunc": "{x} - 120",
24+
"FromBaseToUnitFunc": "{x} + 120",
2525
"Localization": [
2626
{
2727
"Culture": "en-US",
@@ -32,8 +32,8 @@
3232
{
3333
"SingularName": "DecibelMillivolt",
3434
"PluralName": "DecibelMillivolts",
35-
"FromUnitToBaseFunc": "x - 60",
36-
"FromBaseToUnitFunc": "x + 60",
35+
"FromUnitToBaseFunc": "{x} - 60",
36+
"FromBaseToUnitFunc": "{x} + 60",
3737
"Localization": [
3838
{
3939
"Culture": "en-US",
@@ -44,8 +44,8 @@
4444
{
4545
"SingularName": "DecibelUnloaded",
4646
"PluralName": "DecibelsUnloaded",
47-
"FromUnitToBaseFunc": "x - 2.218487499",
48-
"FromBaseToUnitFunc": "x + 2.218487499",
47+
"FromUnitToBaseFunc": "{x} - 2.218487499",
48+
"FromBaseToUnitFunc": "{x} + 2.218487499",
4949
"Localization": [
5050
{
5151
"Culture": "en-US",

‎Common/UnitDefinitions/Angle.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
{
77
"SingularName": "Radian",
88
"PluralName": "Radians",
9-
"FromUnitToBaseFunc": "x*180/Math.PI",
10-
"FromBaseToUnitFunc": "x/180*Math.PI",
9+
"FromUnitToBaseFunc": "{x}*180/Math.PI",
10+
"FromBaseToUnitFunc": "{x}/180*Math.PI",
1111
"Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci" ],
1212
"Localization": [
1313
{
@@ -24,8 +24,8 @@
2424
"SingularName": "Degree",
2525
"PluralName": "Degrees",
2626
"Prefixes": [ "Nano", "Micro", "Milli" ],
27-
"FromUnitToBaseFunc": "x",
28-
"FromBaseToUnitFunc": "x",
27+
"FromUnitToBaseFunc": "{x}",
28+
"FromBaseToUnitFunc": "{x}",
2929
"Localization": [
3030
{
3131
"Culture": "en-US",
@@ -40,8 +40,8 @@
4040
{
4141
"SingularName": "Arcminute",
4242
"PluralName": "Arcminutes",
43-
"FromUnitToBaseFunc": "x/60",
44-
"FromBaseToUnitFunc": "x*60",
43+
"FromUnitToBaseFunc": "{x}/60",
44+
"FromBaseToUnitFunc": "{x}*60",
4545
"Localization": [
4646
{
4747
"Culture": "en-US",
@@ -52,8 +52,8 @@
5252
{
5353
"SingularName": "Arcsecond",
5454
"PluralName": "Arcseconds",
55-
"FromUnitToBaseFunc": "x/3600",
56-
"FromBaseToUnitFunc": "x*3600",
55+
"FromUnitToBaseFunc": "{x}/3600",
56+
"FromBaseToUnitFunc": "{x}*3600",
5757
"Localization": [
5858
{
5959
"Culture": "en-US",
@@ -64,8 +64,8 @@
6464
{
6565
"SingularName": "Gradian",
6666
"PluralName": "Gradians",
67-
"FromUnitToBaseFunc": "x*0.9",
68-
"FromBaseToUnitFunc": "x/0.9",
67+
"FromUnitToBaseFunc": "{x}*0.9",
68+
"FromBaseToUnitFunc": "{x}/0.9",
6969
"Localization": [
7070
{
7171
"Culture": "en-US",
@@ -80,8 +80,8 @@
8080
{
8181
"SingularName": "NatoMil",
8282
"PluralName": "NatoMils",
83-
"FromUnitToBaseFunc": "x*9/160",
84-
"FromBaseToUnitFunc": "x*160/9",
83+
"FromUnitToBaseFunc": "{x}*9/160",
84+
"FromBaseToUnitFunc": "{x}*160/9",
8585
"Localization": [
8686
{
8787
"Culture": "en-US",
@@ -92,8 +92,8 @@
9292
{
9393
"SingularName": "Revolution",
9494
"PluralName": "Revolutions",
95-
"FromUnitToBaseFunc": "x*360",
96-
"FromBaseToUnitFunc": "x/360",
95+
"FromUnitToBaseFunc": "{x}*360",
96+
"FromBaseToUnitFunc": "{x}/360",
9797
"Localization": [
9898
{
9999
"Culture": "en-US",
@@ -108,8 +108,8 @@
108108
{
109109
"SingularName": "Tilt",
110110
"PluralName": "Tilt",
111-
"FromUnitToBaseFunc": "Math.Asin(x)*180/Math.PI",
112-
"FromBaseToUnitFunc": "Math.Sin(x/180*Math.PI)",
111+
"FromUnitToBaseFunc": "Math.Asin({x})*180/Math.PI",
112+
"FromBaseToUnitFunc": "Math.Sin({x}/180*Math.PI)",
113113
"Localization": [
114114
{
115115
"Culture": "en-US",

‎Common/UnitDefinitions/ApparentEnergy.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
{
1212
"SingularName": "VoltampereHour",
1313
"PluralName": "VoltampereHours",
14-
"FromUnitToBaseFunc": "x",
15-
"FromBaseToUnitFunc": "x",
14+
"FromUnitToBaseFunc": "{x}",
15+
"FromBaseToUnitFunc": "{x}",
1616
"Prefixes": [ "Kilo", "Mega" ],
1717
"Localization": [
1818
{

‎Common/UnitDefinitions/ApparentPower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
{
1212
"SingularName": "Voltampere",
1313
"PluralName": "Voltamperes",
14-
"FromUnitToBaseFunc": "x",
15-
"FromBaseToUnitFunc": "x",
14+
"FromUnitToBaseFunc": "{x}",
15+
"FromBaseToUnitFunc": "{x}",
1616
"Prefixes": [ "Kilo", "Mega", "Giga" ],
1717
"Localization": [
1818
{

0 commit comments

Comments
 (0)