Use assoc symbols for keys instead of strings for objects.

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

1 files changed, 5 insertions, 16 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))