Use assoc symbols for keys instead of strings for objects.

Update the test suite to be more compatible with SRFI 64.

1 files changed, 4 insertions, 15 deletions

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))