shadowfacts/grass
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better support negative modulo

Browse Source
This commit is contained in:
Connor Skees 2021-07-04 00:37:04 -04:00
parent 2ff3524ac2
commit a555352713
3 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/parse/mod.rs
View File

@ -915,7 +915,7 @@ impl<'a> Parser<'a> {
} }
let loc = self.map.look_up_span(message.span); let loc = self.map.look_up_span(message.span);
eprintln!( eprintln!(
"{}:{} Debug: {}", "{}:{} DEBUG: {}",
loc.file.name(), loc.file.name(),
loc.begin.line + 1, loc.begin.line + 1,
message.node message.node

30
src/value/number/mod.rs
View File

@ -711,6 +711,10 @@ impl DivAssign for Number {
} }
} }
fn modulo(n1: BigRational, n2: BigRational) -> BigRational {
(n1 % n2.clone() + n2.clone()) % n2
}
impl Rem for Number { impl Rem for Number {
type Output = Self; type Output = Self;
@ -721,25 +725,29 @@ impl Rem for Number {
Self::Small(val2) => { Self::Small(val2) => {
let tuple1: (i64, i64) = val1.into(); let tuple1: (i64, i64) = val1.into();
let tuple2: (i64, i64) = val2.into(); let tuple2: (i64, i64) = val2.into();
Self::Big(Box::new(
BigRational::new_raw(BigInt::from(tuple1.0), BigInt::from(tuple1.1)) Self::Big(Box::new(modulo(
% BigRational::new_raw(BigInt::from(tuple2.0), BigInt::from(tuple2.1)), BigRational::new_raw(BigInt::from(tuple1.0), BigInt::from(tuple1.1)),
)) BigRational::new_raw(BigInt::from(tuple2.0), BigInt::from(tuple2.1)),
)))
} }
Self::Big(val2) => { Self::Big(val2) => {
let tuple: (i64, i64) = val1.into(); let tuple: (i64, i64) = val1.into();
Self::Big(Box::new(
BigRational::new_raw(BigInt::from(tuple.0), BigInt::from(tuple.1)) % *val2, Self::Big(Box::new(modulo(
)) BigRational::new_raw(BigInt::from(tuple.0), BigInt::from(tuple.1)),
*val2,
)))
} }
}, },
Self::Big(val1) => match other { Self::Big(val1) => match other {
Self::Big(val2) => Self::Big(Box::new(*val1 % *val2)), Self::Big(val2) => Self::Big(Box::new(modulo(*val1, *val2))),
Self::Small(val2) => { Self::Small(val2) => {
let tuple: (i64, i64) = val2.into(); let tuple: (i64, i64) = val2.into();
Self::Big(Box::new( Self::Big(Box::new(modulo(
*val1 % BigRational::new_raw(BigInt::from(tuple.0), BigInt::from(tuple.1)), *val1,
)) BigRational::new_raw(BigInt::from(tuple.0), BigInt::from(tuple.1)),
)))
} }
}, },
} }

20
tests/modulo.rs
View File

@ -65,3 +65,23 @@ error!(
positive_unit_mod_zero_unit_incompatible_units, positive_unit_mod_zero_unit_incompatible_units,
"a {\n color: 1rem % 0px;\n}\n", "Error: Incompatible units rem and px." "a {\n color: 1rem % 0px;\n}\n", "Error: Incompatible units rem and px."
); );
test!(
positive_mod_negative,
"a {\n color: 1 % -4;\n}\n",
"a {\n color: -3;\n}\n"
);
test!(
negative_mod_positive,
"a {\n color: -4 % 3;\n}\n",
"a {\n color: 2;\n}\n"
);
test!(
negative_mod_negative,
"a {\n color: -4 % -3;\n}\n",
"a {\n color: -1;\n}\n"
);
test!(
big_negative_mod_positive,
"a {\n color: -99999990000099999999999999 % 2;\n}\n",
"a {\n color: 1;\n}\n"
);