From 73a0cba3f4d4fa825a21332fbcc159e68cd3a1ea Mon Sep 17 00:00:00 2001 From: Robby Zambito Date: Thu, 16 Feb 2023 09:12:17 -0500 Subject: Rename guile.scm to guile-json.scm This will avoid any potential conflicts from other zambyte/meta/guile.scm files. --- lib/zambyte/meta/guile-json.scm | 28 ++++++++++++++++++++++++++++ lib/zambyte/meta/guile.scm | 28 ---------------------------- lib/zambyte/meta/json.sld | 2 +- 3 files changed, 29 insertions(+), 29 deletions(-) create mode 100644 lib/zambyte/meta/guile-json.scm delete mode 100644 lib/zambyte/meta/guile.scm (limited to 'lib') diff --git a/lib/zambyte/meta/guile-json.scm b/lib/zambyte/meta/guile-json.scm new file mode 100644 index 0000000..1e41f9c --- /dev/null +++ b/lib/zambyte/meta/guile-json.scm @@ -0,0 +1,28 @@ +(import (json) + (srfi 1)) +(begin + (define json-object list) + (define json-list vector) + (define json-null 'null) + (define json-object? list?) + (define json-list? vector?) + + (define (json-null? obj) + (eq? obj json-null)) + + (define (json-object-cointains-key? obj key) + (and (assoc key obj) #t)) + + (define string->json json-string->scm) + (define json->string scm->json-string) + + (define (json-object-ref json key) + (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 values) + (define json-list->list vector->list)) diff --git a/lib/zambyte/meta/guile.scm b/lib/zambyte/meta/guile.scm deleted file mode 100644 index 1e41f9c..0000000 --- a/lib/zambyte/meta/guile.scm +++ /dev/null @@ -1,28 +0,0 @@ -(import (json) - (srfi 1)) -(begin - (define json-object list) - (define json-list vector) - (define json-null 'null) - (define json-object? list?) - (define json-list? vector?) - - (define (json-null? obj) - (eq? obj json-null)) - - (define (json-object-cointains-key? obj key) - (and (assoc key obj) #t)) - - (define string->json json-string->scm) - (define json->string scm->json-string) - - (define (json-object-ref json key) - (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 values) - (define json-list->list vector->list)) diff --git a/lib/zambyte/meta/json.sld b/lib/zambyte/meta/json.sld index 8838c77..3e27bd9 100644 --- a/lib/zambyte/meta/json.sld +++ b/lib/zambyte/meta/json.sld @@ -64,7 +64,7 @@ (include-library-declarations "macduffie.scm")) ((and guile (library (json))) (import (only (guile) include-from-path import)) - (begin (include-from-path "zambyte/meta/guile.scm"))) + (begin (include-from-path "zambyte/meta/guile-json.scm"))) (gauche (include-library-declarations "gauche.scm")) (gerbil -- cgit