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

Pow with units

Browse Source
This commit is contained in:
Kasper 2020-01-18 20:33:57 +01:00
parent 1aca6fd68f
commit 025b1b9169
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lexer.rs
View File

@ -97,7 +97,6 @@ pub fn lex(input: &str, allow_trailing_operators: bool, default_degree: Unit) ->
} }
if is_multidimensional { if is_multidimensional {
let string_plus_one_character = &input[start_index..=end_index+1]; let string_plus_one_character = &input[start_index..=end_index+1];
println!("YUP {}", string_plus_one_character);
match string_plus_one_character { match string_plus_one_character {
"mm2" | "millimeter2" | "millimeters2" => tokens.push(Token::Unit(SquareMillimeter)), "mm2" | "millimeter2" | "millimeters2" => tokens.push(Token::Unit(SquareMillimeter)),
"cm2" | "centimeter2" | "centimeters2" => tokens.push(Token::Unit(SquareCentimeter)), "cm2" | "centimeter2" | "centimeters2" => tokens.push(Token::Unit(SquareCentimeter)),

36
src/units.rs
View File

@ -388,25 +388,45 @@ pub fn divide(left: Number, right: Number) -> Result<Number, String> {
pub fn modulo(left: Number, right: Number) -> Result<Number, String> { pub fn modulo(left: Number, right: Number) -> Result<Number, String> {
if left.unit.category() == Temperature || right.unit.category() == Temperature { if left.unit.category() == Temperature || right.unit.category() == Temperature {
// if temperature // if temperature
return Err(format!("Cannot modulo {:?} by {:?}", left.unit, right.unit)) Err(format!("Cannot modulo {:?} by {:?}", left.unit, right.unit))
} else if left.unit.category() == right.unit.category() { } else if left.unit.category() == right.unit.category() {
// 5 km % 3 m // 5 km % 3 m
let (left, right) = convert_to_lowest(left, right)?; let (left, right) = convert_to_lowest(left, right)?;
return Ok(Number::new(left.value % right.value, left.unit)) Ok(Number::new(left.value % right.value, left.unit))
} else { } else {
return Err(format!("Cannot modulo {:?} by {:?}", left.unit, right.unit)) Err(format!("Cannot modulo {:?} by {:?}", left.unit, right.unit))
} }
} }
pub fn pow(left: Number, right: Number) -> Result<Number, String> { pub fn pow(left: Number, right: Number) -> Result<Number, String> {
let lcat = left.unit.category();
let rcat = left.unit.category();
if left.unit == NoUnit && right.unit == NoUnit { if left.unit == NoUnit && right.unit == NoUnit {
// 3 ^ 2 // 3 ^ 2
return Ok(Number::new(left.value.pow(right.value), left.unit)) Ok(Number::new(left.value.pow(right.value), left.unit))
} else if right.unit == NoUnit && left.unit != NoUnit { } else if right.value == d128!(1) && right.unit == NoUnit {
// 1 km ^ 3 Ok(left)
return Ok(Number::new(left.value.pow(right.value), left.unit)) } else if lcat == Length && right.unit == NoUnit && right.value == d128!(2) {
// x km ^ 2
let result = (left.value * left.unit.weight()).pow(right.value);
Ok(to_ideal_unit(Number::new(result, SquareMillimeter)))
} else if lcat == Length && right.unit == NoUnit && right.value == d128!(3) {
// x km ^ 3
let result = (left.value * left.unit.weight()).pow(right.value);
Ok(to_ideal_unit(Number::new(result, CubicMillimeter)))
} else if lcat == Length && rcat == Length && right.value == d128!(1) {
// x km ^ 1 km
Ok(multiply(left, right)?)
} else if lcat == Length && rcat == Length && right.value == d128!(2) {
// x km ^ 2 km
let pow2 = multiply(left, Number::new(d128!(1), right.unit))?;
let pow3 = multiply(pow2, Number::new(d128!(1), right.unit))?;
Ok(pow3)
} else if lcat == Length && rcat == Area && right.value == d128!(1) {
// x km ^ km2
Ok(multiply(left, Number::new(d128!(1), right.unit))?)
} else { } else {
return Err(format!("Cannot multiply {:?} and {:?}", left.unit, right.unit)) Err(format!("Cannot multiply {:?} and {:?}", left.unit, right.unit))
} }
} }