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

Merge pull request #3 from joseluis/master

Browse Source 
fix spelling: Celcius → Celsius
This commit is contained in:
Kasper 2021-01-14 17:34:59 +01:00 committed by GitHub
commit c5afa7e01d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -43,7 +43,7 @@ cpc = "1.*"
use cpc::{eval}; use cpc::{eval};
use cpc::units::Unit; use cpc::units::Unit;
match eval("3m + 1cm", true, Unit::Celcius, false) { match eval("3m + 1cm", true, Unit::Celsius, false) {
Ok(answer) => { Ok(answer) => {
// answer: Number { value: 301, unit: Unit::Centimeter } // answer: Number { value: 301, unit: Unit::Centimeter }
println!("Evaluated value: {} {:?}", answer.value, answer.unit) println!("Evaluated value: {} {:?}", answer.value, answer.unit)

2
src/lexer.rs
View File

@ -385,7 +385,7 @@ pub fn lex(input: &str, allow_trailing_operators: bool, default_degree: Unit) ->
"kn" | "kt" | "knot" | "knots" => tokens.push(Token::Unit(Knot)), "kn" | "kt" | "knot" | "knots" => tokens.push(Token::Unit(Knot)),
"k" | "kelvin" | "kelvins" => tokens.push(Token::Unit(Kelvin)), "k" | "kelvin" | "kelvins" => tokens.push(Token::Unit(Kelvin)),
"c" | "celcius" => tokens.push(Token::Unit(Celcius)), "c" | "celsius" => tokens.push(Token::Unit(Celsius)),
"f" | "fahrenheit" | "fahrenheits" => tokens.push(Token::Unit(Fahrenheit)), "f" | "fahrenheit" | "fahrenheits" => tokens.push(Token::Unit(Fahrenheit)),
"deg" | "degree" | "degrees" => tokens.push(Token::Unit(default_degree)), "deg" | "degree" | "degrees" => tokens.push(Token::Unit(default_degree)),

4
src/lib.rs
View File

@ -11,7 +11,7 @@
//! use cpc::{eval}; //! use cpc::{eval};
//! use cpc::units::Unit; //! use cpc::units::Unit;
//! //!
//! match eval("3m + 1cm", true, Unit::Celcius, false) { //! match eval("3m + 1cm", true, Unit::Celsius, false) {
//! Ok(answer) => { //! Ok(answer) => {
//! // answer: Number { value: 301, unit: Unit::Centimeter } //! // answer: Number { value: 301, unit: Unit::Centimeter }
//! println!("Evaluated value: {} {:?}", answer.value, answer.unit) //! println!("Evaluated value: {} {:?}", answer.value, answer.unit)
@ -201,7 +201,7 @@ pub type TokenVector = Vec<Token>;
/// use cpc::{eval}; /// use cpc::{eval};
/// use cpc::units::Unit; /// use cpc::units::Unit;
/// ///
/// match eval("3m + 1cm", true, Unit::Celcius, false) { /// match eval("3m + 1cm", true, Unit::Celsius, false) {
/// Ok(answer) => { /// Ok(answer) => {
/// // answer: Number { value: 301, unit: Unit::Centimeter } /// // answer: Number { value: 301, unit: Unit::Centimeter }
/// println!("Evaluated value: {} {:?}", answer.value, answer.unit) /// println!("Evaluated value: {} {:?}", answer.value, answer.unit)

2
src/main.rs
View File

@ -10,7 +10,7 @@ fn main() {
debug = true; debug = true;
} }
if args.len() >= 2 { if args.len() >= 2 {
match eval(&args[1], true, Unit::Celcius, debug) { match eval(&args[1], true, Unit::Celsius, debug) {
Ok(answer) => { Ok(answer) => {
if !debug { if !debug {
println!("{} {:?}", answer.value, answer.unit) println!("{} {:?}", answer.value, answer.unit)

20
src/units.rs
View File

@ -258,7 +258,7 @@ create_units!(
Knot: (Speed, d128!(1.852)), Knot: (Speed, d128!(1.852)),
Kelvin: (Temperature, d128!(0)), Kelvin: (Temperature, d128!(0)),
Celcius: (Temperature, d128!(0)), Celsius: (Temperature, d128!(0)),
Fahrenheit: (Temperature, d128!(0)), Fahrenheit: (Temperature, d128!(0)),
); );
@ -303,14 +303,14 @@ pub fn convert(number: Number, to_unit: Unit) -> Result<Number, String> {
if number.unit.category() == UnitType::Temperature { if number.unit.category() == UnitType::Temperature {
match (number.unit, to_unit) { match (number.unit, to_unit) {
(Kelvin, Kelvin) => ok(value), (Kelvin, Kelvin) => ok(value),
(Kelvin, Celcius) => ok(value-d128!(273.15)), (Kelvin, Celsius) => ok(value-d128!(273.15)),
(Kelvin, Fahrenheit) => ok(value*d128!(1.8)-d128!(459.67)), (Kelvin, Fahrenheit) => ok(value*d128!(1.8)-d128!(459.67)),
(Celcius, Celcius) => ok(value), (Celsius, Celsius) => ok(value),
(Celcius, Kelvin) => ok(value+d128!(273.15)), (Celsius, Kelvin) => ok(value+d128!(273.15)),
(Celcius, Fahrenheit) => ok(value*d128!(1.8)+d128!(32)), (Celsius, Fahrenheit) => ok(value*d128!(1.8)+d128!(32)),
(Fahrenheit, Fahrenheit) => ok(value), (Fahrenheit, Fahrenheit) => ok(value),
(Fahrenheit, Kelvin) => ok((value+d128!(459.67))*d128!(5)/d128!(9)), (Fahrenheit, Kelvin) => ok((value+d128!(459.67))*d128!(5)/d128!(9)),
(Fahrenheit, Celcius) => ok((value-d128!(32))/d128!(1.8)), (Fahrenheit, Celsius) => ok((value-d128!(32))/d128!(1.8)),
_ => Err(format!("Error converting temperature {:?} to {:?}", number.unit, to_unit)), _ => Err(format!("Error converting temperature {:?} to {:?}", number.unit, to_unit)),
} }
} else { } else {
@ -865,11 +865,11 @@ mod tests {
assert_eq!(convert_test(1.609344, KilometersPerHour, MilesPerHour), 1.0); assert_eq!(convert_test(1.609344, KilometersPerHour, MilesPerHour), 1.0);
assert_eq!(convert_test(1.852, KilometersPerHour, Knot), 1.0); assert_eq!(convert_test(1.852, KilometersPerHour, Knot), 1.0);
assert_eq!(convert_test(274.15, Kelvin, Celcius), 1.0); assert_eq!(convert_test(274.15, Kelvin, Celsius), 1.0);
assert_eq!(convert_test(300.0, Kelvin, Fahrenheit), 80.33); assert_eq!(convert_test(300.0, Kelvin, Fahrenheit), 80.33);
assert_eq!(convert_test(-272.15, Celcius, Kelvin), 1.0); assert_eq!(convert_test(-272.15, Celsius, Kelvin), 1.0);
assert_eq!(convert_test(-15.0, Celcius, Fahrenheit), 5.0); assert_eq!(convert_test(-15.0, Celsius, Fahrenheit), 5.0);
assert_eq!(convert_test(80.33, Fahrenheit, Kelvin), 300.0); assert_eq!(convert_test(80.33, Fahrenheit, Kelvin), 300.0);
assert_eq!(convert_test(5.0, Fahrenheit, Celcius), -15.0); assert_eq!(convert_test(5.0, Fahrenheit, Celsius), -15.0);
} }
} }