Use internal record to store JSON record data.

1 files changed, 8 insertions, 5 deletions

diff --git a/lib/zambyte/meta/guile-json.scm b/lib/zambyte/meta/guile-json.scm
index bcdd0cb..ebbbd47 100644
--- a/lib/zambyte/meta/guile-json.scm
+++ b/lib/zambyte/meta/guile-json.scm
@@ -23,7 +23,7 @@
 	     (assoc (symbol->string key) obj)
 	     #t)
 	(and (json-record? obj)
-	     (json-object-contains-key? (json-record->fields obj) key))))
+	     (json-object-contains-key? ((json-record->typeless obj)) key))))
 
   (define string->json json-string->scm)
 
@@ -38,7 +38,10 @@
 	    (cdr pair)
 	    ((json-key-not-found)))))
      ((json-record? json)
-      (json-object-ref (json-record->fields json) key))
+      (or (and-let* ((pair (assoc key (json-record->accessors json)))
+		     (accessor (cdr pair)))
+	    (accessor (json-record->internal-record json)))
+	  (error "json-object-ref: no accessor for field" (json-record->name json) key)))
      (else ((json-key-not-found)))))
 
   (define (json-object-set! json key value)
@@ -53,8 +56,8 @@
       (append! json (list (cons (symbol->string key) value))))
      ((json-record? json)
       (or (and-let* ((pair (assoc key (json-record->mutators json)))
-		     (mutator (cdr pair)))
-	    (mutator json value)
+		     (mutator! (cdr pair)))
+	    (mutator! (json-record->internal-record json) value)
 	    json)
 	  (error "json-object-set!: no mutator for field" (json-record->name json) key)))))
 
@@ -74,7 +77,7 @@
   (define (json-object->alist json)
     (cond
      ((list? json) (map (lambda (pair) (cons (string->symbol (car pair)) (cdr pair))) json))
-     ((json-record? json) (json-record->fields json))
+     ((json-record? json) ((json-record->typeless json)))
      (else (error "json-object->alist: not an object" json))))
 
   (define json-list->list vector->list))