Fix procedures bytevector-copy and bytevector-copy!.

Author: objecthub

Sources/LispKit/Primitives/BytevectorLibrary.swift

@@ -126,20 +126,20 @@ public final class BytevectorLibrary: NativeLibrary {
 
   func bytevectorCopy(_ bvec: Expr, args: Arguments) throws -> Expr {
     let bvector = try bvec.asByteVector()
-    guard let (s, e) = args.optional(Expr.makeNumber(bvector.value.count),
-                                     Expr.makeNumber(0)) else {
+    guard let (s, e) = args.optional(Expr.makeNumber(0),
+                                     Expr.makeNumber(bvector.value.count)) else {
       throw RuntimeError.argumentCount(of: "bytevector-copy",
-                                       min: 2,
-                                       max: 2,
+                                       min: 1,
+                                       max: 3,
                                        args: .pair(bvec, .makeList(args)))
     }
     let (start, end) = (try s.asInt(), try e.asInt())
-    guard start >= 0 && start < bvector.value.count else {
+    guard start >= 0 && start <= bvector.value.count else {
       throw RuntimeError.range(parameter: 2,
                                of: "bytevector-copy",
                                s,
                                min: 0,
-                               max: Int64(bvector.value.count - 1))
+                               max: Int64(bvector.value.count))
     }
     guard end >= start && end <= bvector.value.count else {
       throw RuntimeError.range(parameter: 3,
@@ -163,18 +163,18 @@ public final class BytevectorLibrary: NativeLibrary {
                                of: "bytevector-copy!",
                                at,
                                min: 0,
-                               max: Int64(toVec.value.count - 1))
+                               max: Int64(toVec.value.count))
     }
     let fromVec = try from.asByteVector()
-    guard let (s, e) = args.optional(Expr.makeNumber(fromVec.value.count),
-                                     Expr.makeNumber(0)) else {
+    guard let (s, e) = args.optional(Expr.makeNumber(0),
+                                     Expr.makeNumber(fromVec.value.count)) else {
       throw RuntimeError.argumentCount(of: "bytevector-copy!",
                                        min: 3,
                                        max: 5,
                                        args: .pair(to, .pair(at, .pair(from, .makeList(args)))))
     }
     let (start, end) = (try s.asInt(), try e.asInt())
-    guard start >= 0 && start < fromVec.value.count else {
+    guard start >= 0 && start <= fromVec.value.count else {
       throw RuntimeError.range(parameter: 4,
                                of: "bytevector-copy!",
                                s,

Sources/LispKit/Resources/Tests/R7RS.scm

@@ -1550,20 +1550,20 @@
 (test #u8(0 255 2)
     (let ((bv (bytevector 0 1 2))) (bytevector-u8-set! bv 1 255) bv))
 
-#;(test #u8() (bytevector-copy #u8()))    ;; TODO
-#;(test #u8(0 1 2) (bytevector-copy #u8(0 1 2)))    ;; TODO
-#;(test #u8(1 2) (bytevector-copy #u8(0 1 2) 1))    ;; TODO
-#;(test #u8(1) (bytevector-copy #u8(0 1 2) 1 2))    ;; TODO
+(test #u8() (bytevector-copy #u8()))
+(test #u8(0 1 2) (bytevector-copy #u8(0 1 2)))
+(test #u8(1 2) (bytevector-copy #u8(0 1 2) 1))
+(test #u8(1) (bytevector-copy #u8(0 1 2) 1 2))
 
-#;(test #u8(1 6 7 4 5)
+(test #u8(1 6 7 4 5)
     (let ((bv (bytevector 1 2 3 4 5)))
       (bytevector-copy! bv 1 #u8(6 7 8 9 10) 0 2)
       bv))    ;; TODO
-#;(test #u8(6 7 8 9 10)
+(test #u8(6 7 8 9 10)
     (let ((bv (bytevector 1 2 3 4 5)))
       (bytevector-copy! bv 0 #u8(6 7 8 9 10))
       bv))    ;; TODO
-#;(test #u8(8 9 10 4 5)
+(test #u8(8 9 10 4 5)
     (let ((bv (bytevector 1 2 3 4 5)))
       (bytevector-copy! bv 0 #u8(6 7 8 9 10) 2)
       bv))    ;; TODO