Reach feature parity with Gauche

2 files changed, 60 insertions, 14 deletions

diff --git a/lib/zambyte/meta/gauche.scm b/lib/zambyte/meta/gauche.scm
index 7f0a852..ae65be7 100644
--- a/lib/zambyte/meta/gauche.scm
+++ b/lib/zambyte/meta/gauche.scm
@@ -1,22 +1,30 @@
 (import (gauche base)
 	(rfc json)
-	(srfi 1))
+	(scheme case-lambda)
+	(srfi 1)
+	(srfi 2))
 (begin
   (define (json-object . pairs)
-    (map (lambda (pair)
-	   (cons (symbol->string (car pair))
-		 (cdr pair)))
-	 pairs))
+    (map (lambda (pair) (cons (symbol->string (car pair)) (cdr pair))) pairs))
+
   (define json-list vector)
   (define json-null 'null)
-  (define json-object? list?)
+
+  (define (json-object? obj)
+    (or (list? obj)
+	(json-record? obj)))
+
   (define json-list? vector?)
 
   (define (json-null? obj)
     (eq? obj json-null))
 
   (define (json-object-contains-key? obj key)
-    (and (assoc (symbol->string key) obj) #t))
+    (or (and (list? obj)
+	     (assoc (symbol->string key) obj)
+	     #t)
+	(and (json-record? obj)
+	     (json-object-contains-key? (json-record->fields obj) key))))
 
   (define array-handler list->vector)
   (define object-handler identity)
@@ -32,21 +40,57 @@
 		   (json-special-handler special-handler))
       (parse-json-string str)))
 
-  (define json->string construct-json-string)
+  (define (json->string obj)
+    (construct-json-string (json->typeless-json obj)))
 
   (define (json-object-ref json key)
-    (let ((pair (assoc (symbol->string key) json)))
-      (if pair
-	  (cdr pair)
-	  ((json-key-not-found)))))
+    (cond
+     ((list? json)
+      (let ((pair (assoc (symbol->string key) json)))
+	(if pair
+	    (cdr pair)
+	    ((json-key-not-found)))))
+     ((json-record? json)
+      (json-object-ref (json-record->fields json) key))
+     (else ((json-key-not-found)))))
+
+  (define (json-object-set! json key value)
+    (cond
+     ((and (list? json)
+	   (json-object-contains-key? json key))
+      (set-cdr! (assoc (symbol->string key) json) value))
+     ((null? json)
+      (error "json-object-set!: cannot set on an empty object" json))
+     ((list? json)
+      (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)
+	    json)
+	  (error "json-object-set!: no mutator for field" (json-record->name json) key)))))
 
   (define json-list-ref vector-ref)
   (define json-list-length vector-length)
 
-  (define (json-object->alist obj)
+  (define (json-object-map proc json)
     (map (lambda (pair)
+	   (call-with-values (lambda () (proc (string->symbol (car pair)) (cdr pair)))
+	     (case-lambda
+	       ((key value) (cons (symbol->string key) value))
+	       (_ (error "json-objec-map: proc did not return two values")))))
+	 json))
+
+  (define json-list-map vector-map)
+
+  (define (json-object->alist obj)
+    (cond
+     ((list? json)
+      (map (lambda (pair)
 	   (cons (string->symbol (car pair))
 		 (cdr pair)))
-	 obj))
+	   obj))
+     ((json-record? json) (json-object->alist (json->typeless-json obj)))
+     (else (error "json-object->alist: not an object" json))))
 
   (define json-list->list vector->list))
diff --git a/test/gauche.scm b/test/gauche.scm
index 929ea6a..d9af396 100644
--- a/test/gauche.scm
+++ b/test/gauche.scm
@@ -1,4 +1,6 @@
 (import (scheme base)
+	(scheme case-lambda)
+	(srfi 2)
 	(srfi 64))
 
 (import (zambyte meta json))