language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-26 21:39:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Simplify arity and branching calculation

Browse source
This commit is contained in:
Ayaz Hafiz 2022-11-01 15:33:23 -05:00
parent 0706615d29
commit 27b9dd8253
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
3 changed files with 46 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

25
crates/compiler/exhaustive/src/lib.rs
View file

@ -102,22 +102,19 @@ impl ListArity {
/// Could this list pattern include list pattern arity `other`?
fn covers_arities_of(&self, other: &Self) -> bool {
match (self, other) {
(ListArity::Exact(l), ListArity::Exact(r)) => l == r,
(ListArity::Exact(this_exact), ListArity::Slice(other_left, other_right)) => {
// [_, _, _] can only cover [_, _, .., _]
*this_exact == (other_left + other_right)
self.covers_length(other.min_len())
}
(ListArity::Slice(this_left, this_right), ListArity::Exact(other_exact)) => {
// [_, _, .., _] can cover [_, _, _], [_, _, _, _], [_, _, _, _, _], and so on
(this_left + this_right) <= *other_exact
pub fn covers_length(&self, length: usize) -> bool {
match self {
ListArity::Exact(l) => {
// [_, _, _] can only cover [_, _, _]
*l == length
}
(
ListArity::Slice(this_left, this_right),
ListArity::Slice(other_left, other_right),
) => {
// [_, _, .., _] can cover [_, _, .., _], [_, .., _, _], [_, _, .., _, _], [_, _, _, .., _, _], and so on
(this_left + this_right) <= (other_left + other_right)
ListArity::Slice(head, tail) => {
// [_, _, .., _] can cover infinite arities >=3 , including
// [_, _, .., _], [_, .., _, _], [_, _, .., _, _], [_, _, _, .., _, _], and so on
head + tail <= length
}
}
}

13
crates/compiler/mono/src/decision_tree.rs
View file

@ -796,18 +796,7 @@ fn to_relevant_branch_help<'a>(
elements,
element_layout: _,
} => match test {
IsListLen { bound, len }
if (match (bound, my_arity) {
(ListLenBound::Exact, ListArity::Exact(my_len)) => my_len == *len as _,
(ListLenBound::Exact, ListArity::Slice(my_head, my_tail)) => {
my_head + my_tail <= *len as _
}
(ListLenBound::AtLeast, ListArity::Exact(my_len)) => my_len == *len as _,
(ListLenBound::AtLeast, ListArity::Slice(my_head, my_tail)) => {
my_head + my_tail <= *len as _
}
}) =>
{
IsListLen { bound: _, len } if my_arity.covers_length(*len as _) => {
let sub_positions = elements.into_iter().enumerate().map(|(index, elem_pat)| {
let mut new_path = path.to_vec();

81
crates/compiler/test_mono/generated/match_list.txt
View file

@ -1,67 +1,46 @@
procedure Test.0 ():
let Test.42 : Int1 = false;
let Test.43 : Int1 = true;
let Test.1 : List Int1 = Array [Test.42, Test.43];
joinpoint Test.16:
let Test.29 : Int1 = false;
let Test.30 : Int1 = true;
let Test.1 : List Int1 = Array [Test.29, Test.30];
joinpoint Test.19:
let Test.8 : Str = "E";
ret Test.8;
in
joinpoint Test.10:
joinpoint Test.17:
let Test.7 : Str = "D";
ret Test.7;
in
joinpoint Test.14:
let Test.6 : Str = "C";
ret Test.6;
in
joinpoint Test.11:
let Test.5 : Str = "B";
ret Test.5;
in
let Test.39 : U64 = lowlevel ListLen Test.1;
let Test.40 : U64 = 0i64;
let Test.41 : Int1 = lowlevel Eq Test.39 Test.40;
if Test.41 then
dec Test.1;
joinpoint Test.9:
let Test.4 : Str = "A";
ret Test.4;
else
let Test.36 : U64 = lowlevel ListLen Test.1;
let Test.37 : U64 = 1i64;
let Test.38 : Int1 = lowlevel Eq Test.36 Test.37;
if Test.38 then
let Test.17 : U64 = 0i64;
let Test.18 : Int1 = lowlevel ListGetUnsafe Test.1 Test.17;
dec Test.1;
let Test.19 : Int1 = false;
let Test.20 : Int1 = lowlevel Eq Test.19 Test.18;
if Test.20 then
jump Test.10;
else
jump Test.16;
else
let Test.33 : U64 = lowlevel ListLen Test.1;
let Test.34 : U64 = 2i64;
let Test.35 : Int1 = lowlevel NumGte Test.33 Test.34;
if Test.35 then
let Test.25 : U64 = 0i64;
let Test.26 : Int1 = lowlevel ListGetUnsafe Test.1 Test.25;
let Test.27 : Int1 = false;
let Test.28 : Int1 = lowlevel Eq Test.27 Test.26;
in
let Test.26 : U64 = lowlevel ListLen Test.1;
let Test.27 : U64 = 0i64;
let Test.28 : Int1 = lowlevel Eq Test.26 Test.27;
if Test.28 then
let Test.21 : U64 = 1i64;
let Test.22 : Int1 = lowlevel ListGetUnsafe Test.1 Test.21;
dec Test.1;
let Test.23 : Int1 = false;
let Test.24 : Int1 = lowlevel Eq Test.23 Test.22;
if Test.24 then
let Test.6 : Str = "C";
ret Test.6;
else
let Test.7 : Str = "D";
ret Test.7;
jump Test.9;
else
let Test.23 : U64 = lowlevel ListLen Test.1;
let Test.24 : U64 = 1i64;
let Test.25 : Int1 = lowlevel Eq Test.23 Test.24;
if Test.25 then
dec Test.1;
jump Test.16;
jump Test.9;
else
let Test.29 : U64 = 0i64;
let Test.30 : Int1 = lowlevel ListGetUnsafe Test.1 Test.29;
let Test.20 : U64 = lowlevel ListLen Test.1;
dec Test.1;
let Test.31 : Int1 = false;
let Test.32 : Int1 = lowlevel Eq Test.31 Test.30;
if Test.32 then
jump Test.10;
let Test.21 : U64 = 2i64;
let Test.22 : Int1 = lowlevel NumGte Test.20 Test.21;
if Test.22 then
jump Test.9;
else
jump Test.16;
jump Test.9;