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

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) <start>: Likewise.
<modules>: Remove (rnrs bytevector).
This commit is contained in:
Ludovic Courtès 2019-09-23 22:07:53 +02:00
parent 4f8c29a75c
commit 7abd5997f4
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/tests.scm
View File

@ -87,8 +87,7 @@
(requirement `(udev ,@requirement)) (requirement `(udev ,@requirement))
(modules '((ice-9 match) (modules '((ice-9 match)
(srfi srfi-9 gnu) (srfi srfi-9 gnu)))
(rnrs bytevectors)))
(start (start
(with-imported-modules imported-modules (with-imported-modules imported-modules
#~(lambda () #~(lambda ()
@ -98,8 +97,8 @@
((_ pred rest ...) ((_ pred rest ...)
(or (pred x) (or (pred x)
(one-of rest ...)))))) (one-of rest ...))))))
(one-of symbol? string? pair? null? vector? (one-of symbol? string? keyword? pair? null? array?
bytevector? number? boolean?))) number? boolean?)))
(match (primitive-fork) (match (primitive-fork)
(0 (0

6
guix/repl.scm
View File

@ -17,7 +17,6 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (guix repl) (define-module (guix repl)
#:use-module (rnrs bytevectors)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:export (send-repl-response #:export (send-repl-response
machine-repl)) machine-repl))
@ -37,9 +36,8 @@
((_ pred rest ...) ((_ pred rest ...)
(or (pred x) (or (pred x)
(one-of rest ...)))))) (one-of rest ...))))))
(one-of symbol? string? pair? null? vector? (one-of symbol? string? keyword? pair? null? array?
bytevector? number? boolean?))) number? boolean?)))
(define (send-repl-response exp output) (define (send-repl-response exp output)
"Write the response corresponding to the evaluation of EXP to PORT, an "Write the response corresponding to the evaluation of EXP to PORT, an