diff options
Diffstat (limited to 'lib/zambyte/meta/chibi.scm')
| -rw-r--r-- | lib/zambyte/meta/chibi.scm | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/zambyte/meta/chibi.scm b/lib/zambyte/meta/chibi.scm index 3ce8192..e765d44 100644 --- a/lib/zambyte/meta/chibi.scm +++ b/lib/zambyte/meta/chibi.scm @@ -18,7 +18,7 @@ (assoc 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 (json-null? obj) (eq? obj json-null)) @@ -36,7 +36,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) @@ -51,8 +54,9 @@ (append! json (list (cons 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))))) (define json-list-ref vector-ref) @@ -71,7 +75,7 @@ (define (json-object->alist json) (cond ((list? json) 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)) |