From 35f3f0000fa95f2f5302017179dbf157f163f66d Mon Sep 17 00:00:00 2001 From: felipegchi Date: Tue, 13 Dec 2022 09:06:18 -0300 Subject: [PATCH 1/3] fix: bug with ampersand operator --- crates/kind-parser/src/expr.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/kind-parser/src/expr.rs b/crates/kind-parser/src/expr.rs index 73a43078..75a6b74f 100644 --- a/crates/kind-parser/src/expr.rs +++ b/crates/kind-parser/src/expr.rs @@ -40,7 +40,7 @@ impl<'a> Parser<'a> { Token::Star => Some(Operator::Mul), Token::Slash => Some(Operator::Div), Token::Percent => Some(Operator::Mod), - Token::Ampersand => Some(Operator::Add), + Token::Ampersand => Some(Operator::And), Token::Bar => Some(Operator::Or), Token::Hat => Some(Operator::Xor), Token::GreaterGreater => Some(Operator::Shr), From 917de2523031125c5f0c67819c618a4ae5f8761d Mon Sep 17 00:00:00 2001 From: felipegchi Date: Thu, 15 Dec 2022 14:39:49 -0300 Subject: [PATCH 2/3] fix: fixed bug with no coverage showing twice --- crates/kind-pass/src/desugar/destruct.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/kind-pass/src/desugar/destruct.rs b/crates/kind-pass/src/desugar/destruct.rs index cb0ad491..7f00178d 100644 --- a/crates/kind-pass/src/desugar/destruct.rs +++ b/crates/kind-pass/src/desugar/destruct.rs @@ -241,7 +241,8 @@ impl<'a> DesugarState<'a> { } if !unbound.is_empty() { - self.send_err(PassError::NoCoverage(range, unbound)) + self.send_err(PassError::NoCoverage(range, unbound)); + return desugared::Expr::err(range); } let motive = if let Some(res) = &match_.motive { From 90c920d4e40876c5e2e336ffce3ad1f5926c339b Mon Sep 17 00:00:00 2001 From: felipegchi Date: Thu, 15 Dec 2022 15:19:02 -0300 Subject: [PATCH 3/3] tests: fix tests --- crates/kind-tests/suite/kdl/Operators.golden | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/kind-tests/suite/kdl/Operators.golden b/crates/kind-tests/suite/kdl/Operators.golden index 7d702560..44676fff 100644 --- a/crates/kind-tests/suite/kdl/Operators.golden +++ b/crates/kind-tests/suite/kdl/Operators.golden @@ -1,3 +1,3 @@ run { - (& (+ #2 (& (- #3 (& (* #4 (/ #5 (% #6 (& (+ #2 (| #8 (^ #9 (<< #10 (% (>> #23 (% (< #2 (>= #4 (<= (== #4 #4) (> #3 (!= #5 #3))))) #60)) #60))))) #1152921504606846975)))) #1152921504606846975)) #1152921504606846975)) #1152921504606846975) + (& (+ #2 (& (- #3 (& (* #4 (/ #5 (% #6 (& #2 (| #8 (^ #9 (<< #10 (% (>> #23 (% (< #2 (>= #4 (<= (== #4 #4) (> #3 (!= #5 #3))))) #60)) #60)))))))) #1152921504606846975)) #1152921504606846975)) #1152921504606846975) }