From 7abd5997f41fec38ea1daa9099a9693062f10dbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 23 Sep 2019 22:07:53 +0200 Subject: [PATCH] repl, marionette: 'self-quoting?' matches keywords. * guix/repl.scm (self-quoting?): Add 'keyword?' and 'array?'; remove 'vector?' and 'bytevector?'. * gnu/tests.scm (marionette-shepherd-service) : Likewise. : Remove (rnrs bytevector). --- gnu/tests.scm | 7 +++---- guix/repl.scm | 6 ++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/gnu/tests.scm b/gnu/tests.scm index 0871b4c6f7..27cb39c2b9 100644 --- a/gnu/tests.scm +++ b/gnu/tests.scm @@ -87,8 +87,7 @@ (requirement `(udev ,@requirement)) (modules '((ice-9 match) - (srfi srfi-9 gnu) - (rnrs bytevectors))) + (srfi srfi-9 gnu))) (start (with-imported-modules imported-modules #~(lambda () @@ -98,8 +97,8 @@ ((_ pred rest ...) (or (pred x) (one-of rest ...)))))) - (one-of symbol? string? pair? null? vector? - bytevector? number? boolean?))) + (one-of symbol? string? keyword? pair? null? array? + number? boolean?))) (match (primitive-fork) (0 diff --git a/guix/repl.scm b/guix/repl.scm index 5cff5c71e9..1ead18c53b 100644 --- a/guix/repl.scm +++ b/guix/repl.scm @@ -17,7 +17,6 @@ ;;; along with GNU Guix. If not, see . (define-module (guix repl) - #:use-module (rnrs bytevectors) #:use-module (ice-9 match) #:export (send-repl-response machine-repl)) @@ -37,9 +36,8 @@ ((_ pred rest ...) (or (pred x) (one-of rest ...)))))) - (one-of symbol? string? pair? null? vector? - bytevector? number? boolean?))) - + (one-of symbol? string? keyword? pair? null? array? + number? boolean?))) (define (send-repl-response exp output) "Write the response corresponding to the evaluation of EXP to PORT, an