From 9d37f7ae731ece433d16c05f5e64317eb830d9ef Mon Sep 17 00:00:00 2001 From: Richard Feldman Date: Wed, 22 Apr 2020 08:32:31 -0400 Subject: [PATCH] s/IndexOutOfBounds/OutOfBounds/g --- compiler/builtins/src/std.rs | 4 ++-- compiler/builtins/src/unique.rs | 4 ++-- compiler/gen/tests/gen_builtins.rs | 2 +- compiler/solve/tests/test_solve.rs | 14 +++++++++++++- compiler/solve/tests/test_uniq_solve.rs | 4 ++-- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/compiler/builtins/src/std.rs b/compiler/builtins/src/std.rs index 7296872b3e..a94a7dfa7d 100644 --- a/compiler/builtins/src/std.rs +++ b/compiler/builtins/src/std.rs @@ -377,9 +377,9 @@ pub fn types() -> MutMap { ), ); - // get : List elem, Int -> Result elem [ IndexOutOfBounds ]* + // get : List elem, Int -> Result elem [ OutOfBounds ]* let index_out_of_bounds = SolvedType::TagUnion( - vec![(TagName::Global("IndexOutOfBounds".into()), vec![])], + vec![(TagName::Global("OutOfBounds".into()), vec![])], Box::new(SolvedType::Wildcard), ); diff --git a/compiler/builtins/src/unique.rs b/compiler/builtins/src/unique.rs index 9c33318e66..dbb1c849cc 100644 --- a/compiler/builtins/src/unique.rs +++ b/compiler/builtins/src/unique.rs @@ -444,9 +444,9 @@ pub fn types() -> MutMap { unique_function(vec![list_type(UVAR1, TVAR1)], int_type(UVAR2)), ); - // get : List a, Int -> Result a [ IndexOutOfBounds ]* + // get : List a, Int -> Result a [ OutOfBounds ]* let index_out_of_bounds = SolvedType::TagUnion( - vec![(TagName::Global("IndexOutOfBounds".into()), vec![])], + vec![(TagName::Global("OutOfBounds".into()), vec![])], Box::new(SolvedType::Wildcard), ); diff --git a/compiler/gen/tests/gen_builtins.rs b/compiler/gen/tests/gen_builtins.rs index 095f27c693..bcf02841fc 100644 --- a/compiler/gen/tests/gen_builtins.rs +++ b/compiler/gen/tests/gen_builtins.rs @@ -290,7 +290,7 @@ mod gen_builtins { #[test] fn head_int_list() { - assert_evals_to!("List.getUnsafe [ 12, 9, 6, 3 ] 0", 12, i64); + assert_evals_to!("List.get [ 12, 9, 6, 3 ] 0", (1, 12), (u64, i64)); } #[test] diff --git a/compiler/solve/tests/test_solve.rs b/compiler/solve/tests/test_solve.rs index 43b3ad9a08..1965c60025 100644 --- a/compiler/solve/tests/test_solve.rs +++ b/compiler/solve/tests/test_solve.rs @@ -2194,6 +2194,18 @@ mod test_solve { ); } + #[test] + fn solve_list_get() { + infer_eq_without_problem( + indoc!( + r#" + List.get [ "a" ] 0 + "# + ), + "Result Str [ OutOfBounds ]*", + ); + } + #[test] fn type_more_general_than_signature() { infer_eq_without_problem( @@ -2292,7 +2304,7 @@ mod test_solve { List.get [ 10, 9, 8, 7 ] 1 "# ), - "Result (Num *) [ IndexOutOfBounds ]*", + "Result (Num *) [ OutOfBounds ]*", ); } diff --git a/compiler/solve/tests/test_uniq_solve.rs b/compiler/solve/tests/test_uniq_solve.rs index 5586ddf3cd..34f562ee69 100644 --- a/compiler/solve/tests/test_uniq_solve.rs +++ b/compiler/solve/tests/test_uniq_solve.rs @@ -1896,7 +1896,7 @@ mod test_uniq_solve { |> List.get 2 "# ), - "Attr * (Result (Attr * (Num (Attr * *))) (Attr * [ IndexOutOfBounds ]*))", + "Attr * (Result (Attr * (Num (Attr * *))) (Attr * [ OutOfBounds ]*))", ); } @@ -1984,7 +1984,7 @@ mod test_uniq_solve { { p, q } "# ), - "Attr * (Attr * (List (Attr Shared a)) -> Attr * { p : (Attr * (Result (Attr Shared a) (Attr * [ IndexOutOfBounds ]*))), q : (Attr * (Result (Attr Shared a) (Attr * [ IndexOutOfBounds ]*))) })" + "Attr * (Attr * (List (Attr Shared a)) -> Attr * { p : (Attr * (Result (Attr Shared a) (Attr * [ OutOfBounds ]*))), q : (Attr * (Result (Attr Shared a) (Attr * [ OutOfBounds ]*))) })" ); }