[gnunet-scheme] branch master updated: bv-slice: Let slice-u8-ref and friends raise &missing-capabilities.

[gnunet]

This is an automated email from the git hooks/post-receive script.

maxime-devos pushed a commit to branch master
in repository gnunet-scheme.

The following commit(s) were added to refs/heads/master by this push:
     new 1666596  bv-slice: Let slice-u8-ref and friends raise 
&missing-capabilities.
1666596 is described below

commit 1666596a46255624c1e1e0d2535221f79e6e9d81
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Thu Feb 3 11:14:16 2022 +0000

    bv-slice: Let slice-u8-ref and friends raise &missing-capabilities.
    
    This makes error messages a little more useful.
    
    * gnu/gnunet/utils/bv-slice.scm
      (wrap-rnrs-ref): Replace 'ok?' by 'verify'.
      (slice-u8-ref,slice-u16-ref,slice-u32-ref,slice-u64-ref)
      (slice-s8-ref,slice-s16-ref,slice-s32-ref,slice-s64-ref)
      (slice-u8-set!,slice-u16-set!,slice-u32-set!,slice-u64-set!)
      (slice-s8-set!,slice-s16-set!,slice-s32-set!,slice-s64-set!)
      (slice-ieee-double-ref,slice-ieee-double-set!): Adjust calls to
      'wrap-rnrs-ref'.
    * NEWS (Features): Document new behaviour.
    
    Fixes: <https://notabug.org/maximed/scheme-gnunet/issues/22>
---
 NEWS                          |  3 +++
 gnu/gnunet/utils/bv-slice.scm | 40 ++++++++++++++++++++--------------------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/NEWS b/NEWS
index cf57ae2..87d74b7 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,9 @@
 
 -*- mode: org; coding: utf-8 -*-
 * Changes since 0.1
+** Features
+   - More specific exceptions in (gnu gnunet utils bv-slice) -- an 
&missing-capabilities
+     exception is now raised instead of an &assertion when appropriate.
 ** Bug fixes and other ‘non-user facing’ changes
    - The NSE client now accepts NaN as standard deviation instead of printing 
an error message.
      Sometimes the NSE service sends NaN as standard deviation, see
diff --git a/gnu/gnunet/utils/bv-slice.scm b/gnu/gnunet/utils/bv-slice.scm
index 99c0a93..550ddff 100644
--- a/gnu/gnunet/utils/bv-slice.scm
+++ b/gnu/gnunet/utils/bv-slice.scm
@@ -256,57 +256,57 @@ If not, raise an appropriate 
@code{&missing-capabilities}."
   
   ;; ‘Small’ operations
 
-  (define (wrap-rnrs-ref rnrs-ref ok? size)
+  (define (wrap-rnrs-ref rnrs-ref verify size)
     (lambda (slice index . rest)
       (assert (and (exact? index)
                   (integer? index)
                   (<= 0 index)
                   (<= (+ index size) (slice-length slice))))
-      (assert (ok? slice))
+      (verify 'slice slice)
       (apply rnrs-ref (slice-bv slice)
             (+ (slice-offset slice) index)
             rest)))
 
   (define slice-u8-ref
-    (wrap-rnrs-ref bytevector-u8-ref slice-readable? 1))
+    (wrap-rnrs-ref bytevector-u8-ref verify-slice-readable 1))
   (define slice-u16-ref
-    (wrap-rnrs-ref bytevector-u16-ref slice-readable? 2))
+    (wrap-rnrs-ref bytevector-u16-ref verify-slice-readable 2))
   (define slice-u32-ref
-    (wrap-rnrs-ref bytevector-u32-ref slice-readable? 4))
+    (wrap-rnrs-ref bytevector-u32-ref verify-slice-readable 4))
   (define slice-u64-ref
-    (wrap-rnrs-ref bytevector-u64-ref slice-readable? 8))
+    (wrap-rnrs-ref bytevector-u64-ref verify-slice-readable 8))
 
   (define slice-s8-ref
-    (wrap-rnrs-ref bytevector-s8-ref slice-readable? 1))
+    (wrap-rnrs-ref bytevector-s8-ref verify-slice-readable 1))
   (define slice-s16-ref
-    (wrap-rnrs-ref bytevector-s16-ref slice-readable? 2))
+    (wrap-rnrs-ref bytevector-s16-ref verify-slice-readable 2))
   (define slice-s32-ref
-    (wrap-rnrs-ref bytevector-s32-ref slice-readable? 4))
+    (wrap-rnrs-ref bytevector-s32-ref verify-slice-readable 4))
   (define slice-s64-ref
-    (wrap-rnrs-ref bytevector-s64-ref slice-readable? 8))
+    (wrap-rnrs-ref bytevector-s64-ref verify-slice-readable 8))
 
   (define slice-u8-set!
-    (wrap-rnrs-ref bytevector-u8-set! slice-writable? 1))
+    (wrap-rnrs-ref bytevector-u8-set! verify-slice-writable 1))
   (define slice-u16-set!
-    (wrap-rnrs-ref bytevector-u16-set! slice-writable? 2))
+    (wrap-rnrs-ref bytevector-u16-set! verify-slice-writable 2))
   (define slice-u32-set!
-    (wrap-rnrs-ref bytevector-u32-set! slice-writable? 4))
+    (wrap-rnrs-ref bytevector-u32-set! verify-slice-writable 4))
   (define slice-u64-set!
-    (wrap-rnrs-ref bytevector-u64-set! slice-writable? 8))
+    (wrap-rnrs-ref bytevector-u64-set! verify-slice-writable 8))
 
   (define slice-s8-set!
-    (wrap-rnrs-ref bytevector-s8-set! slice-writable? 1))
+    (wrap-rnrs-ref bytevector-s8-set! verify-slice-writable 1))
   (define slice-s16-set!
-    (wrap-rnrs-ref bytevector-s16-set! slice-writable? 2))
+    (wrap-rnrs-ref bytevector-s16-set! verify-slice-writable 2))
   (define slice-s32-set!
-    (wrap-rnrs-ref bytevector-s32-set! slice-writable? 4))
+    (wrap-rnrs-ref bytevector-s32-set! verify-slice-writable 4))
   (define slice-s64-set!
-    (wrap-rnrs-ref bytevector-s64-set! slice-writable? 8))
+    (wrap-rnrs-ref bytevector-s64-set! verify-slice-writable 8))
 
   (define slice-ieee-double-ref
-    (wrap-rnrs-ref bytevector-ieee-double-ref slice-readable? 8))
+    (wrap-rnrs-ref bytevector-ieee-double-ref verify-slice-readable 8))
   (define slice-ieee-double-set!
-    (wrap-rnrs-ref bytevector-ieee-double-set! slice-writable? 8))
+    (wrap-rnrs-ref bytevector-ieee-double-set! verify-slice-writable 8))
 
   
   ;; ‘Large’ operations.

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.