sequences.snipped: fix out-of-bounds issues

factor · Dec 5, 2024 · 09fc16a · 09fc16a
1 parent 85d94ba
commit 09fc16a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/extra/sequences/snipped/snipped-tests.factor b/extra/sequences/snipped/snipped-tests.factor
@@ -4,5 +4,11 @@ USING: arrays sequences sequences.snipped tools.test ;
 
 { { 0 1 2 5 6 } } [ 3 5 7 <iota> <snipped> >array ] unit-test
 { { 0 1 2 } } [ 3 10 7 <iota> <snipped> >array ] unit-test
-{ { 6 } } [ -1 5 7 <iota> <snipped> >array ] unit-test
+{ { 5 6 } } [ -1 5 7 <iota> <snipped> >array ] unit-test
 { { } } [ -1 10 7 <iota> <snipped> >array ] unit-test
+
+{ { 1 2 3 } } [ -1 { 1 2 3 } <removed> >array ] unit-test
+{ { 2 3 } } [ 0 { 1 2 3 } <removed> >array ] unit-test
+{ { 1 3 } } [ 1 { 1 2 3 } <removed> >array ] unit-test
+{ { 1 2 } } [ 2 { 1 2 3 } <removed> >array ] unit-test
+{ { 1 2 3 } } [ 3 { 1 2 3 } <removed> >array ] unit-test
diff --git a/extra/sequences/snipped/snipped.factor b/extra/sequences/snipped/snipped.factor
@@ -8,7 +8,9 @@ TUPLE: snipped < sequence-view
 { length integer read-only } ;
 
 : <snipped> ( from to seq -- snipped )
-    [ length min ] keep -rot over - snipped boa ;
+    seq dup length :> n
+    from to [ 0 n clamp ] bi@
+    over - snipped boa ;
 
 : <removed> ( i seq -- snipped )
     [ dup 1 + ] dip <snipped> ;