From 93ccdcae3a23098454c8b6f93a6699b70ed34623 Mon Sep 17 00:00:00 2001 From: Robby Zambito Date: Mon, 13 Feb 2023 00:06:36 -0500 Subject: Remove all references to srfi 2 --- lib/zambyte/meta/180.scm | 3 +-- lib/zambyte/meta/chibi.scm | 3 +-- lib/zambyte/meta/guile.scm | 10 +++++----- lib/zambyte/meta/sagittarius.scm | 3 +-- 4 files changed, 8 insertions(+), 11 deletions(-) (limited to 'lib/zambyte') diff --git a/lib/zambyte/meta/180.scm b/lib/zambyte/meta/180.scm index de9e2dd..1010614 100644 --- a/lib/zambyte/meta/180.scm +++ b/lib/zambyte/meta/180.scm @@ -1,6 +1,5 @@ (import (except (srfi 180) json-null) - (srfi 1) - (srfi 2)) + (srfi 1)) (begin (define (json-object . pairs) (map diff --git a/lib/zambyte/meta/chibi.scm b/lib/zambyte/meta/chibi.scm index 286240d..d7a7783 100644 --- a/lib/zambyte/meta/chibi.scm +++ b/lib/zambyte/meta/chibi.scm @@ -1,6 +1,5 @@ (import (chibi json) - (srfi 1) - (srfi 2)) + (srfi 1)) (begin (define (json-object . pairs) (map diff --git a/lib/zambyte/meta/guile.scm b/lib/zambyte/meta/guile.scm index 96968d6..1e41f9c 100644 --- a/lib/zambyte/meta/guile.scm +++ b/lib/zambyte/meta/guile.scm @@ -1,6 +1,5 @@ (import (json) - (srfi 1) - (srfi 2)) + (srfi 1)) (begin (define json-object list) (define json-list vector) @@ -18,9 +17,10 @@ (define json->string scm->json-string) (define (json-object-ref json key) - (or (and-let* ((pair (assoc key json))) - (cdr pair)) - ((json-key-not-found)))) + (let ((pair (assoc key json))) + (if pair + (cdr pair) + ((json-key-not-found))))) (define json-list-ref vector-ref) (define json-list-length vector-length) diff --git a/lib/zambyte/meta/sagittarius.scm b/lib/zambyte/meta/sagittarius.scm index e8d82ae..90d5f0b 100644 --- a/lib/zambyte/meta/sagittarius.scm +++ b/lib/zambyte/meta/sagittarius.scm @@ -1,6 +1,5 @@ (import (text json) - (srfi 1) - (srfi 2)) + (srfi 1)) (begin (define (json-object . pairs) (if (eq? (*json-map-type*) 'vector) -- cgit