From 0b17e637d3791d1ca94558429f9deba3a5876166 Mon Sep 17 00:00:00 2001 From: Robby Zambito Date: Tue, 14 Feb 2023 20:33:23 -0500 Subject: Use assoc symbols for keys instead of strings for objects. Update the test suite to be more compatible with SRFI 64. --- lib/zambyte/meta/gauche.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'lib/zambyte/meta/gauche.scm') 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)) -- cgit