ztr/CPC
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Added unit of mass stone

Browse Source
This commit is contained in:
Kasper 2020-11-26 18:28:34 +01:00
parent dcc948b5d5
commit 72037bfd15
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lexer.rs
View File

@ -277,6 +277,7 @@ pub fn lex(input: &str, allow_trailing_operators: bool, default_degree: Unit) ->
} }
} }
}, },
"stone" | "stones" => tokens.push(Token::Unit(Stone)),
"st" | "ton" | "tons" | "short ton" | "short tons" | "short tonne" | "short tonnes" => tokens.push(Token::Unit(ShortTon)), "st" | "ton" | "tons" | "short ton" | "short tons" | "short tonne" | "short tonnes" => tokens.push(Token::Unit(ShortTon)),
"lt" | "long ton" | "long tons" | "long tonne" | "long tonnes" => tokens.push(Token::Unit(LongTon)), "lt" | "long ton" | "long tons" | "long tonne" | "long tonnes" => tokens.push(Token::Unit(LongTon)),

2
src/units.rs
View File

@ -148,6 +148,7 @@ create_units!(
MetricTon: (Mass, d128!(1000000)), MetricTon: (Mass, d128!(1000000)),
Ounce: (Mass, d128!(28.349523125)), Ounce: (Mass, d128!(28.349523125)),
Pound: (Mass, d128!(453.59237)), Pound: (Mass, d128!(453.59237)),
Stone: (Mass, d128!(6350.29318)),
ShortTon: (Mass, d128!(907184.74)), ShortTon: (Mass, d128!(907184.74)),
LongTon: (Mass, d128!(1016046.9088)), LongTon: (Mass, d128!(1016046.9088)),
@ -769,6 +770,7 @@ mod tests {
assert_eq!(convert_test(1000.0, Kilogram, MetricTon), 1.0); assert_eq!(convert_test(1000.0, Kilogram, MetricTon), 1.0);
assert_eq!(convert_test(0.45359237, Kilogram, Pound), 1.0); assert_eq!(convert_test(0.45359237, Kilogram, Pound), 1.0);
assert_eq!(convert_test(16.0, Ounce, Pound), 1.0); assert_eq!(convert_test(16.0, Ounce, Pound), 1.0);
assert_eq!(convert_test(14.0, Pound, Stone), 1.0);
assert_eq!(convert_test(2000.0, Pound, ShortTon), 1.0); assert_eq!(convert_test(2000.0, Pound, ShortTon), 1.0);
assert_eq!(convert_test(2240.0, Pound, LongTon), 1.0); assert_eq!(convert_test(2240.0, Pound, LongTon), 1.0);