nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pk-crypto: Add 'canonical-sexp-length' and related procedures. 

* guix/pk-crypto.scm (canonical-sexp-length, canonical-sexp-null?,
  canonical-sexp-list?): New procedures.
* tests/pk-crypto.scm ("canonical-sexp-length", "canonical-sexp-list?"):
  New tests.
This commit is contained in:
Ludovic Courtès 2013-12-28 15:47:35 +01:00
parent a2cbbb743d
commit 363ae1da82
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
guix/pk-crypto.scm
View File

@ -32,6 +32,9 @@
canonical-sexp-cdr canonical-sexp-cdr
canonical-sexp-nth canonical-sexp-nth
canonical-sexp-nth-data canonical-sexp-nth-data
canonical-sexp-length
canonical-sexp-null?
canonical-sexp-list?
bytevector->hash-data bytevector->hash-data
hash-data->bytevector hash-data->bytevector
sign sign
@ -156,6 +159,14 @@ different from Scheme's 'list-ref'.)"
0 (native-endianness) 0 (native-endianness)
(sizeof size_t))) (sizeof size_t)))
(define canonical-sexp-length
(let* ((ptr (libgcrypt-func "gcry_sexp_length"))
(proc (pointer->procedure int ptr '(*))))
(lambda (sexp)
"Return the length of SEXP if it's a list (including the empty list);
return zero if SEXP is an atom."
(proc (canonical-sexp->pointer sexp)))))
(define token-string? (define token-string?
(let ((token-cs (char-set-union char-set:digit (let ((token-cs (char-set-union char-set:digit
char-set:letter char-set:letter
@ -263,4 +274,13 @@ return #f if not found."
#f #f
(pointer->canonical-sexp res)))))) (pointer->canonical-sexp res))))))
(define-inlinable (canonical-sexp-null? sexp)
"Return #t if SEXP is the empty-list sexp."
(null-pointer? (canonical-sexp->pointer sexp)))
(define (canonical-sexp-list? sexp)
"Return #t if SEXP is a list."
(or (canonical-sexp-null? sexp)
(> (canonical-sexp-length sexp) 0)))
;;; pk-crypto.scm ends here ;;; pk-crypto.scm ends here

12
tests/pk-crypto.scm
View File

@ -82,6 +82,18 @@
(gc) (gc)
(test-equal "canonical-sexp-length"
'(0 1 2 4 0 0)
(map (compose canonical-sexp-length string->canonical-sexp)
'("()" "(a)" "(a b)" "(a #616263# b #C001#)" "a" "#123456#")))
(test-equal "canonical-sexp-list?"
'(#t #f #t #f)
(map (compose canonical-sexp-list? string->canonical-sexp)
'("()" "\"abc\"" "(a b c)" "#123456#")))
(gc)
(test-equal "canonical-sexp-car + cdr" (test-equal "canonical-sexp-car + cdr"
'("(b \n (c xyz)\n )") '("(b \n (c xyz)\n )")
(let ((lst (string->canonical-sexp "(a (b (c xyz)))"))) (let ((lst (string->canonical-sexp "(a (b (c xyz)))")))