Merge pull request #1761 from rtfeldman/giesch

Add List.dropAt

compiler/gen_llvm/src/llvm/build.rs

@@ -9,9 +9,10 @@ use crate::llvm::build_dict::{
 use crate::llvm::build_hash::generic_hash;
 use crate::llvm::build_list::{
     self, allocate_list, empty_list, empty_polymorphic_list, list_append, list_concat,
-    list_contains, list_drop, list_get_unsafe, list_join, list_keep_errs, list_keep_if,
-    list_keep_oks, list_len, list_map, list_map2, list_map3, list_map_with_index, list_prepend,
-    list_range, list_repeat, list_reverse, list_set, list_single, list_sort_with, list_swap,
+    list_contains, list_drop, list_drop_at, list_get_unsafe, list_join, list_keep_errs,
+    list_keep_if, list_keep_oks, list_len, list_map, list_map2, list_map3, list_map_with_index,
+    list_prepend, list_range, list_repeat, list_reverse, list_set, list_single, list_sort_with,
+    list_swap,
 };
 use crate::llvm::build_str::{
     empty_str, str_concat, str_count_graphemes, str_ends_with, str_from_float, str_from_int,
@@ -5140,6 +5141,27 @@ fn run_low_level<'a, 'ctx, 'env>(
                 _ => unreachable!("Invalid layout {:?} in List.drop", list_layout),
             }
         }
+        ListDropAt => {
+            // List.dropAt : List elem, Nat -> List elem
+            debug_assert_eq!(args.len(), 2);
+
+            let (list, list_layout) = load_symbol_and_layout(scope, &args[0]);
+            let original_wrapper = list.into_struct_value();
+
+            let count = load_symbol(scope, &args[1]);
+
+            match list_layout {
+                Layout::Builtin(Builtin::EmptyList) => empty_list(env),
+                Layout::Builtin(Builtin::List(element_layout)) => list_drop_at(
+                    env,
+                    layout_ids,
+                    original_wrapper,
+                    count.into_int_value(),
+                    element_layout,
+                ),
+                _ => unreachable!("Invalid layout {:?} in List.dropAt", list_layout),
+            }
+        }
         ListPrepend => {
             // List.prepend : List elem, elem -> List elem
             debug_assert_eq!(args.len(), 2);

compiler/gen_llvm/src/llvm/build_list.rs

@@ -297,7 +297,7 @@ pub fn list_swap<'a, 'ctx, 'env>(
     )
 }
 
-/// List.drop : List elem, Nat, Nat -> List elem
+/// List.drop : List elem, Nat -> List elem
 pub fn list_drop<'a, 'ctx, 'env>(
     env: &Env<'a, 'ctx, 'env>,
     layout_ids: &mut LayoutIds<'a>,
@@ -319,6 +319,28 @@ pub fn list_drop<'a, 'ctx, 'env>(
     )
 }
 
+/// List.dropAt : List elem, Nat -> List elem
+pub fn list_drop_at<'a, 'ctx, 'env>(
+    env: &Env<'a, 'ctx, 'env>,
+    layout_ids: &mut LayoutIds<'a>,
+    original_wrapper: StructValue<'ctx>,
+    count: IntValue<'ctx>,
+    element_layout: &Layout<'a>,
+) -> BasicValueEnum<'ctx> {
+    let dec_element_fn = build_dec_wrapper(env, layout_ids, element_layout);
+    call_bitcode_fn_returns_list(
+        env,
+        &[
+            pass_list_cc(env, original_wrapper.into()),
+            env.alignment_intvalue(element_layout),
+            layout_width(env, element_layout),
+            count.into(),
+            dec_element_fn.as_global_value().as_pointer_value().into(),
+        ],
+        bitcode::LIST_DROP_AT,
+    )
+}
+
 /// List.set : List elem, Nat, elem -> List elem
 pub fn list_set<'a, 'ctx, 'env>(
     env: &Env<'a, 'ctx, 'env>,