Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions test/com.inuoe.jzon-tests.asd → com.inuoe.jzon-tests.asd
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
:description "Tests for the jzon library"
:author "Wilfredo Velázquez-Rodríguez <zulu.inuoe@gmail.com>"
:license "MIT"
:components
((:file "jzon-tests"))
:components ((:module "test" :components ((:file "jzon-tests"))))
:perform
(test-op (o c) (symbol-call '#:com.inuoe.jzon-tests '#:run))
:depends-on
Expand Down
13 changes: 7 additions & 6 deletions src/com.inuoe.jzon.asd → com.inuoe.jzon.asd
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@
:depends-on (#:closer-mop
#:flexi-streams
(:feature (:not :ecl) #:float-features)
#:trivial-gray-streams
#:uiop)
#:trivial-gray-streams)
:in-order-to ((test-op (test-op "com.inuoe.jzon-tests")))
:components ((:file "eisel-lemire")
(:file "ratio-to-double")
(:file "schubfach")
(:file "jzon" :depends-on ("eisel-lemire" "ratio-to-double" "schubfach"))))
:components ((:module "src"
:components ((:file "eisel-lemire")
(:file "ratio-to-double")
(:file "schubfach")
(:file "jzon" :depends-on ("eisel-lemire" "ratio-to-double" "schubfach"))))))

17 changes: 15 additions & 2 deletions src/jzon.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -1866,5 +1866,18 @@ see `write-object'"
(with-output-to-string (stream)
(stringify-to stream)))
(t
(stringify-to stream)
nil)))))
(stringify-to stream)
nil)))))

;; NOTE: Borrowed from UIOP.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you check uiop's licence to see if it was ok to grab code from it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to be MIT, which I interpret to mean "do whatever you want" (see https://opensource.org/license/mit).

(defun native-namestring (x)
"From a non-wildcard CL pathname, a return namestring suitable for passing to the operating system"
(when x
(let ((p (pathname x)))
#+clozure (with-pathname-defaults () (ccl:native-translated-namestring p)) ; see ccl bug 978
#+(or cmucl scl) (ext:unix-namestring p nil)
#+sbcl (sb-ext:native-namestring p)
#-(or clozure cmucl sbcl scl)
(os-cond
((os-unix-p) (unix-namestring p))
(t (namestring p))))))
Loading