make subscripted on work with function packs

uiua-lang · Jan 9, 2025 · 82da1e1 · 82da1e1
1 parent 3d13e06
commit 82da1e1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/compile/modifier.rs b/src/compile/modifier.rs
@@ -114,11 +114,18 @@ impl Compiler {
             Modifier::Primitive(Primitive::On) => {
                 let mut words = Vec::new();
                 for branch in pack.branches.iter().cloned() {
-                    words.push(branch.span.clone().sp(Word::Modified(Box::new(Modified {
+                    let mut word = Word::Modified(Box::new(Modified {
                         modifier: modifier.clone(),
-                        operands: vec![branch.map(Word::Func)],
+                        operands: vec![branch.clone().map(Word::Func)],
                         pack_expansion: true,
-                    }))));
+                    }));
+                    if let Some(sub) = &subscript {
+                        word = Word::Subscripted(Box::new(Subscripted {
+                            n: sub.clone(),
+                            word: branch.span.clone().sp(word),
+                        }))
+                    }
+                    words.push(branch.span.sp(word));
                 }
                 self.words(words)
             }

diff --git a/tests/units.ua b/tests/units.ua
@@ -419,6 +419,8 @@ B ← |1 (⨬(+⊃(B-1|B-2)|1)<2.)
 ⍤⤙≍ [1 2 3 4] [⟜₂+ 1 2 4]
 ⍤⤙≍ [1 2 7] [⟜₂(++) 1 2 4]
 
+⍤⤙≍ {1 2 {1 2 [1 2 3]}} {⟜₂({⊙⊙∘}|[⊙⊙∘]) 1 2 3}
+
 # By
 ⍤⤙≍ [0 5] [⊸0] 5
 ⍤⤙≍ [8 5] [⊸+] 3 5