allow map multiinsert for under get

Author: kaikalii

site/primitives.json

@@ -1201,6 +1201,13 @@
     "description": "Get the reciprocal of a number",
     "experimental": true
   },
+  "recur": {
+    "outputs": 1,
+    "modifier_args": 3,
+    "class": "Algorithm",
+    "description": "Execute a recursive or tree algorithm",
+    "experimental": true
+  },
   "recv": {
     "args": 1,
     "outputs": 1,

src/algorithm/map.rs

@@ -157,22 +157,27 @@ impl Value {
     }
     /// Insert a key-value pair into a map array
     #[allow(clippy::unit_arg)]
-    pub fn insert(&mut self, key: Value, value: Value, env: &Uiua) -> UiuaResult {
-        // if value.rank() == self.rank() && value.type_id() == self.type_id() {
-        //     if key.row_count() != value.row_count() {
-        //         return Err(env.error(format!(
-        //             "You appear to be inserting multiple keys. \
-        //             Inserted keys and values must have the same length, \
-        //             but their shapes are {} and {}",
-        //             key.shape,
-        //             value.shape
-        //         )));
-        //     }
-        //     for (key, value) in key.into_rows().zip(value.into_rows()) {
-        //         self.insert(key, value, env)?;
-        //     }
-        //     return Ok(());
-        // }
+    pub fn insert(
+        &mut self,
+        key: Value,
+        value: Value,
+        allow_multi: bool,
+        env: &Uiua,
+    ) -> UiuaResult {
+        if allow_multi && value.rank() == self.rank() && value.type_id() == self.type_id() {
+            if key.row_count() != value.row_count() {
+                return Err(env.error(format!(
+                    "You appear to be inserting multiple keys. \
+                    Inserted keys and values must have the same length, \
+                    but their shapes are {} and {}",
+                    key.shape, value.shape
+                )));
+            }
+            for (key, value) in key.into_rows().zip(value.into_rows()) {
+                self.insert(key, value, false, env)?;
+            }
+            return Ok(());
+        }
 
         if !self.is_map() && self.row_count() == 0 {
             self.map(Value::default(), env)?;

src/compile/invert/under.rs

@@ -177,7 +177,11 @@ static UNDER_PATTERNS: &[&dyn UnderPattern] = &[
         (PopUnd(3), UndoRegex),
     ),
     // Map control
-    &MaybeVal((Get, (CopyUnd(2), Get), (PopUnd(1), Flip, PopUnd(1), Insert))),
+    &MaybeVal((
+        Get,
+        (CopyUnd(2), Get),
+        (PopUnd(1), Flip, PopUnd(1), UndoGet),
+    )),
     &Stash(2, Remove, UndoRemove),
     &MaybeVal((Insert, (CopyUnd(3), Insert), (PopUnd(3), UndoInsert))),
     // Shaping

src/impl_prim.rs

@@ -193,6 +193,7 @@ impl_primitive!(
     (3, UndoPartition2),
     (1(1)[1], UndoGroup1),
     (3, UndoGroup2),
+    (3, UndoGet),
     (4, UndoInsert),
     (3, UndoRemove),
     (1(0), TryClose),
@@ -378,6 +379,7 @@ impl fmt::Display for ImplPrimitive {
             UndoAntiOrient => write!(f, "{Under}{Orient}"),
             DoRegex => write!(f, "{Regex}"),
             UndoRegex => write!(f, "{Under}{Regex}"),
+            UndoGet => write!(f, "{Under}{Get}"),
             UndoInsert => write!(f, "{Under}{Insert}"),
             UndoRemove => write!(f, "{Under}{Remove}"),
             UndoPartition1 | UndoPartition2 => write!(f, "{Under}{Partition}"),

src/run_prim.rs

@@ -262,7 +262,7 @@ pub fn run_prim_func(prim: &Primitive, env: &mut Uiua) -> UiuaResult {
             let key = env.pop("key")?;
             let val = env.pop("value")?;
             let mut map = env.pop("map")?;
-            map.insert(key, val, env)?;
+            map.insert(key, val, false, env)?;
             env.push(map);
         }
         Primitive::Has => {
@@ -916,6 +916,13 @@ impl ImplPrimitive {
                 env.push(left);
             }
             ImplPrimitive::TryClose => _ = run_sys_op(&SysOp::Close, env),
+            ImplPrimitive::UndoGet => {
+                let key = env.pop("key")?;
+                let val = env.pop("value")?;
+                let mut map = env.pop("map")?;
+                map.insert(key, val, true, env)?;
+                env.push(map);
+            }
             ImplPrimitive::UndoInsert => {
                 let key = env.pop(1)?;
                 let _value = env.pop(2)?;

tests/under.ua

@@ -411,6 +411,9 @@ G ← ⍜(⊙⊙⊢) ⋅⊙∘
 ⍤⤙≍ map "abc" [1 2 3] ⍜remove∘ @d map "abc" [1 2 3]
 ⍤⤙≍ ⟜⍜(get"abc")∘ map {"abc"} [1]
 ⍤⤙≍ □⟜⍜(◇get"abc")∘ map {"abc"} [1]
+map {"alice" "bob" "charlie"} [1 2 3]
+⍜get(+1) {"alice" "charlie"}
+⍤⤙≍ map {"alice" "bob" "charlie"} [2 2 4]
 
 # Pattern matching
 ⍤⤙≍ "2 - 4" ⍜°$"_ - _"∩(×2⋕) "1 - 2"