diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/zambyte/meta/180.scm | 21 | ||||
| -rw-r--r-- | lib/zambyte/meta/chibi.scm | 19 | ||||
| -rw-r--r-- | lib/zambyte/meta/gauche.scm | 16 |
3 files changed, 22 insertions, 34 deletions
diff --git a/lib/zambyte/meta/180.scm b/lib/zambyte/meta/180.scm index 1010614..30c0c74 100644 --- a/lib/zambyte/meta/180.scm +++ b/lib/zambyte/meta/180.scm @@ -1,12 +1,7 @@ (import (except (srfi 180) json-null) (srfi 1)) (begin - (define (json-object . pairs) - (map - (lambda (pair) - (cons (string->symbol (car pair)) (cdr pair))) - pairs)) - + (define json-object list) (define json-list vector) (define json-null 'null) (define json-object? list?) @@ -14,7 +9,7 @@ ;; json-null? already defined in srfi 180 (define (json-object-contains-key? obj key) - (and (assoc (string->symbol key) obj) #t)) + (and (assoc key obj) #t)) (define (string->json str) (call-with-port (open-input-string str) @@ -28,18 +23,12 @@ (get-output-string port)))) (define (json-object-ref json key) - (let ((pair (assoc (string->symbol key) json))) + (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) - - (define (json-object->alist json) - (map - (lambda (pair) - (cons (symbol->string (car pair)) (cdr pair))) - json)) - - (define (json-list->list vector->list))) + (define json-object->alist values) + (define json-list->list vector->list)) diff --git a/lib/zambyte/meta/chibi.scm b/lib/zambyte/meta/chibi.scm index d7a7783..812694f 100644 --- a/lib/zambyte/meta/chibi.scm +++ b/lib/zambyte/meta/chibi.scm @@ -1,19 +1,14 @@ (import (chibi json) (srfi 1)) (begin - (define (json-object . pairs) - (map - (lambda (pair) - (cons (string->symbol (car pair)) (cdr pair))) - pairs)) - + (define json-object list) (define json-list vector) (define json-null (if #f #f)) (define json-object? list?) (define json-list? vector?) (define (json-object-contains-key? obj key) - (and (assoc (string->symbol key) obj) #t)) + (and (assoc key obj) #t)) (define (json-null? obj) (eq? obj json-null)) @@ -22,18 +17,12 @@ ;; string->json already defined in chibi json (define (json-object-ref json key) - (let ((pair (assoc (string->symbol key) json))) + (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) - - (define (json-object->alist json) - (map - (lambda (pair) - (cons (symbol->string (car pair)) (cdr pair))) - json)) - + (define json-object->alist values) (define json-list->list vector->list)) diff --git a/lib/zambyte/meta/gauche.scm b/lib/zambyte/meta/gauche.scm index 6f233bf..88093e5 100644 --- a/lib/zambyte/meta/gauche.scm +++ b/lib/zambyte/meta/gauche.scm @@ -2,7 +2,11 @@ (rfc json) (srfi 1)) (begin - (define json-object list) + (define (json-object . pairs) + (map (lambda (pair) + (cons (symbol->string (car pair)) + (cdr pair))) + pairs)) (define json-list vector) (define json-null 'null) (define json-object? list?) @@ -12,7 +16,7 @@ (eq? obj json-null)) (define (json-object-contains-key? obj key) - (and (assoc key obj) #t)) + (and (assoc (symbol->string key) obj) #t)) (define array-handler list->vector) (define object-handler identity) @@ -38,5 +42,11 @@ (define json-list-ref vector-ref) (define json-list-length vector-length) - (define json-object->alist identity) + + (define (json-object->alist obj) + (map (lambda (pair) + (cons (string->symbol (car pair)) + (cdr pair))) + obj)) + (define json-list->list vector->list)) |